steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compiler.cfg.stacks: kill set now includes all locations eliminated as a result of stack height decrease; reduces number of ##replace instructions generated by 2%

db4
Slava Pestov 2009-08-01 06:12:43 -05:00
parent 33d3761314
commit 2d719534cf
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/compiler/cfg/stacks/global/global.factor
View File

@ -26,7 +26,7 @@ M: avail-analysis transfer-set drop [ peek-set ] [ replace-set ] bi assoc-union
! which are going to be overwritten. ! which are going to be overwritten.
BACKWARD-ANALYSIS: kill BACKWARD-ANALYSIS: kill
M: kill-analysis transfer-set drop replace-set assoc-union ; M: kill-analysis transfer-set drop kill-set assoc-union ;
! Main word ! Main word
: compute-global-sets ( cfg -- cfg' ) : compute-global-sets ( cfg -- cfg' )

31
basis/compiler/cfg/stacks/local/local.factor
View File

@ -1,6 +1,7 @@
! Copyright (C) 2009 Slava Pestov. ! Copyright (C) 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs kernel math namespaces sets make sequences USING: accessors assocs kernel math math.order namespaces sets make
sequences combinators fry
compiler.cfg compiler.cfg
compiler.cfg.hats compiler.cfg.hats
compiler.cfg.instructions compiler.cfg.instructions
@ -12,14 +13,18 @@ IN: compiler.cfg.stacks.local
! Local stack analysis. We build local peek and replace sets for every basic ! Local stack analysis. We build local peek and replace sets for every basic
! block while constructing the CFG. ! block while constructing the CFG.
SYMBOLS: peek-sets replace-sets ; SYMBOLS: peek-sets replace-sets kill-sets ;
SYMBOL: locs>vregs SYMBOL: locs>vregs
: loc>vreg ( loc -- vreg ) locs>vregs get [ drop i ] cache ; : loc>vreg ( loc -- vreg ) locs>vregs get [ drop i ] cache ;
: vreg>loc ( vreg -- loc/f ) locs>vregs get value-at ; : vreg>loc ( vreg -- loc/f ) locs>vregs get value-at ;
TUPLE: current-height { d initial: 0 } { r initial: 0 } { emit-d initial: 0 } { emit-r initial: 0 } ; TUPLE: current-height
{ d initial: 0 }
{ r initial: 0 }
{ emit-d initial: 0 }
{ emit-r initial: 0 } ;
SYMBOLS: local-peek-set local-replace-set replace-mapping ; SYMBOLS: local-peek-set local-replace-set replace-mapping ;
@ -72,20 +77,32 @@ M: rs-loc translate-local-loc n>> current-height get r>> - <rs-loc> ;
bi bi
] if ; ] if ;
: compute-local-kill-set ( -- assoc )
basic-block get current-height get
[ [ ds-heights get at dup ] [ d>> ] bi* [-] iota [ swap - <ds-loc> ] with map ]
[ [ rs-heights get at dup ] [ r>> ] bi* [-] iota [ swap - <rs-loc> ] with map ]
[ drop local-replace-set get at ] 2tri
[ append unique dup ] dip update ;
: begin-local-analysis ( -- ) : begin-local-analysis ( -- )
H{ } clone local-peek-set set H{ } clone local-peek-set set
H{ } clone local-replace-set set H{ } clone local-replace-set set
H{ } clone replace-mapping set H{ } clone replace-mapping set
current-height get 0 >>emit-d 0 >>emit-r drop current-height get
current-height get [ d>> ] [ r>> ] bi basic-block get record-stack-heights ; [ 0 >>emit-d 0 >>emit-r drop ]
[ [ d>> ] [ r>> ] bi basic-block get record-stack-heights ] bi ;
: end-local-analysis ( -- ) : end-local-analysis ( -- )
emit-changes emit-changes
local-peek-set get basic-block get peek-sets get set-at basic-block get {
local-replace-set get basic-block get replace-sets get set-at ; [ [ local-peek-set get ] dip peek-sets get set-at ]
[ [ local-replace-set get ] dip replace-sets get set-at ]
[ [ compute-local-kill-set ] dip kill-sets get set-at ]
} cleave ;
: clone-current-height ( -- ) : clone-current-height ( -- )
current-height [ clone ] change ; current-height [ clone ] change ;
: peek-set ( bb -- assoc ) peek-sets get at ; : peek-set ( bb -- assoc ) peek-sets get at ;
: replace-set ( bb -- assoc ) replace-sets get at ; : replace-set ( bb -- assoc ) replace-sets get at ;
: kill-set ( bb -- assoc ) kill-sets get at ;

1
basis/compiler/cfg/stacks/stacks.factor
View File

@ -13,6 +13,7 @@ IN: compiler.cfg.stacks
H{ } clone rs-heights set H{ } clone rs-heights set
H{ } clone peek-sets set H{ } clone peek-sets set
H{ } clone replace-sets set H{ } clone replace-sets set
H{ } clone kill-sets set
current-height new current-height set ; current-height new current-height set ;
: end-stack-analysis ( -- ) : end-stack-analysis ( -- )