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

compiler.cfg.liveness: fix liveness computation in case where instruction uses a register it defines

db4
Slava Pestov 2009-07-28 06:45:02 -05:00
parent 41c5f0d941
commit 1878b0dc32
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
basis/compiler/cfg/liveness/liveness-tests.factor
View File

@ -1,9 +1,14 @@
USING: compiler.cfg.liveness compiler.cfg.debugger USING: compiler.cfg.liveness compiler.cfg.debugger
compiler.cfg.instructions compiler.cfg.predecessors compiler.cfg.instructions compiler.cfg.predecessors
compiler.cfg.registers compiler.cfg cpu.architecture compiler.cfg.registers compiler.cfg cpu.architecture
accessors namespaces sequences kernel tools.test ; accessors namespaces sequences kernel tools.test vectors ;
IN: compiler.cfg.liveness.tests IN: compiler.cfg.liveness.tests
: test-liveness ( -- )
cfg new 1 get >>entry
compute-predecessors
compute-live-sets ;
! Sanity check... ! Sanity check...
V{ V{
@ -11,21 +16,22 @@ V{
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 0 D 0 }
T{ ##replace f V int-regs 1 D 1 } T{ ##replace f V int-regs 1 D 1 }
T{ ##peek f V int-regs 1 D 1 } T{ ##peek f V int-regs 1 D 1 }
T{ ##branch }
} 1 test-bb } 1 test-bb
V{ V{
T{ ##replace f V int-regs 2 D 0 } T{ ##replace f V int-regs 2 D 0 }
T{ ##branch }
} 2 test-bb } 2 test-bb
V{ V{
T{ ##replace f V int-regs 3 D 0 } T{ ##replace f V int-regs 3 D 0 }
T{ ##return }
} 3 test-bb } 3 test-bb
1 get 2 get 3 get V{ } 2sequence >>successors drop 1 get 2 get 3 get V{ } 2sequence >>successors drop
cfg new 1 get >>entry test-liveness
compute-predecessors
compute-live-sets
[ [
H{ H{
@ -36,3 +42,21 @@ compute-live-sets
] ]
[ 1 get live-in ] [ 1 get live-in ]
unit-test unit-test
! Tricky case; defs must be killed before uses
V{
T{ ##peek f V int-regs 0 D 0 }
T{ ##branch }
} 1 test-bb
V{
T{ ##add-imm f V int-regs 0 V int-regs 0 10 }
T{ ##return }
} 2 test-bb
1 get 2 get 1vector >>successors drop
test-liveness
[ H{ { V int-regs 0 V int-regs 0 } } ] [ 2 get live-in ] unit-test

11
basis/compiler/cfg/liveness/liveness.factor
View File

@ -12,11 +12,14 @@ BACKWARD-ANALYSIS: live
GENERIC: insn-liveness ( live-set insn -- ) GENERIC: insn-liveness ( live-set insn -- )
: kill-defs ( live-set insn -- live-set )
defs-vregs [ over delete-at ] each ;
: gen-uses ( live-set insn -- live-set )
dup ##phi? [ drop ] [ uses-vregs [ over conjoin ] each ] if ;
: transfer-liveness ( live-set instructions -- live-set' ) : transfer-liveness ( live-set instructions -- live-set' )
[ clone ] [ <reversed> ] bi* [ [ clone ] [ <reversed> ] bi* [ [ kill-defs ] [ gen-uses ] bi ] each ;
[ dup ##phi? [ drop ] [ uses-vregs [ over conjoin ] each ] if ]
[ defs-vregs [ over delete-at ] each ] bi
] each ;
: local-live-in ( instructions -- live-set ) : local-live-in ( instructions -- live-set )
[ H{ } ] dip transfer-liveness keys ; [ H{ } ] dip transfer-liveness keys ;