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

compiler.cfg: Fixing test failures

db4
Slava Pestov 2009-07-24 06:08:07 -05:00
parent 7068de6cd3
commit 13c3fdcb5c
4 changed files with 45 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
basis/compiler/cfg/value-numbering/simplify/simplify.factor
View File

@ -120,12 +120,12 @@ M: binary-expr simplify*
M: expr simplify* drop f ; M: expr simplify* drop f ;
: simplify ( expr -- simplified? vn ) : simplify ( expr -- vn )
dup simplify* { dup simplify* {
{ [ dup not ] [ drop expr>vn f ] } { [ dup not ] [ drop expr>vn ] }
{ [ dup expr? ] [ expr>vn nip t ] } { [ dup expr? ] [ expr>vn nip ] }
{ [ dup integer? ] [ nip t ] } { [ dup integer? ] [ nip ] }
} cond swap ; } cond ;
: number-values ( insn -- simplified? ) : number-values ( insn -- )
[ >expr simplify ] [ dst>> set-vn ] bi ; [ >expr simplify ] [ dst>> ] bi set-vn ;

47
basis/compiler/cfg/value-numbering/value-numbering-tests.factor
View File

@ -35,9 +35,9 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
[ [
{ {
T{ ##load-reference f V int-regs 0 0.0 } T{ ##load-reference f V int-regs 0 0.0 }
T{ ##load-reference f V int-regs 1 0.0 } T{ ##copy f V int-regs 1 V int-regs 0 }
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 0 D 0 }
T{ ##replace f V int-regs 0 D 1 } T{ ##replace f V int-regs 1 D 1 }
} }
] [ ] [
{ {
@ -51,9 +51,9 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
[ [
{ {
T{ ##load-reference f V int-regs 0 t } T{ ##load-reference f V int-regs 0 t }
T{ ##load-reference f V int-regs 1 t } T{ ##copy f V int-regs 1 V int-regs 0 }
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 0 D 0 }
T{ ##replace f V int-regs 0 D 1 } T{ ##replace f V int-regs 1 D 1 }
} }
] [ ] [
{ {
@ -64,29 +64,14 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
} value-numbering-step } value-numbering-step
] unit-test ] unit-test
! Copy propagation
[
{
T{ ##peek f V int-regs 45 D 1 }
T{ ##copy f V int-regs 48 V int-regs 45 }
T{ ##compare-imm-branch f V int-regs 45 7 cc/= }
}
] [
{
T{ ##peek f V int-regs 45 D 1 }
T{ ##copy f V int-regs 48 V int-regs 45 }
T{ ##compare-imm-branch f V int-regs 48 7 cc/= }
} value-numbering-step
] unit-test
! Compare propagation ! Compare propagation
[ [
{ {
T{ ##load-reference f V int-regs 1 + } T{ ##load-reference f V int-regs 1 + }
T{ ##peek f V int-regs 2 D 0 } T{ ##peek f V int-regs 2 D 0 }
T{ ##compare f V int-regs 4 V int-regs 2 V int-regs 1 cc> } T{ ##compare f V int-regs 4 V int-regs 2 V int-regs 1 cc> }
T{ ##compare f V int-regs 6 V int-regs 2 V int-regs 1 cc> } T{ ##copy f V int-regs 6 V int-regs 4 }
T{ ##replace f V int-regs 4 D 0 } T{ ##replace f V int-regs 6 D 0 }
} }
] [ ] [
{ {
@ -612,8 +597,8 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
T{ ##peek f V int-regs 0 D 0 } T{ ##peek f V int-regs 0 D 0 }
T{ ##peek f V int-regs 1 D 1 } T{ ##peek f V int-regs 1 D 1 }
T{ ##load-immediate f V int-regs 2 0 } T{ ##load-immediate f V int-regs 2 0 }
T{ ##add-imm f V int-regs 3 V int-regs 0 0 } T{ ##copy f V int-regs 3 V int-regs 0 }
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 3 D 0 }
} }
] [ ] [
{ {
@ -630,8 +615,8 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
T{ ##peek f V int-regs 0 D 0 } T{ ##peek f V int-regs 0 D 0 }
T{ ##peek f V int-regs 1 D 1 } T{ ##peek f V int-regs 1 D 1 }
T{ ##load-immediate f V int-regs 2 0 } T{ ##load-immediate f V int-regs 2 0 }
T{ ##add-imm f V int-regs 3 V int-regs 0 0 } T{ ##copy f V int-regs 3 V int-regs 0 }
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 3 D 0 }
} }
] [ ] [
{ {
@ -648,8 +633,8 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
T{ ##peek f V int-regs 0 D 0 } T{ ##peek f V int-regs 0 D 0 }
T{ ##peek f V int-regs 1 D 1 } T{ ##peek f V int-regs 1 D 1 }
T{ ##load-immediate f V int-regs 2 0 } T{ ##load-immediate f V int-regs 2 0 }
T{ ##or-imm f V int-regs 3 V int-regs 0 0 } T{ ##copy f V int-regs 3 V int-regs 0 }
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 3 D 0 }
} }
] [ ] [
{ {
@ -666,8 +651,8 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
T{ ##peek f V int-regs 0 D 0 } T{ ##peek f V int-regs 0 D 0 }
T{ ##peek f V int-regs 1 D 1 } T{ ##peek f V int-regs 1 D 1 }
T{ ##load-immediate f V int-regs 2 0 } T{ ##load-immediate f V int-regs 2 0 }
T{ ##xor-imm f V int-regs 3 V int-regs 0 0 } T{ ##copy f V int-regs 3 V int-regs 0 }
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 3 D 0 }
} }
] [ ] [
{ {
@ -683,8 +668,8 @@ compiler.cfg assocs vectors arrays layouts namespaces ;
{ {
T{ ##peek f V int-regs 0 D 0 } T{ ##peek f V int-regs 0 D 0 }
T{ ##load-immediate f V int-regs 1 1 } T{ ##load-immediate f V int-regs 1 1 }
T{ ##shl-imm f V int-regs 2 V int-regs 0 0 } T{ ##copy f V int-regs 2 V int-regs 0 }
T{ ##replace f V int-regs 0 D 0 } T{ ##replace f V int-regs 2 D 0 }
} }
] [ ] [
{ {

7
basis/compiler/cfg/value-numbering/value-numbering.factor
View File

@ -12,8 +12,9 @@ compiler.cfg.value-numbering.rewrite ;
IN: compiler.cfg.value-numbering IN: compiler.cfg.value-numbering
! Local value numbering. Predecessors must be recomputed after this ! Local value numbering. Predecessors must be recomputed after this
: >copy ( insn -- ##copy ) : >copy ( insn -- insn/##copy )
dst>> dup vreg>vn vn>vreg \ ##copy new-insn ; dup dst>> dup vreg>vn vn>vreg
2dup eq? [ 2drop ] [ \ ##copy new-insn nip ] if ;
: rewrite-loop ( insn -- insn' ) : rewrite-loop ( insn -- insn' )
dup rewrite [ rewrite-loop ] [ ] ?if ; dup rewrite [ rewrite-loop ] [ ] ?if ;
@ -23,7 +24,7 @@ GENERIC: process-instruction ( insn -- insn' )
M: ##flushable process-instruction M: ##flushable process-instruction
dup rewrite dup rewrite
[ process-instruction ] [ process-instruction ]
[ dup number-values [ >copy ] when ] ?if ; [ dup number-values >copy ] ?if ;
M: insn process-instruction M: insn process-instruction
dup rewrite dup rewrite

40
basis/compiler/cfg/write-barrier/write-barrier-tests.factor
View File

@ -1,42 +1,43 @@
USING: compiler.cfg.write-barrier compiler.cfg.instructions USING: compiler.cfg.write-barrier compiler.cfg.instructions
compiler.cfg.registers compiler.cfg.debugger cpu.architecture compiler.cfg.registers compiler.cfg.debugger cpu.architecture
arrays tools.test vectors compiler.cfg kernel accessors ; arrays tools.test vectors compiler.cfg kernel accessors
compiler.cfg.utilities ;
IN: compiler.cfg.write-barrier.tests IN: compiler.cfg.write-barrier.tests
: test-write-barrier ( insns -- insns ) : test-write-barrier ( insns -- insns )
write-barriers-step ; <simple-block> dup write-barriers-step instructions>> ;
[ [
{ V{
T{ ##peek f V int-regs 4 D 0 f } T{ ##peek f V int-regs 4 D 0 f }
T{ ##copy f V int-regs 6 V int-regs 4 f }
T{ ##allot f V int-regs 7 24 array V int-regs 8 f } T{ ##allot f V int-regs 7 24 array V int-regs 8 f }
T{ ##load-immediate f V int-regs 9 8 f } T{ ##load-immediate f V int-regs 9 8 f }
T{ ##set-slot-imm f V int-regs 9 V int-regs 7 1 3 f } T{ ##set-slot-imm f V int-regs 9 V int-regs 7 1 3 f }
T{ ##set-slot-imm f V int-regs 6 V int-regs 7 2 3 f } T{ ##set-slot-imm f V int-regs 4 V int-regs 7 2 3 f }
T{ ##replace f V int-regs 7 D 0 f } T{ ##replace f V int-regs 7 D 0 f }
T{ ##branch }
} }
] [ ] [
{ {
T{ ##peek f V int-regs 4 D 0 } T{ ##peek f V int-regs 4 D 0 }
T{ ##copy f V int-regs 6 V int-regs 4 }
T{ ##allot f V int-regs 7 24 array V int-regs 8 } T{ ##allot f V int-regs 7 24 array V int-regs 8 }
T{ ##load-immediate f V int-regs 9 8 } T{ ##load-immediate f V int-regs 9 8 }
T{ ##set-slot-imm f V int-regs 9 V int-regs 7 1 3 } T{ ##set-slot-imm f V int-regs 9 V int-regs 7 1 3 }
T{ ##write-barrier f V int-regs 7 V int-regs 10 V int-regs 11 } T{ ##write-barrier f V int-regs 7 V int-regs 10 V int-regs 11 }
T{ ##set-slot-imm f V int-regs 6 V int-regs 7 2 3 } T{ ##set-slot-imm f V int-regs 4 V int-regs 7 2 3 }
T{ ##write-barrier f V int-regs 7 V int-regs 12 V int-regs 13 } T{ ##write-barrier f V int-regs 7 V int-regs 12 V int-regs 13 }
T{ ##replace f V int-regs 7 D 0 } T{ ##replace f V int-regs 7 D 0 }
} test-write-barrier } test-write-barrier
] unit-test ] unit-test
[ [
{ V{
T{ ##load-immediate f V int-regs 4 24 } T{ ##load-immediate f V int-regs 4 24 }
T{ ##peek f V int-regs 5 D -1 } T{ ##peek f V int-regs 5 D -1 }
T{ ##peek f V int-regs 6 D -2 } T{ ##peek f V int-regs 6 D -2 }
T{ ##set-slot-imm f V int-regs 5 V int-regs 6 3 2 } T{ ##set-slot-imm f V int-regs 5 V int-regs 6 3 2 }
T{ ##write-barrier f V int-regs 6 V int-regs 7 V int-regs 8 } T{ ##write-barrier f V int-regs 6 V int-regs 7 V int-regs 8 }
T{ ##branch }
} }
] [ ] [
{ {
@ -49,28 +50,23 @@ IN: compiler.cfg.write-barrier.tests
] unit-test ] unit-test
[ [
{ V{
T{ ##peek f V int-regs 19 D -3 } T{ ##peek f V int-regs 19 D -3 }
T{ ##peek f V int-regs 22 D -2 } T{ ##peek f V int-regs 22 D -2 }
T{ ##copy f V int-regs 23 V int-regs 19 } T{ ##set-slot-imm f V int-regs 22 V int-regs 19 3 2 }
T{ ##set-slot-imm f V int-regs 22 V int-regs 23 3 2 } T{ ##write-barrier f V int-regs 19 V int-regs 24 V int-regs 25 }
T{ ##write-barrier f V int-regs 23 V int-regs 24 V int-regs 25 }
T{ ##copy f V int-regs 26 V int-regs 19 }
T{ ##peek f V int-regs 28 D -1 } T{ ##peek f V int-regs 28 D -1 }
T{ ##copy f V int-regs 29 V int-regs 19 } T{ ##set-slot-imm f V int-regs 28 V int-regs 19 4 2 }
T{ ##set-slot-imm f V int-regs 28 V int-regs 29 4 2 } T{ ##branch }
} }
] [ ] [
{ {
T{ ##peek f V int-regs 19 D -3 } T{ ##peek f V int-regs 19 D -3 }
T{ ##peek f V int-regs 22 D -2 } T{ ##peek f V int-regs 22 D -2 }
T{ ##copy f V int-regs 23 V int-regs 19 } T{ ##set-slot-imm f V int-regs 22 V int-regs 19 3 2 }
T{ ##set-slot-imm f V int-regs 22 V int-regs 23 3 2 } T{ ##write-barrier f V int-regs 19 V int-regs 24 V int-regs 25 }
T{ ##write-barrier f V int-regs 23 V int-regs 24 V int-regs 25 }
T{ ##copy f V int-regs 26 V int-regs 19 }
T{ ##peek f V int-regs 28 D -1 } T{ ##peek f V int-regs 28 D -1 }
T{ ##copy f V int-regs 29 V int-regs 19 } T{ ##set-slot-imm f V int-regs 28 V int-regs 19 4 2 }
T{ ##set-slot-imm f V int-regs 28 V int-regs 29 4 2 } T{ ##write-barrier f V int-regs 19 V int-regs 30 V int-regs 3 }
T{ ##write-barrier f V int-regs 29 V int-regs 30 V int-regs 3 }
} test-write-barrier } test-write-barrier
] unit-test ] unit-test