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

compiler.cfg.linear-scan.resolve: fix incorrect behavior when one physical register is used with several representations in the same register class

db4
Slava Pestov 2010-04-26 05:37:48 -04:00
parent 51b13ce373
commit db7403d697
2 changed files with 92 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
View File

@ -7,7 +7,10 @@ IN: compiler.cfg.linear-scan.resolve.tests
[
{
{ { T{ spill-slot f 0 } int-rep } { 1 int-rep } }
{
T{ location f T{ spill-slot f 0 } int-rep int-regs }
T{ location f 1 int-rep int-regs }
}
}
] [
[
@ -21,7 +24,9 @@ IN: compiler.cfg.linear-scan.resolve.tests
}
] [
[
{ T{ spill-slot f 0 } int-rep } { 1 int-rep } >insn
T{ location f T{ spill-slot f 0 } int-rep int-regs }
T{ location f 1 int-rep int-regs }
>insn
] { } make
] unit-test
@ -31,7 +36,9 @@ IN: compiler.cfg.linear-scan.resolve.tests
}
] [
[
{ 1 int-rep } { T{ spill-slot f 0 } int-rep } >insn
T{ location f 1 int-rep int-regs }
T{ location f T{ spill-slot f 0 } int-rep int-regs }
>insn
] { } make
] unit-test
@ -41,17 +48,68 @@ IN: compiler.cfg.linear-scan.resolve.tests
}
] [
[
{ 1 int-rep } { 2 int-rep } >insn
T{ location f 1 int-rep int-regs }
T{ location f 2 int-rep int-regs }
>insn
] { } make
] unit-test
[
{
T{ ##copy { src 1 } { dst 2 } { rep int-rep } }
}
] [
{ { T{ location f 1 int-rep int-regs } T{ location f 2 int-rep int-regs } } }
mapping-instructions
] unit-test
[
{
T{ _spill { src 0 } { rep int-rep } { dst T{ spill-slot f 0 } } }
T{ _reload { dst 0 } { rep tagged-rep } { src T{ spill-slot f 1 } } }
}
] [
{
{ T{ location f T{ spill-slot f 1 } tagged-rep int-regs } T{ location f 0 tagged-rep int-regs } }
{ T{ location f 0 int-rep int-regs } T{ location f T{ spill-slot f 0 } int-rep int-regs } }
}
mapping-instructions
] unit-test
[
{
T{ _spill { src 0 } { rep int-rep } { dst T{ spill-slot f 1 } } }
T{ _reload { dst 0 } { rep tagged-rep } { src T{ spill-slot f 0 } } }
}
] [
{
{ T{ location f T{ spill-slot f 0 } tagged-rep int-regs } T{ location f 0 tagged-rep int-regs } }
{ T{ location f 0 int-rep int-regs } T{ location f T{ spill-slot f 1 } int-rep int-regs } }
}
mapping-instructions
] unit-test
[
{
T{ _spill { src 0 } { rep int-rep } { dst T{ spill-slot f 1 } } }
T{ _reload { dst 0 } { rep tagged-rep } { src T{ spill-slot f 0 } } }
}
] [
{
{ T{ location f 0 int-rep int-regs } T{ location f T{ spill-slot f 1 } int-rep int-regs } }
{ T{ location f T{ spill-slot f 0 } tagged-rep int-regs } T{ location f 0 tagged-rep int-regs } }
}
mapping-instructions
] unit-test
cfg new 8 >>spill-area-size cfg set
H{ } clone spill-temps set
[
t
] [
{ { { 0 int-rep } { 1 int-rep } } { { 1 int-rep } { 0 int-rep } } }
[ t ] [
{
{ T{ location f 0 int-rep int-regs } T{ location f 1 int-rep int-regs } }
{ T{ location f 1 int-rep int-regs } T{ location f 0 int-rep int-regs } }
}
mapping-instructions {
{
T{ _spill { src 0 } { rep int-rep } { dst T{ spill-slot f 8 } } }

35
basis/compiler/cfg/linear-scan/resolve/resolve.factor
View File

@ -1,8 +1,9 @@
! Copyright (C) 2009 Slava Pestov.
! Copyright (C) 2009, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays assocs combinators
combinators.short-circuit fry kernel locals namespaces
make math sequences hashtables
cpu.architecture
compiler.cfg
compiler.cfg.rpo
compiler.cfg.liveness
@ -15,13 +16,29 @@ compiler.cfg.linear-scan.assignment
compiler.cfg.linear-scan.allocation.state ;
IN: compiler.cfg.linear-scan.resolve
TUPLE: location
{ reg read-only }
{ rep read-only }
{ reg-class read-only } ;
: <location> ( reg rep -- location )
dup reg-class-of location boa ;
M: location equal?
over location? [
{ [ [ reg>> ] bi@ = ] [ [ reg-class>> ] bi@ = ] } 2&&
] [ 2drop f ] if ;
M: location hashcode*
reg>> hashcode* ;
SYMBOL: spill-temps
: spill-temp ( rep -- n )
spill-temps get [ next-spill-slot ] cache ;
: add-mapping ( from to rep -- )
'[ _ 2array ] bi@ 2array , ;
'[ _ <location> ] bi@ 2array , ;
:: resolve-value-data-flow ( bb to vreg -- )
vreg bb vreg-at-end
@ -34,19 +51,19 @@ SYMBOL: spill-temps
] if ;
: memory->register ( from to -- )
swap [ first2 ] [ first ] bi* _reload ;
swap [ reg>> ] [ [ rep>> ] [ reg>> ] bi ] bi* _reload ;
: register->memory ( from to -- )
[ first2 ] [ first ] bi* _spill ;
[ [ reg>> ] [ rep>> ] bi ] [ reg>> ] bi* _spill ;
: temp->register ( from to -- )
nip [ first ] [ second ] [ second spill-temp ] tri _reload ;
nip [ reg>> ] [ rep>> ] [ rep>> spill-temp ] tri _reload ;
: register->temp ( from to -- )
drop [ first2 ] [ second spill-temp ] bi _spill ;
drop [ [ reg>> ] [ rep>> ] bi ] [ rep>> spill-temp ] bi _spill ;
: register->register ( from to -- )
swap [ first ] [ first2 ] bi* ##copy ;
swap [ reg>> ] [ [ reg>> ] [ rep>> ] bi ] bi* ##copy ;
SYMBOL: temp
@ -54,8 +71,8 @@ SYMBOL: temp
{
{ [ over temp eq? ] [ temp->register ] }
{ [ dup temp eq? ] [ register->temp ] }
{ [ over first spill-slot? ] [ memory->register ] }
{ [ dup first spill-slot? ] [ register->memory ] }
{ [ over reg>> spill-slot? ] [ memory->register ] }
{ [ dup reg>> spill-slot? ] [ register->memory ] }
[ register->register ]
} cond ;