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

compiler.cfg.ssa.destruction: small refactoring which removes 

class-elements and maybe-eliminate-copy-later
db4
Björn Lindqvist 2015-06-13 19:26:07 +02:00
parent ceff23339c
commit 98ae0eb02e
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
basis/compiler/cfg/ssa/destruction/destruction.factor
View File

@ -13,8 +13,6 @@ IN: compiler.cfg.ssa.destruction
SYMBOL: class-element-map SYMBOL: class-element-map
: class-elements ( vreg -- elts ) class-element-map get at ;
<PRIVATE <PRIVATE
! Sequence of vreg pairs ! Sequence of vreg pairs
@ -41,9 +39,6 @@ SYMBOL: copies
GENERIC: prepare-insn ( insn -- ) GENERIC: prepare-insn ( insn -- )
: maybe-eliminate-copy-later ( dst src -- )
2array copies get push ;
M: insn prepare-insn drop ; M: insn prepare-insn drop ;
M: alien-call-insn prepare-insn drop ; M: alien-call-insn prepare-insn drop ;
@ -55,26 +50,25 @@ M: vreg-insn prepare-insn
2dup [ empty? not ] both? [ 2dup [ empty? not ] both? [
[ first ] bi@ [ first ] bi@
2dup [ rep-of reg-class-of ] bi@ eq? 2dup [ rep-of reg-class-of ] bi@ eq?
[ maybe-eliminate-copy-later ] [ 2drop ] if [ 2array copies get push ] [ 2drop ] if
] [ 2drop ] if ] [ 2drop ] if
] bi ; ] bi ;
M: ##copy prepare-insn M: ##copy prepare-insn
[ dst>> ] [ src>> ] bi maybe-eliminate-copy-later ; [ dst>> ] [ src>> ] bi 2array copies get push ;
M: ##parallel-copy prepare-insn M: ##parallel-copy prepare-insn
values>> [ first2 maybe-eliminate-copy-later ] each ; values>> copies get push-all ;
: leaders ( vreg1 vreg2 -- vreg1' vreg2' ) : leaders ( vreg1 vreg2 -- vreg1' vreg2' )
[ leader ] bi@ ; [ leader ] bi@ ;
: vregs-interfere? ( vreg1 vreg2 -- merged/f ? ) : vregs-interfere? ( vreg1 vreg2 -- merged/f ? )
[ class-elements ] bi@ sets-interfere? ; [ class-element-map get at ] bi@ sets-interfere? ;
ERROR: vregs-shouldn't-interfere vreg1 vreg2 ; ERROR: vregs-shouldn't-interfere vreg1 vreg2 ;
:: must-eliminate-copy ( vreg1 vreg2 -- ) :: must-eliminate-copy ( vreg1 vreg2 -- )
! Eliminate a copy.
vreg1 vreg2 = [ vreg1 vreg2 = [
vreg1 vreg2 vregs-interfere? vreg1 vreg2 vregs-interfere?
[ vreg1 vreg2 vregs-shouldn't-interfere ] [ vreg1 vreg2 vregs-shouldn't-interfere ]
@ -90,11 +84,9 @@ M: ##phi prepare-insn
[ leaders must-eliminate-copy ] with each ; [ leaders must-eliminate-copy ] with each ;
: prepare-coalescing ( cfg -- ) : prepare-coalescing ( cfg -- )
init-coalescing init-coalescing [ [ prepare-insn ] each ] simple-analysis ;
[ [ prepare-insn ] each ] simple-analysis ;
:: maybe-eliminate-copy ( vreg1 vreg2 -- ) :: maybe-eliminate-copy ( vreg1 vreg2 -- )
! Eliminate a copy if possible.
vreg1 vreg2 = [ vreg1 vreg2 = [
vreg1 vreg2 vregs-interfere? vreg1 vreg2 vregs-interfere?
[ drop ] [ vreg1 vreg2 coalesce-vregs ] if [ drop ] [ vreg1 vreg2 coalesce-vregs ] if