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

compiler.cfg.gvn.comparisons: fix premature cfg modifications

db4
Alex Vondrak 2011-06-18 16:16:09 -07:00 committed by John Benediktsson
parent d6641eddb3
commit 3787f64422
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extra/compiler/cfg/gvn/comparisons/comparisons.factor
View File

@ -98,9 +98,10 @@ UNION: general-compare-insn scalar-compare-insn ##test-vector ;
} cond ; } cond ;
: fold-branch ( ? -- insn ) : fold-branch ( ? -- insn )
drop final-iteration? get [
! 0 1 ? 0 1 ?
! basic-block get [ nth 1vector ] change-successors drop basic-block get [ nth 1vector ] change-successors drop
] [ drop ] if
\ ##branch new-insn ; \ ##branch new-insn ;
: fold-compare-imm-branch ( insn -- insn/f ) : fold-compare-imm-branch ( insn -- insn/f )
@ -257,10 +258,10 @@ M: ##compare-integer-imm rewrite
[ src1>> vreg>insn [ src1>> ] [ src2>> ] bi ] [ cc>> ] bi ; inline [ src1>> vreg>insn [ src1>> ] [ src2>> ] bi ] [ cc>> ] bi ; inline
: simplify-test ( insn -- insn ) : simplify-test ( insn -- insn )
dup (simplify-test) drop [ >>src1 ] [ >>src2 ] bi* ; inline [ dst>> ] [ (simplify-test) ] [ temp>> ] tri \ ##test new-insn ; inline
: simplify-test-branch ( insn -- insn ) : simplify-test-branch ( insn -- insn )
dup (simplify-test) drop [ >>src1 ] [ >>src2 ] bi* ; inline (simplify-test) \ ##test-branch new-insn ; inline
: (simplify-test-imm) ( insn -- src1 src2 cc ) : (simplify-test-imm) ( insn -- src1 src2 cc )
[ src1>> vreg>insn [ src1>> ] [ src2>> ] bi ] [ cc>> ] bi ; inline [ src1>> vreg>insn [ src1>> ] [ src2>> ] bi ] [ cc>> ] bi ; inline

4
extra/compiler/cfg/gvn/gvn.factor
View File

@ -51,13 +51,14 @@ M: array process-instruction
! FIXME there's going to be trouble with certain rewrites that ! FIXME there's going to be trouble with certain rewrites that
! modify the cfg / instructions destructively; namely those in ! modify the cfg / instructions destructively; namely those in
! comparisons.factor, alien.factor, and slots.factor ! alien.factor and slots.factor
: value-numbering-iteration ( cfg -- ) : value-numbering-iteration ( cfg -- )
clear-exprs clear-exprs
[ value-numbering-step drop ] simple-analysis ; [ value-numbering-step drop ] simple-analysis ;
: identify-redundancies ( cfg -- ) : identify-redundancies ( cfg -- )
final-iteration? off
init-value-graph init-value-graph
'[ '[
changed? off changed? off
@ -66,6 +67,7 @@ M: array process-instruction
] loop ; ] loop ;
: eliminate-redundancies ( cfg -- ) : eliminate-redundancies ( cfg -- )
final-iteration? on
clear-exprs clear-exprs
[ value-numbering-step ] simple-optimization ; [ value-numbering-step ] simple-optimization ;

4
extra/compiler/cfg/gvn/rewrite/rewrite.factor
View File

@ -11,6 +11,10 @@ GENERIC: rewrite ( insn -- insn/f )
M: insn rewrite drop f ; M: insn rewrite drop f ;
! Boolean to track when it's safe to alter the CFG in a rewrite
! method (i.e., after we've already iterated till fixpoint)
SYMBOL: final-iteration?
! Utilities ! Utilities
GENERIC: insn>integer ( insn -- n ) GENERIC: insn>integer ( insn -- n )