Cleanup & backportclinit

The phase rework, made new phases explicit and add them to the CodeGen driver.  Fix the flag-spilling on X86 and ARM.  Fix the GCM conservative anti-deps and backport.

1 files changed, 64 insertions, 0 deletions

diff --git a/chapter25/src/test/java/com/seaofnodes/simple/PhaseTest.java b/chapter25/src/test/java/com/seaofnodes/simple/PhaseTest.java
new file mode 100644
index 00000000..7252378a
--- /dev/null
+++ b/chapter25/src/test/java/com/seaofnodes/simple/PhaseTest.java
@@ -0,0 +1,64 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.graph.GraphObserver;
+import com.seaofnodes.simple.codegen.CodeGen;
+import com.seaofnodes.simple.codegen.CodeGen.Phase;
+import com.seaofnodes.simple.node.Node;
+import java.util.ArrayList;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class PhaseTest {
+    private static final String SRC = "int sum=0; for(int i=0; i<arg; i++) sum+=i; return sum;";
+
+    @Test public void testIdealPhasesAndResume() {
+        ArrayList<String> phases = new ArrayList<>();
+        CodeGen code = new CodeGen(SRC);
+        code._obs = new GraphObserver<Node>() {
+            @Override public void before(Node n) {}
+            @Override public void after(Node n, Node repl, boolean applied) {}
+            @Override public void phase(String phase) { phases.add(phase); }
+        };
+        code.driver(Phase.TypeCheck);
+        code.driver(Phase.TypeCheck); // A repeated request does not rerun anything.
+        code.driver(Phase.LocalSched);
+        assertEquals("Parse Iter Opto IterPostOpto FinalizeIR TypeCheck Lower LoopTree Unlink Schedule LocalSched",
+                     String.join(" ",phases));
+        assertNull(code._serial);
+        assertNull(code._mach);
+        assertEquals("45",Eval2.eval(code,10));
+    }
+
+    @Test public void testEncodingWithoutSerialization() {
+        for( String cpu : new String[]{"x86_64_v2","arm","riscv"} ) {
+            CodeGen code = new CodeGen(SRC).driver(Phase.TypeCheck);
+            code.driver(Phase.Unlink,cpu,"SystemV");
+            code.driver(Phase.Select,cpu,"SystemV");
+            code.driver(Phase.Encoding,cpu,"SystemV");
+            assertNull(code._serial);
+            byte[] staged = code._encoding._bits.toByteArray();
+            CodeGen direct = new CodeGen(SRC).driver(Phase.Encoding,cpu,"SystemV");
+            assertArrayEquals(staged,direct._encoding._bits.toByteArray());
+        }
+    }
+
+    @Test public void testExplicitSerializationAndMemoryExport() {
+        CodeGen code = new CodeGen(SRC).driver(Phase.Serialize);
+        assertNotNull(code._serial);
+        assertEquals(Phase.Serialize,code._phase);
+        code.driver(Phase.Encoding,"riscv","SystemV");
+        assertNotNull(code._serial);
+
+        CodeGen memory = new CodeGen(SRC).driver("riscv","SystemV",true,false);
+        assertNull(memory._serial);
+        assertEquals(Phase.Export,memory._phase);
+
+        CodeGen late = new CodeGen(SRC).driver(Phase.Encoding,"riscv","SystemV");
+        try {
+            late.exportELF(false,false);
+            fail("Cannot recover ideal IR after lowering and instruction selection");
+        } catch( IllegalStateException expected ) {
+            assertTrue(expected.getMessage().contains("Serialize before Lower"));
+        }
+    }
+}