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

compiler.cfg.linear-scan.live-intervals: simplify uses-vregs*

locals-and-roots
Björn Lindqvist 2016-04-01 18:54:13 +02:00
parent 76be7b54ed
commit 52e78441f8
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
View File

@ -1,11 +1,11 @@
! Copyright (C) 2008, 2010 Slava Pestov. ! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs binary-search combinators USING: accessors assocs binary-search combinators compiler.cfg.def-use
compiler.cfg.def-use compiler.cfg.instructions compiler.cfg.instructions compiler.cfg.linear-scan.ranges
compiler.cfg.linear-scan.ranges compiler.cfg.linearization compiler.cfg.linearization compiler.cfg.liveness
compiler.cfg.liveness compiler.cfg.registers compiler.cfg.registers compiler.cfg.ssa.destruction.leaders
compiler.cfg.ssa.destruction.leaders cpu.architecture fry kernel locals math cpu.architecture fry kernel locals math math.order namespaces
math.intervals math.order namespaces sequences ; sequences vectors ;
IN: compiler.cfg.linear-scan.live-intervals IN: compiler.cfg.linear-scan.live-intervals
TUPLE: vreg-use n def-rep use-rep spill-slot? ; TUPLE: vreg-use n def-rep use-rep spill-slot? ;
@ -53,7 +53,7 @@ SYMBOLS: from to ;
SYMBOL: live-intervals SYMBOL: live-intervals
: live-interval ( vreg -- live-interval ) : vreg>live-interval ( vreg -- live-interval )
leader live-intervals get [ <live-interval> ] cache ; leader live-intervals get [ <live-interval> ] cache ;
: interval-reg-class ( live-interval -- reg-class ) : interval-reg-class ( live-interval -- reg-class )
@ -64,42 +64,37 @@ GENERIC: compute-live-intervals* ( insn -- )
M: insn compute-live-intervals* drop ; M: insn compute-live-intervals* drop ;
:: record-def ( vreg n spill-slot? -- ) :: record-def ( vreg n spill-slot? -- )
vreg live-interval :> live-interval vreg vreg>live-interval :> live-interval
n live-interval ranges>> shorten-ranges n live-interval ranges>> shorten-ranges
n live-interval spill-slot? (add-use) vreg rep-of >>def-rep drop ; n live-interval spill-slot? (add-use) vreg rep-of >>def-rep drop ;
:: record-use ( vreg n spill-slot? -- ) :: record-use ( vreg n spill-slot? -- )
vreg live-interval :> live-interval vreg vreg>live-interval :> live-interval
from get n live-interval ranges>> add-range from get n live-interval ranges>> add-range
n live-interval spill-slot? (add-use) vreg rep-of >>use-rep drop ; n live-interval spill-slot? (add-use) vreg rep-of >>use-rep drop ;
:: record-temp ( vreg n -- ) :: record-temp ( vreg n -- )
vreg live-interval :> live-interval vreg vreg>live-interval :> live-interval
n n live-interval ranges>> add-range n n live-interval ranges>> add-range
n live-interval f (add-use) vreg rep-of >>def-rep drop ; n live-interval f (add-use) vreg rep-of >>def-rep drop ;
M: vreg-insn compute-live-intervals* ( insn -- )
dup insn#>>
[ [ defs-vregs ] dip '[ _ f record-def ] each ]
[ [ uses-vregs ] dip '[ _ f record-use ] each ]
[ [ temp-vregs ] dip '[ _ record-temp ] each ]
2tri ;
! Extend lifetime intervals of base pointers, so that their ! Extend lifetime intervals of base pointers, so that their
! values are available even if the base pointer is never used ! values are available even if the base pointer is never used
! again. ! again.
: uses-vregs* ( insn -- seq )
dup gc-map-insn? [
[ uses-vregs ] [ gc-map>> derived-roots>> values ] bi append
] [ uses-vregs ] if ;
GENERIC: uses-vregs* ( insn -- seq ) M: vreg-insn compute-live-intervals* ( insn -- )
dup insn#>>
M: gc-map-insn uses-vregs* [ [ defs-vregs ] dip '[ _ f record-def ] each ]
[ uses-vregs ] [ gc-map>> derived-roots>> values ] bi append ; [ [ uses-vregs* ] dip '[ _ f record-use ] each ]
[ [ temp-vregs ] dip '[ _ record-temp ] each ]
M: vreg-insn uses-vregs* uses-vregs ; 2tri ;
M: insn uses-vregs* drop f ;
M: clobber-insn compute-live-intervals* ( insn -- ) M: clobber-insn compute-live-intervals* ( insn -- )
dup insn#>> dup insn#>>
@ -117,7 +112,7 @@ M: hairy-clobber-insn compute-live-intervals* ( insn -- )
: handle-live-out ( bb -- ) : handle-live-out ( bb -- )
[ from get to get ] dip live-out keys [ from get to get ] dip live-out keys
[ live-interval ranges>> add-range ] 2with each ; [ vreg>live-interval ranges>> add-range ] 2with each ;
: compute-live-intervals-step ( bb -- ) : compute-live-intervals-step ( bb -- )
{ {