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

compiler.cfg: Fix regressions from recent changes

db4
Slava Pestov 2009-07-14 20:43:06 -05:00
parent 4ac74e9304
commit ebcd0dc252
3 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/compiler/cfg/stack-analysis/stack-analysis-tests.factor
View File

@ -91,9 +91,9 @@ IN: compiler.cfg.stack-analysis.tests
! Sync before a back-edge, not after ! Sync before a back-edge, not after
! ##peeks should be inserted before a ##loop-entry ! ##peeks should be inserted before a ##loop-entry
! Don't optimize out the constants ! Don't optimize out the constants
[ 1 t ] [ [ t ] [
[ 1000 [ ] times ] test-stack-analysis eliminate-dead-code linearize [ 1000 [ ] times ] test-stack-analysis eliminate-dead-code linearize
[ [ ##add-imm? ] count ] [ [ ##load-immediate? ] any? ] bi [ ##load-immediate? ] any?
] unit-test ] unit-test
! Correct height tracking ! Correct height tracking

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

@ -1267,3 +1267,68 @@ test-diamond
[ t ] [ 1 get successors>> first 3 get eq? ] unit-test [ t ] [ 1 get successors>> first 3 get eq? ] unit-test
[ 1 ] [ 3 get instructions>> first inputs>> assoc-size ] unit-test [ 1 ] [ 3 get instructions>> first inputs>> assoc-size ] unit-test
V{ T{ ##prologue } T{ ##branch } } 0 test-bb
V{
T{ ##peek { dst V int-regs 15 } { loc D 0 } }
T{ ##copy { dst V int-regs 16 } { src V int-regs 15 } }
T{ ##copy { dst V int-regs 17 } { src V int-regs 15 } }
T{ ##copy { dst V int-regs 18 } { src V int-regs 15 } }
T{ ##copy { dst V int-regs 19 } { src V int-regs 15 } }
T{ ##compare
{ dst V int-regs 20 }
{ src1 V int-regs 18 }
{ src2 V int-regs 19 }
{ cc cc= }
{ temp V int-regs 22 }
}
T{ ##copy { dst V int-regs 21 } { src V int-regs 20 } }
T{ ##compare-imm-branch
{ src1 V int-regs 21 }
{ src2 5 }
{ cc cc/= }
}
} 1 test-bb
V{
T{ ##copy { dst V int-regs 23 } { src V int-regs 15 } }
T{ ##copy { dst V int-regs 24 } { src V int-regs 15 } }
T{ ##load-reference { dst V int-regs 25 } { obj t } }
T{ ##branch }
} 2 test-bb
V{
T{ ##replace { src V int-regs 25 } { loc D 0 } }
T{ ##epilogue }
T{ ##return }
} 3 test-bb
V{
T{ ##copy { dst V int-regs 26 } { src V int-regs 15 } }
T{ ##copy { dst V int-regs 27 } { src V int-regs 15 } }
T{ ##add
{ dst V int-regs 28 }
{ src1 V int-regs 26 }
{ src2 V int-regs 27 }
}
T{ ##branch }
} 4 test-bb
V{
T{ ##replace { src V int-regs 28 } { loc D 0 } }
T{ ##epilogue }
T{ ##return }
} 5 test-bb
0 get 1 get 1vector >>successors drop
1 get 2 get 4 get V{ } 2sequence >>successors drop
2 get 3 get 1vector >>successors drop
4 get 5 get 1vector >>successors drop
[ ] [
cfg new 0 get >>entry
compute-liveness value-numbering eliminate-dead-code drop
] unit-test
[ f ] [ 1 get instructions>> [ ##peek? ] any? ] unit-test

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

@ -2,6 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: namespaces assocs biassocs classes kernel math accessors USING: namespaces assocs biassocs classes kernel math accessors
sorting sets sequences fry sorting sets sequences fry
compiler.cfg
compiler.cfg.local compiler.cfg.local
compiler.cfg.liveness compiler.cfg.liveness
compiler.cfg.renaming compiler.cfg.renaming
@ -34,4 +35,5 @@ IN: compiler.cfg.value-numbering
[ rewrite ] map dup rename-uses ; [ rewrite ] map dup rename-uses ;
: value-numbering ( cfg -- cfg' ) : value-numbering ( cfg -- cfg' )
[ init-value-numbering ] [ value-numbering-step ] local-optimization ; [ init-value-numbering ] [ value-numbering-step ] local-optimization
cfg-changed ;