compiler.cfg.*: some extra unit tests for the compiler

diff --git a/basis/compiler/cfg/block-joining/block-joining-tests.factor b/basis/compiler/cfg/block-joining/block-joining-tests.factor
new file mode 100644 (file)
index 0000000..06907d5
--- /dev/null
+++ b/basis/compiler/cfg/block-joining/block-joining-tests.factor
@@ -0,0 +1,11 @@
+USING: accessors compiler.cfg.block-joining compiler.cfg.utilities
+kernel tools.test ;
+IN: compiler.cfg.block-joining.tests
+
+{
+    V{ "hello" "there" "B" }
+} [
+    { "there" "B" } 0 insns>block
+    { "hello" "B" } 1 insns>block
+    [ join-instructions ] keep instructions>>
+] unit-test

diff --git a/basis/compiler/cfg/gc-checks/gc-checks-tests.factor b/basis/compiler/cfg/gc-checks/gc-checks-tests.factor
index 4117f4e66136d5167125ae6564a8eefe08921bd6..519ba837d1c7f2805bd55c404fc0e60b8c3b55b0 100644 (file)
--- a/basis/compiler/cfg/gc-checks/gc-checks-tests.factor
+++ b/basis/compiler/cfg/gc-checks/gc-checks-tests.factor
@@ -8,10 +8,9 @@ compiler.cfg.comparisons compiler.test compiler.cfg.utilities ;
 IN: compiler.cfg.gc-checks.tests
 
 ! insert-gc-check?
-{ t } [
-    V{
-        T{ ##inc } T{ ##allot }
-    } 0 insns>block insert-gc-check?
+{ t f } [
+    V{ T{ ##inc } T{ ##allot } } 0 insns>block insert-gc-check?
+    V{ T{ ##call } } 0 insns>block insert-gc-check?
 ] unit-test
 
 ! allocation-size

diff --git a/basis/compiler/cfg/hats/hats-tests.factor b/basis/compiler/cfg/hats/hats-tests.factor
new file mode 100644 (file)
index 0000000..df99ec2
--- /dev/null
+++ b/basis/compiler/cfg/hats/hats-tests.factor
@@ -0,0 +1,9 @@
+USING: compiler.cfg.hats compiler.cfg.instructions
+compiler.cfg.registers make tools.test ;
+IN: compiler.cfg.hats.tests
+
+{
+    1 V{ T{ ##local-allot { dst 1 } { size 32 } { align 8 } } }
+} [
+    reset-vreg-counter [ 32 8 f ^^local-allot ] V{ } make
+] unit-test

diff --git a/basis/compiler/cfg/linear-scan/allocation/state/state-tests.factor b/basis/compiler/cfg/linear-scan/allocation/state/state-tests.factor
index 3e2ab01d9657af58c4bf9987c3dfad1306f2ca67..517546cffbbe5e0fea8ddc19d463b68ccead7704 100644 (file)
--- a/basis/compiler/cfg/linear-scan/allocation/state/state-tests.factor
+++ b/basis/compiler/cfg/linear-scan/allocation/state/state-tests.factor
@@ -107,7 +107,7 @@ ${
 
 ! align-spill-area
 { t } [
-    3 f f { } 0 insns>block <cfg> [ align-spill-area ] keep
+    3 { } insns>cfg [ align-spill-area ] keep
     spill-area-align>> cell =
 ] unit-test
 

diff --git a/basis/compiler/cfg/linear-scan/assignment/assignment-tests.factor b/basis/compiler/cfg/linear-scan/assignment/assignment-tests.factor
index 820e3f4af7e3ca025fd156fef9b7ef831c2def58..48d38a01815c5e7df328445c8e2d507b70dae98d 100644 (file)
--- a/basis/compiler/cfg/linear-scan/assignment/assignment-tests.factor
+++ b/basis/compiler/cfg/linear-scan/assignment/assignment-tests.factor
@@ -31,6 +31,19 @@ IN: compiler.cfg.linear-scan.assignment.tests
     [ assign-registers-in-block ] keep instructions>>
 ] unit-test
 
+! insert-reload
+{
+    { T{ ##reload { dst RAX } { rep int-rep } { src T{ spill-slot } } } }
+} [
+    [
+        T{ live-interval-state
+           { reg RAX }
+           { reload-from T{ spill-slot } }
+           { reload-rep int-rep }
+        } insert-reload
+    ] { } make
+] unit-test
+
 ! insert-spill
 { { T{ ##spill { src RAX } } } } [
     [

diff --git a/basis/compiler/cfg/liveness/liveness-tests.factor b/basis/compiler/cfg/liveness/liveness-tests.factor
index d195e9f4e2afeb85496d2ad1d1a7c21f10ae83f9..0cd7d0b20c3c5558002859af29643b8cdcbe34ef 100644 (file)
--- a/basis/compiler/cfg/liveness/liveness-tests.factor
+++ b/basis/compiler/cfg/liveness/liveness-tests.factor
@@ -1,9 +1,9 @@
-USING: accessors compiler.cfg.liveness
-compiler.cfg compiler.cfg.debugger compiler.cfg.instructions
-compiler.cfg.predecessors compiler.cfg.registers
+USING: accessors alien assocs compiler.cfg.comparisons compiler.cfg.liveness
+compiler.cfg compiler.cfg.debugger compiler.cfg.def-use
+compiler.cfg.instructions compiler.cfg.predecessors compiler.cfg.registers
 compiler.cfg.ssa.destruction.leaders compiler.cfg.utilities cpu.architecture
-dlists namespaces sequences kernel tools.test vectors alien math
-compiler.cfg.comparisons cpu.x86.assembler.operands assocs ;
+cpu.x86.assembler.operands dlists math namespaces sequences kernel system
+tools.test vectors ;
 IN: compiler.cfg.liveness.tests
 QUALIFIED: sets
 
@@ -101,6 +101,14 @@ QUALIFIED: sets
     30 lookup-base-pointer
 ] unit-test
 
+cpu x86.64? [
+    { f } [
+        H{ } base-pointers set
+        H{ { 123 T{ ##peek { dst RCX } { loc D 1 } { insn# 6 } } } } insns set
+        123 lookup-base-pointer
+    ] unit-test
+] when
+
 ! lookup-base-pointer*
 { f } [
     456 T{ ##peek f 123 D 0 } lookup-base-pointer*

diff --git a/basis/compiler/cfg/ssa/destruction/destruction-tests.factor b/basis/compiler/cfg/ssa/destruction/destruction-tests.factor
index 2549134884e8b2196d453bf0b0217af29353864a..296402ecc7f846305dff2ef8d4023b8aab4ca266 100644 (file)
--- a/basis/compiler/cfg/ssa/destruction/destruction-tests.factor
+++ b/basis/compiler/cfg/ssa/destruction/destruction-tests.factor
@@ -5,21 +5,31 @@ cpu.architecture cpu.x86.assembler.operands kernel make namespaces
 sequences tools.test ;
 IN: compiler.cfg.ssa.destruction.tests
 
-! cleanup-insn
-{
-    V{ T{ ##copy { src 45 } { dst 47 } { rep double-2-rep } } }
-} [
+: setup-leader/reps-scenario ( -- )
+    ! Note the differences in representation.
     H{ { 45 45 } { 46 45 } { 47 47 } { 100 47 } } leader-map set
-    ! how can the leader of a vreg have a different representation
-    ! than the vreg itself?
     H{
         { 45 double-2-rep }
         { 46 double-rep }
         { 47 double-rep }
         { 100 double-rep }
-    } representations set
-    T{ ##parallel-copy { values V{ { 100 46 } } } }
-    [ cleanup-insn ] V{ } make
+    } representations set ;
+
+! cleanup-insn
+{
+    V{ T{ ##copy { dst 100 } { src 46 } } }
+} [
+    setup-leader/reps-scenario
+    T{ ##copy { src 46 } { dst 100 } } [ cleanup-insn ] V{ } make
+] unit-test
+
+! I think the difference is because ##parallel-copy may encode a swap
+! between two vregs.
+{
+    V{ T{ ##copy { dst 47 } { src 45 } { rep double-2-rep } } }
+} [
+    setup-leader/reps-scenario
+    T{ ##parallel-copy { values V{ { 100 46 } } } } [ cleanup-insn ] V{ } make
 ] unit-test
 
 { V{ } } [