compiler.cfg: fix unit tests
Slava Pestov
parent
45eb68fa38
commit
d48c72a274
|
|
@ -1306,10 +1306,11 @@ V{
|
|||
{ slot 2 }
|
||||
{ tag 7 }
|
||||
}
|
||||
T{ ##write-barrier
|
||||
T{ ##write-barrier-imm
|
||||
{ src 141 }
|
||||
{ card# 145 }
|
||||
{ table 146 }
|
||||
{ slot 2 }
|
||||
{ temp1 145 }
|
||||
{ temp2 146 }
|
||||
}
|
||||
T{ ##inc-d { n -1 } }
|
||||
T{ ##inc-r { n -1 } }
|
||||
|
|
|
|||
|
|
@ -1,190 +0,0 @@
|
|||
! Copyright (C) 2008, 2009 Slava Pestov, Daniel Ehrenberg.
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: accessors arrays assocs compiler.cfg
|
||||
compiler.cfg.alias-analysis compiler.cfg.block-joining
|
||||
compiler.cfg.branch-splitting compiler.cfg.copy-prop
|
||||
compiler.cfg.dce compiler.cfg.debugger
|
||||
compiler.cfg.instructions compiler.cfg.loop-detection
|
||||
compiler.cfg.registers compiler.cfg.ssa.construction
|
||||
compiler.cfg.tco compiler.cfg.useless-conditionals
|
||||
compiler.cfg.utilities compiler.cfg.value-numbering
|
||||
compiler.cfg.write-barrier cpu.architecture kernel
|
||||
kernel.private math namespaces sequences sequences.private
|
||||
tools.test vectors ;
|
||||
IN: compiler.cfg.write-barrier.tests
|
||||
|
||||
: test-write-barrier ( insns -- insns )
|
||||
<simple-block> dup write-barriers-step instructions>> ;
|
||||
|
||||
[
|
||||
V{
|
||||
T{ ##peek f 4 D 0 f }
|
||||
T{ ##allot f 7 24 array 8 f }
|
||||
T{ ##load-immediate f 9 8 f }
|
||||
T{ ##set-slot-imm f 9 7 1 3 f }
|
||||
T{ ##set-slot-imm f 4 7 2 3 f }
|
||||
T{ ##replace f 7 D 0 f }
|
||||
T{ ##branch }
|
||||
}
|
||||
] [
|
||||
{
|
||||
T{ ##peek f 4 D 0 }
|
||||
T{ ##allot f 7 24 array 8 }
|
||||
T{ ##load-immediate f 9 8 }
|
||||
T{ ##set-slot-imm f 9 7 1 3 }
|
||||
T{ ##write-barrier f 7 10 11 }
|
||||
T{ ##set-slot-imm f 4 7 2 3 }
|
||||
T{ ##write-barrier f 7 12 13 }
|
||||
T{ ##replace f 7 D 0 }
|
||||
} test-write-barrier
|
||||
] unit-test
|
||||
|
||||
[
|
||||
V{
|
||||
T{ ##load-immediate f 4 24 }
|
||||
T{ ##peek f 5 D -1 }
|
||||
T{ ##peek f 6 D -2 }
|
||||
T{ ##set-slot-imm f 5 6 3 2 }
|
||||
T{ ##write-barrier f 6 7 8 }
|
||||
T{ ##branch }
|
||||
}
|
||||
] [
|
||||
{
|
||||
T{ ##load-immediate f 4 24 }
|
||||
T{ ##peek f 5 D -1 }
|
||||
T{ ##peek f 6 D -2 }
|
||||
T{ ##set-slot-imm f 5 6 3 2 }
|
||||
T{ ##write-barrier f 6 7 8 }
|
||||
} test-write-barrier
|
||||
] unit-test
|
||||
|
||||
[
|
||||
V{
|
||||
T{ ##peek f 19 D -3 }
|
||||
T{ ##peek f 22 D -2 }
|
||||
T{ ##set-slot-imm f 22 19 3 2 }
|
||||
T{ ##write-barrier f 19 24 25 }
|
||||
T{ ##peek f 28 D -1 }
|
||||
T{ ##set-slot-imm f 28 19 4 2 }
|
||||
T{ ##branch }
|
||||
}
|
||||
] [
|
||||
{
|
||||
T{ ##peek f 19 D -3 }
|
||||
T{ ##peek f 22 D -2 }
|
||||
T{ ##set-slot-imm f 22 19 3 2 }
|
||||
T{ ##write-barrier f 19 24 25 }
|
||||
T{ ##peek f 28 D -1 }
|
||||
T{ ##set-slot-imm f 28 19 4 2 }
|
||||
T{ ##write-barrier f 19 30 3 }
|
||||
} test-write-barrier
|
||||
] unit-test
|
||||
|
||||
V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} 1 test-bb
|
||||
V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} 2 test-bb
|
||||
1 get 2 get 1vector >>successors drop
|
||||
cfg new 1 get >>entry 0 set
|
||||
|
||||
[ ] [ 0 [ eliminate-write-barriers ] change ] unit-test
|
||||
[ V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} ] [ 1 get instructions>> ] unit-test
|
||||
[ V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
} ] [ 2 get instructions>> ] unit-test
|
||||
|
||||
V{
|
||||
T{ ##allot f 1 }
|
||||
} 1 test-bb
|
||||
V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} 2 test-bb
|
||||
1 get 2 get 1vector >>successors drop
|
||||
cfg new 1 get >>entry 0 set
|
||||
|
||||
[ ] [ 0 [ eliminate-write-barriers ] change ] unit-test
|
||||
[ V{
|
||||
T{ ##allot f 1 }
|
||||
} ] [ 1 get instructions>> ] unit-test
|
||||
[ V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
} ] [ 2 get instructions>> ] unit-test
|
||||
|
||||
V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} 1 test-bb
|
||||
V{
|
||||
T{ ##allot }
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} 2 test-bb
|
||||
1 get 2 get 1vector >>successors drop
|
||||
cfg new 1 get >>entry 0 set
|
||||
|
||||
[ ] [ 0 [ eliminate-write-barriers ] change ] unit-test
|
||||
[ V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} ] [ 1 get instructions>> ] unit-test
|
||||
[ V{
|
||||
T{ ##allot }
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} ] [ 2 get instructions>> ] unit-test
|
||||
|
||||
V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} 1 test-bb
|
||||
V{
|
||||
T{ ##allot }
|
||||
} 2 test-bb
|
||||
1 get 2 get 1vector >>successors drop
|
||||
V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} 3 test-bb
|
||||
2 get 3 get 1vector >>successors drop
|
||||
cfg new 1 get >>entry 0 set
|
||||
[ ] [ 0 [ eliminate-write-barriers ] change ] unit-test
|
||||
[ V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} ] [ 1 get instructions>> ] unit-test
|
||||
[ V{ T{ ##allot } } ] [ 2 get instructions>> ] unit-test
|
||||
[ V{
|
||||
T{ ##set-slot-imm f 2 1 3 4 }
|
||||
T{ ##write-barrier f 1 2 3 }
|
||||
} ] [ 3 get instructions>> ] unit-test
|
||||
|
||||
: reverse-here' ( seq -- )
|
||||
{ array } declare
|
||||
[ length 2/ iota ] [ length ] [ ] tri
|
||||
[ [ over - 1 - ] dip exchange-unsafe ] 2curry each ;
|
||||
|
||||
: write-barrier-stats ( word -- cfg )
|
||||
test-cfg first [
|
||||
optimize-tail-calls
|
||||
delete-useless-conditionals
|
||||
split-branches
|
||||
join-blocks
|
||||
construct-ssa
|
||||
alias-analysis
|
||||
value-numbering
|
||||
copy-propagation
|
||||
eliminate-dead-code
|
||||
eliminate-write-barriers
|
||||
] with-cfg
|
||||
post-order>> write-barriers
|
||||
[ [ loop-nesting-at ] [ length ] bi* ] assoc-map ;
|
||||
|
||||
[ { { 0 1 } } ] [ \ reverse-here' write-barrier-stats ] unit-test
|
||||
Loading…
Reference in New Issue