stomp.cli: simplify

[factor.git] / basis / compiler / cfg / linear-scan / linear-scan-tests.factor

diff --git a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
index 35797ee3b9d8856b53daddfe34784d078abb7b34..8438faa597c1d58f1995a3e7ebd567c4ecdb26e4 100644 (file)
--- a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
+++ b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
@@ -1,5 +1,5 @@
-USING: tools.test random sorting sequences sets hashtables assocs
-kernel fry arrays splitting namespaces math accessors vectors locals
+USING: tools.test random sorting sequences hashtables assocs
+kernel arrays splitting namespaces math accessors vectors
 math.order grouping strings strings.private classes layouts
 cpu.architecture
 compiler.cfg
@@ -28,17 +28,14 @@ check-allocation? on
 check-numbering? on
 
 ! Live interval calculation
-
-! A value is defined and never used; make sure it has the right
-! live range
-V{
-    T{ ##load-integer f 1 0 }
-    T{ ##replace-imm f D: 0 "hi" }
-    T{ ##branch }
-} 0 test-bb
-
 : test-live-intervals ( -- )
-    0 get block>cfg
+    ! A value is defined and never used; make sure it has the right
+    ! live range
+    {
+        T{ ##load-integer f 1 0 }
+        T{ ##replace-imm f D: 0 "hi" }
+        T{ ##branch }
+    } insns>cfg
     [ cfg set ] [ number-instructions ] [ compute-live-intervals ] tri
     drop ;
 
@@ -53,12 +50,11 @@ V{
 ] unit-test
 
 { 0 0 } [
-    1 live-intervals get at [ start>> ] [ end>> ] bi
+    1 live-intervals get at ranges>> ranges-endpoints
 ] unit-test
 
 ! Live interval splitting
-
-cfg new 0 >>spill-area-size 4 >>spill-area-align cfg set
+{ } insns>cfg [ stack-frame>> 4 >>spill-area-align drop ] keep cfg set
 H{ } spill-slots set
 
 H{
@@ -68,34 +64,34 @@ H{
 } representations set
 
 : clean-up-split ( a b -- a b )
-    [ dup [ [ >vector ] change-uses [ >vector ] change-ranges ] when ] bi@ ;
+    [ [ [ >vector ] change-uses [ >vector ] change-ranges ] ?call ] bi@ ;
 
 {
     T{ live-interval-state
        { vreg 1 }
-       { start 0 }
-       { end 2 }
        { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 1 f float-rep } } }
-       { ranges V{ T{ live-range f 0 2 } } }
+       { ranges V{ { 0 2 } } }
        { spill-to T{ spill-slot f 0 } }
        { spill-rep float-rep }
     }
     T{ live-interval-state
        { vreg 1 }
-       { start 5 }
-       { end 5 }
        { uses V{ T{ vreg-use f 5 f float-rep } } }
-       { ranges V{ T{ live-range f 5 5 } } }
+       { ranges V{ { 5 5 } } }
        { reload-from T{ spill-slot f 0 } }
        { reload-rep float-rep }
     }
 } [
     T{ live-interval-state
        { vreg 1 }
-       { start 0 }
-       { end 5 }
-       { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 1 f float-rep } T{ vreg-use f 5 f float-rep } } }
-       { ranges V{ T{ live-range f 0 5 } } }
+       { uses
+         V{
+             T{ vreg-use f 0 float-rep f }
+             T{ vreg-use f 1 f float-rep }
+             T{ vreg-use f 5 f float-rep }
+         }
+       }
+       { ranges V{ { 0 5 } } }
     } 2 split-for-spill
     clean-up-split
 ] unit-test
@@ -104,20 +100,22 @@ H{
     f
     T{ live-interval-state
        { vreg 2 }
-       { start 1 }
-       { end 5 }
        { uses V{ T{ vreg-use f 1 f float-rep } T{ vreg-use f 5 f float-rep } } }
-       { ranges V{ T{ live-range f 1 5 } } }
+       { ranges V{ { 1 5 } } }
        { reload-from T{ spill-slot f 4 } }
        { reload-rep float-rep }
     }
 } [
     T{ live-interval-state
        { vreg 2 }
-       { start 0 }
-       { end 5 }
-       { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 1 f float-rep } T{ vreg-use f 5 f float-rep } } }
-       { ranges V{ T{ live-range f 0 5 } } }
+       { uses
+         V{
+             T{ vreg-use f 0 float-rep f }
+             T{ vreg-use f 1 f float-rep }
+             T{ vreg-use f 5 f float-rep }
+         }
+       }
+       { ranges V{ { 0 5 } } }
     } 0 split-for-spill
     clean-up-split
 ] unit-test
@@ -125,10 +123,8 @@ H{
 {
     T{ live-interval-state
        { vreg 3 }
-       { start 0 }
-       { end 2 }
        { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 1 f float-rep } } }
-       { ranges V{ T{ live-range f 0 2 } } }
+       { ranges V{ { 0 2 } } }
        { spill-to T{ spill-slot f 8 } }
        { spill-rep float-rep }
     }
@@ -136,10 +132,14 @@ H{
 } [
     T{ live-interval-state
        { vreg 3 }
-       { start 0 }
-       { end 5 }
-       { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 1 f float-rep } T{ vreg-use f 5 f float-rep } } }
-       { ranges V{ T{ live-range f 0 5 } } }
+       { uses
+         V{
+             T{ vreg-use f 0 float-rep f }
+             T{ vreg-use f 1 f float-rep }
+             T{ vreg-use f 5 f float-rep }
+         }
+       }
+       { ranges V{ { 0 5 } } }
     } 5 split-for-spill
     clean-up-split
 ] unit-test
@@ -147,29 +147,29 @@ H{
 {
     T{ live-interval-state
        { vreg 4 }
-       { start 0 }
-       { end 1 }
        { uses V{ T{ vreg-use f 0 float-rep f } } }
-       { ranges V{ T{ live-range f 0 1 } } }
+       { ranges V{ { 0 1 } } }
        { spill-to T{ spill-slot f 12 } }
        { spill-rep float-rep }
     }
     T{ live-interval-state
        { vreg 4 }
-       { start 20 }
-       { end 30 }
        { uses V{ T{ vreg-use f 20 f float-rep } T{ vreg-use f 30 f float-rep } } }
-       { ranges V{ T{ live-range f 20 30 } } }
+       { ranges V{ { 20 30 } } }
        { reload-from T{ spill-slot f 12 } }
        { reload-rep float-rep }
     }
 } [
     T{ live-interval-state
        { vreg 4 }
-       { start 0 }
-       { end 30 }
-       { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 20 f float-rep } T{ vreg-use f 30 f float-rep } } }
-       { ranges V{ T{ live-range f 0 8 } T{ live-range f 10 18 } T{ live-range f 20 30 } } }
+       { uses
+         V{
+             T{ vreg-use f 0 float-rep f }
+             T{ vreg-use f 20 f float-rep }
+             T{ vreg-use f 30 f float-rep }
+         }
+       }
+       { ranges V{ { 0 8 } { 10 18 } { 20 30 } } }
     } 10 split-for-spill
     clean-up-split
 ] unit-test
@@ -178,27 +178,27 @@ H{
 {
     T{ live-interval-state
        { vreg 5 }
-       { start 0 }
-       { end 1 }
        { uses V{ T{ vreg-use f 0 float-rep f } } }
-       { ranges V{ T{ live-range f 0 1 } } }
+       { ranges V{ { 0 1 } } }
        { spill-to T{ spill-slot f 16 } }
        { spill-rep float-rep }
     }
     T{ live-interval-state
        { vreg 5 }
-       { start 20 }
-       { end 30 }
        { uses V{ T{ vreg-use f 20 float-rep f } T{ vreg-use f 30 f float-rep } } }
-       { ranges V{ T{ live-range f 20 30 } } }
+       { ranges V{ { 20 30 } } }
     }
 } [
     T{ live-interval-state
        { vreg 5 }
-       { start 0 }
-       { end 30 }
-       { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 20 float-rep f } T{ vreg-use f 30 f float-rep } } }
-       { ranges V{ T{ live-range f 0 8 } T{ live-range f 10 18 } T{ live-range f 20 30 } } }
+       { uses
+         V{
+             T{ vreg-use f 0 float-rep f }
+             T{ vreg-use f 20 float-rep f }
+             T{ vreg-use f 30 f float-rep }
+         }
+       }
+       { ranges V{ { 0 8 } { 10 18 } { 20 30 } } }
     } 10 split-for-spill
     clean-up-split
 ] unit-test
@@ -207,29 +207,29 @@ H{
 {
     T{ live-interval-state
        { vreg 6 }
-       { start 0 }
-       { end 11 }
        { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 10 double-rep float-rep } } }
-       { ranges V{ T{ live-range f 0 11 } } }
+       { ranges V{ { 0 11 } } }
        { spill-to T{ spill-slot f 24 } }
        { spill-rep double-rep }
     }
     T{ live-interval-state
        { vreg 6 }
-       { start 20 }
-       { end 20 }
        { uses V{ T{ vreg-use f 20 f double-rep } } }
-       { ranges V{ T{ live-range f 20 20 } } }
+       { ranges V{ { 20 20 } } }
        { reload-from T{ spill-slot f 24 } }
        { reload-rep double-rep }
     }
 } [
     T{ live-interval-state
        { vreg 6 }
-       { start 0 }
-       { end 20 }
-       { uses V{ T{ vreg-use f 0 float-rep f } T{ vreg-use f 10 double-rep float-rep } T{ vreg-use f 20 f double-rep } } }
-       { ranges V{ T{ live-range f 0 20 } } }
+       { uses
+         V{
+             T{ vreg-use f 0 float-rep f }
+             T{ vreg-use f 10 double-rep float-rep }
+             T{ vreg-use f 20 f double-rep }
+         }
+       }
+       { ranges V{ { 0 20 } } }
     } 15 split-for-spill
     clean-up-split
 ] unit-test
@@ -238,17 +238,13 @@ H{
     f
     T{ live-interval-state
         { vreg 7 }
-        { start 8 }
-        { end 8 }
-        { ranges V{ T{ live-range f 8 8 } } }
+        { ranges V{ { 8 8 } } }
         { uses V{ T{ vreg-use f 8 int-rep } } }
     }
 } [
     T{ live-interval-state
         { vreg 7 }
-        { start 4 }
-        { end 8 }
-        { ranges V{ T{ live-range f 4 8 } } }
+        { ranges V{ { 4 8 } } }
         { uses V{ T{ vreg-use f 8 int-rep } } }
     } 4 split-for-spill
     clean-up-split
@@ -258,18 +254,14 @@ H{
 {
     T{ live-interval-state
         { vreg 8 }
-        { start 0 }
-        { end 3 }
-        { ranges V{ T{ live-range f 0 3 } } }
+        { ranges V{ { 0 3 } } }
         { uses V{ T{ vreg-use f 0 f int-rep } T{ vreg-use f 2 f int-rep } } }
         { spill-to T{ spill-slot f 32 } }
         { spill-rep int-rep }
     }
     T{ live-interval-state
         { vreg 8 }
-        { start 14 }
-        { end 16 }
-        { ranges V{ T{ live-range f 14 16 } } }
+        { ranges V{ { 14 16 } } }
         { uses V{ T{ vreg-use f 14 f int-rep } } }
         { reload-from T{ spill-slot f 32 } }
         { reload-rep int-rep }
@@ -277,9 +269,7 @@ H{
 } [
     T{ live-interval-state
         { vreg 8 }
-        { start 0 }
-        { end 16 }
-        { ranges V{ T{ live-range f 0 4 } T{ live-range f 6 10 } T{ live-range f 12 16 } } }
+        { ranges V{ { 0 4 } { 6 10 } { 12 16 } } }
         { uses
           V{
               T{ vreg-use f 0 f int-rep }
@@ -308,22 +298,33 @@ H{
               T{ live-interval-state
                  { vreg 1 }
                  { reg 1 }
-                 { start 1 }
-                 { end 15 }
-                 { uses V{ T{ vreg-use f 1 int-rep f } T{ vreg-use f 3 f int-rep } T{ vreg-use f 7 f int-rep } T{ vreg-use f 10 f int-rep } T{ vreg-use f 15 f int-rep } } }
+                 { ranges V{ { 1 15 } } }
+                 { uses
+                   V{
+                       T{ vreg-use f 1 int-rep f }
+                       T{ vreg-use f 3 f int-rep }
+                       T{ vreg-use f 7 f int-rep }
+                       T{ vreg-use f 10 f int-rep }
+                       T{ vreg-use f 15 f int-rep }
+                   }
+                 }
               }
               T{ live-interval-state
                  { vreg 2 }
                  { reg 2 }
-                 { start 3 }
-                 { end 8 }
-                 { uses V{ T{ vreg-use f 3 int-rep f } T{ vreg-use f 4 f int-rep } T{ vreg-use f 8 f int-rep } } }
+                 { ranges V{ { 3 8 } } }
+                 { uses
+                   V{
+                       T{ vreg-use f 3 int-rep f }
+                       T{ vreg-use f 4 f int-rep }
+                       T{ vreg-use f 8 f int-rep }
+                   }
+                 }
               }
               T{ live-interval-state
                  { vreg 3 }
                  { reg 3 }
-                 { start 3 }
-                 { end 10 }
+                 { ranges V{ { 3 10 } } }
                  { uses V{ T{ vreg-use f 3 int-rep f } T{ vreg-use f 10 f int-rep } } }
               }
           }
@@ -331,10 +332,9 @@ H{
     } active-intervals set
     H{ } inactive-intervals set
     T{ live-interval-state
-        { vreg 1 }
-        { start 5 }
-        { end 5 }
-        { uses V{ T{ vreg-use f 5 int-rep f } } }
+       { vreg 1 }
+       { ranges V{ { 5 5 } } }
+       { uses V{ T{ vreg-use f 5 int-rep f } } }
     }
     spill-status
 ] unit-test
@@ -351,15 +351,12 @@ H{
               T{ live-interval-state
                  { vreg 1 }
                  { reg 1 }
-                 { start 1 }
-                 { end 15 }
+                 { ranges V{ { 1 15 } } }
                  { uses V{ T{ vreg-use f 1 int-rep f } } }
               }
               T{ live-interval-state
                  { vreg 2 }
                  { reg 2 }
-                 { start 3 }
-                 { end 8 }
                  { uses V{ T{ vreg-use f 3 int-rep f } T{ vreg-use f 8 f int-rep } } }
               }
           }
@@ -367,10 +364,9 @@ H{
     } active-intervals set
     H{ } inactive-intervals set
     T{ live-interval-state
-        { vreg 3 }
-        { start 5 }
-        { end 5 }
-        { uses V{ T{ vreg-use f 5 int-rep f } } }
+       { vreg 3 }
+       { ranges V{ { 5 5 } } }
+       { uses V{ T{ vreg-use f 5 int-rep f } } }
     }
     spill-status
 ] unit-test
@@ -381,10 +377,8 @@ H{ { 1 int-rep } { 2 int-rep } } representations set
     {
         T{ live-interval-state
            { vreg 1 }
-           { start 0 }
-           { end 100 }
            { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 100 f int-rep } } }
-           { ranges V{ T{ live-range f 0 100 } } }
+           { ranges V{ { 0 100 } } }
         }
     }
     H{ { int-regs { "A" } } }
@@ -395,17 +389,13 @@ H{ { 1 int-rep } { 2 int-rep } } representations set
     {
         T{ live-interval-state
            { vreg 1 }
-           { start 0 }
-           { end 10 }
            { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 10 f int-rep } } }
-           { ranges V{ T{ live-range f 0 10 } } }
+           { ranges V{ { 0 10 } } }
         }
         T{ live-interval-state
            { vreg 2 }
-           { start 11 }
-           { end 20 }
            { uses V{ T{ vreg-use f 11 int-rep f } T{ vreg-use f 20 f int-rep } } }
-           { ranges V{ T{ live-range f 11 20 } } }
+           { ranges V{ { 11 20 } } }
         }
     }
     H{ { int-regs { "A" } } }
@@ -416,17 +406,13 @@ H{ { 1 int-rep } { 2 int-rep } } representations set
     {
         T{ live-interval-state
            { vreg 1 }
-           { start 0 }
-           { end 100 }
            { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 100 f int-rep } } }
-           { ranges V{ T{ live-range f 0 100 } } }
+           { ranges V{ { 0 100 } } }
         }
         T{ live-interval-state
            { vreg 2 }
-           { start 30 }
-           { end 60 }
            { uses V{ T{ vreg-use f 30 int-rep f } T{ vreg-use f 60 f int-rep } } }
-           { ranges V{ T{ live-range f 30 60 } } }
+           { ranges V{ { 30 60 } } }
         }
     }
     H{ { int-regs { "A" } } }
@@ -437,17 +423,13 @@ H{ { 1 int-rep } { 2 int-rep } } representations set
     {
         T{ live-interval-state
            { vreg 1 }
-           { start 0 }
-           { end 100 }
            { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 100 f int-rep } } }
-           { ranges V{ T{ live-range f 0 100 } } }
+           { ranges V{ { 0 100 } } }
         }
         T{ live-interval-state
            { vreg 2 }
-           { start 30 }
-           { end 200 }
            { uses V{ T{ vreg-use f 30 int-rep f } T{ vreg-use f 200 f int-rep } } }
-           { ranges V{ T{ live-range f 30 200 } } }
+           { ranges V{ { 30 200 } } }
         }
     }
     H{ { int-regs { "A" } } }
@@ -458,17 +440,13 @@ H{ { 1 int-rep } { 2 int-rep } } representations set
     {
         T{ live-interval-state
            { vreg 1 }
-           { start 0 }
-           { end 100 }
            { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 100 f int-rep } } }
-           { ranges V{ T{ live-range f 0 100 } } }
+           { ranges V{ { 0 100 } } }
         }
         T{ live-interval-state
            { vreg 2 }
-           { start 30 }
-           { end 100 }
            { uses V{ T{ vreg-use f 30 int-rep f } T{ vreg-use f 100 f int-rep } } }
-           { ranges V{ T{ live-range f 30 100 } } }
+           { ranges V{ { 30 100 } } }
         }
     }
     H{ { int-regs { "A" } } }
@@ -488,40 +466,42 @@ H{
     {
         T{ live-interval-state
            { vreg 1 }
-           { start 0 }
-           { end 20 }
-           { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 10 f int-rep } T{ vreg-use f 20 f int-rep } } }
-           { ranges V{ T{ live-range f 0 2 } T{ live-range f 10 20 } } }
+           { uses
+             V{
+                 T{ vreg-use f 0 int-rep f }
+                 T{ vreg-use f 10 f int-rep }
+                 T{ vreg-use f 20 f int-rep }
+             }
+           }
+           { ranges V{ { 0 2 } { 10 20 } } }
         }
         T{ live-interval-state
            { vreg 2 }
-           { start 0 }
-           { end 20 }
-           { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 10 f int-rep } T{ vreg-use f 20 f int-rep } } }
-           { ranges V{ T{ live-range f 0 2 } T{ live-range f 10 20 } } }
+           { uses
+             V{
+                 T{ vreg-use f 0 int-rep f }
+                 T{ vreg-use f 10 f int-rep }
+                 T{ vreg-use f 20 f int-rep }
+             }
+           }
+           { ranges V{ { 0 2 } { 10 20 } } }
         }
         T{ live-interval-state
            { vreg 3 }
-           { start 4 }
-           { end 8 }
            { uses V{ T{ vreg-use f 6 int-rep f } } }
-           { ranges V{ T{ live-range f 4 8 } } }
+           { ranges V{ { 4 8 } } }
         }
         T{ live-interval-state
            { vreg 4 }
-           { start 4 }
-           { end 8 }
            { uses V{ T{ vreg-use f 8 int-rep f } } }
-           { ranges V{ T{ live-range f 4 8 } } }
+           { ranges V{ { 4 8 } } }
         }
 
         ! This guy will invoke the 'spill partially available' code path
         T{ live-interval-state
            { vreg 5 }
-           { start 4 }
-           { end 8 }
            { uses V{ T{ vreg-use f 8 int-rep f } } }
-           { ranges V{ T{ live-range f 4 8 } } }
+           { ranges V{ { 4 8 } } }
         }
     }
     H{ { int-regs { "A" "B" } } }
@@ -534,19 +514,15 @@ H{
     {
         T{ live-interval-state
            { vreg 1 }
-           { start 0 }
-           { end 10 }
            { uses V{ T{ vreg-use f 0 int-rep f } T{ vreg-use f 6 f int-rep } T{ vreg-use f 10 f int-rep } } }
-           { ranges V{ T{ live-range f 0 10 } } }
+           { ranges V{ { 0 10 } } }
         }
 
         ! This guy will invoke the 'spill new' code path
         T{ live-interval-state
            { vreg 5 }
-           { start 2 }
-           { end 8 }
            { uses V{ T{ vreg-use f 8 int-rep f } } }
-           { ranges V{ T{ live-range f 2 8 } } }
+           { ranges V{ { 2 8 } } }
         }
     }
     H{ { int-regs { "A" } } }
@@ -568,19 +544,15 @@ H{
           {
               T{ live-interval-state
                  { vreg 1 }
-                 { start 0 }
-                 { end 20 }
                  { reg 0 }
-                 { ranges V{ T{ live-range f 0 2 } T{ live-range f 10 20 } } }
+                 { ranges V{ { 0 2 } { 10 20 } } }
                  { uses V{ 0 2 10 20 } }
               }
 
               T{ live-interval-state
                  { vreg 2 }
-                 { start 4 }
-                 { end 40 }
                  { reg 0 }
-                 { ranges V{ T{ live-range f 4 6 } T{ live-range f 30 40 } } }
+                 { ranges V{ { 4 6 } { 30 40 } } }
                  { uses V{ 4 6 30 40 } }
               }
           }
@@ -591,10 +563,8 @@ H{
           {
               T{ live-interval-state
                  { vreg 3 }
-                 { start 0 }
-                 { end 40 }
                  { reg 1 }
-                 { ranges V{ T{ live-range f 0 40 } } }
+                 { ranges V{ { 0 40 } } }
                  { uses V{ 0 40 } }
               }
           }
@@ -603,9 +573,7 @@ H{
 
     T{ live-interval-state
         { vreg 4 }
-        { start 8 }
-        { end 10 }
-        { ranges V{ T{ live-range f 8 10 } } }
+        { ranges V{ { 8 10 } } }
         { uses V{ T{ vreg-use f 8 int-rep f } T{ vreg-use f 10 f int-rep } } }
     }
     H{ { int-regs { 0 1 } } } register-status