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

compiler.cfg.gvn: move ##phi handling to the value-number method

db4
Alex Vondrak 2011-06-28 12:13:02 -07:00 committed by John Benediktsson
parent caab84061d
commit a0c569c876
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,11 @@ M: ##copy simplify ;
GENERIC: value-number ( insn -- ) GENERIC: value-number ( insn -- )
M: array value-number [ value-number ] each ;
M: alien-call-insn value-number drop ; M: alien-call-insn value-number drop ;
M: ##callback-inputs value-number drop ; M: ##callback-inputs value-number drop ;
M: ##copy value-number [ src>> vreg>vn ] [ dst>> ] bi set-vn ; M: ##copy value-number [ src>> vreg>vn ] [ dst>> ] bi set-vn ;
: redundant-instruction ( insn vn -- ) : redundant-instruction ( insn vn -- )
@ -42,14 +45,21 @@ M: ##copy value-number [ src>> vreg>vn ] [ dst>> ] bi set-vn ;
vn expr exprs>vns get set-at vn expr exprs>vns get set-at
insn vn vns>insns get set-at ; insn vn vns>insns get set-at ;
: check-redundancy ( insn -- )
dup >expr dup exprs>vns get at
[ redundant-instruction ] [ useful-instruction ] ?if ;
M: ##phi value-number
dup inputs>> values [ vreg>vn ] map sift
dup all-equal? [
[ drop ] [ first redundant-instruction ] if-empty
] [ drop check-redundancy ] if ;
M: insn value-number M: insn value-number
dup defs-vregs length 1 = [ dup defs-vregs length 1 = [ check-redundancy ] [ drop ] if ;
dup >expr dup exprs>vns get at
[ redundant-instruction ] [ useful-instruction ] ?if
] [ drop ] if ;
: value-numbering-step ( insns -- ) : value-numbering-step ( insns -- )
[ simplify ] map flatten [ value-number ] each ; [ simplify value-number ] each ;
: value-numbering-iteration ( cfg -- ) : value-numbering-iteration ( cfg -- )
clear-exprs [ value-numbering-step ] simple-analysis ; clear-exprs [ value-numbering-step ] simple-analysis ;

10
extra/compiler/cfg/gvn/misc/misc.factor
View File

@ -14,13 +14,3 @@ M: ##replace rewrite
insn>literal dup immediate-store? insn>literal dup immediate-store?
[ swap \ ##replace-imm new-insn ] [ 2drop f ] if [ swap \ ##replace-imm new-insn ] [ 2drop f ] if
] [ 2drop f ] if ; ] [ 2drop f ] if ;
! XXX any particular input's vn isn't necessarily available, so
! can't just return a straight-up <copy>; might just do
! this with a set-vn in gvn.factor:value-number
M: ##phi rewrite
[ dst>> ] [ inputs>> values [ vreg>vn ] map sift ] bi
dup all-equal? [
[ drop f ]
[ first <copy> ] if-empty
] [ 2drop f ] if ;