debug printers no longer call self-optimizing accessors

7 files changed, 166 insertions, 1 deletions

diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java
index 4f70913d..4b8bee40 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java
@@ -1,10 +1,26 @@
 package com.seaofnodes.simple;
-
 import com.seaofnodes.simple.codegen.CodeGen;
+import com.seaofnodes.simple.print.IRPrinter;
+
+
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 public class Chapter11Test {
+    @Test public void testPrintingPreservesGraph() throws Exception {
+        var code = new CodeGen("while(arg < 10) arg = arg + 1; return arg;").parse().opto().typeCheck().GCM().localSched();
+        var stop = code._stop;
+        var bfs = new IRPrinter.BFS(stop,99);
+        for( var n : bfs._bfs )
+            if( n instanceof com.seaofnodes.simple.node.CFGNode cfg ) cfg._idepth = 0;
+        new com.seaofnodes.simple.node.ConstantNode(com.seaofnodes.simple.type.TypeInteger.constant(123456));
+        com.seaofnodes.simple.node.PrintTestSupport.unchanged(stop, () -> {
+            String first = stop.p(99);
+            assertEquals(first,stop.p(99));
+            stop.toString();
+        });
+    }
+
 
     // A placeholder test used to rapidly rotate through fuzzer produced issues
     @Test
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter18Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter18Test.java
index 42f80d86..704ac120 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter18Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter18Test.java
@@ -1,4 +1,7 @@
 package com.seaofnodes.simple;
+import com.seaofnodes.simple.type.*;
+import com.seaofnodes.simple.node.*;
+
 
 import com.seaofnodes.simple.codegen.CodeGen.Phase;
 import com.seaofnodes.simple.codegen.CodeGen;
@@ -8,6 +11,38 @@ import static org.junit.Assert.*;
 import static org.junit.Assert.fail;
 
 public class Chapter18Test {
+    @Test public void testPrintingForwardReferenceScope() throws Exception {
+        new CodeGen("return 0;").parse();
+        var declared = TypeMemPtr.make(TypeStruct.open("PrintForward"));
+        var scope = new ScopeNode();
+        scope.define("ptr",declared,false,new ConstantNode(TypeInteger.ZERO),null);
+        Parser.TYPES.put("PrintForward",TypeMemPtr.make(TypeStruct.make("PrintForward",false)));
+        var field = Var.class.getDeclaredField("_type");
+        field.setAccessible(true);
+        var v = scope.var(0);
+        org.junit.Assert.assertSame(declared,field.get(v));
+        scope.toString();
+        org.junit.Assert.assertSame(declared,field.get(v));
+    }
+
+    @Test public void testPrintingLazyMemory() throws Exception {
+        var code = new CodeGen("return 0;").parse();
+        var base = new ConstantNode(com.seaofnodes.simple.type.TypeMem.BOT);
+        var outer = new ScopeNode();
+        var inner = new ScopeNode();
+        var loop = new LoopNode(null,code._start);
+        loop._type = com.seaofnodes.simple.type.Type.CONTROL;
+        var outerMem = new MemMergeNode(true);
+        outerMem.addDef(null); outerMem.addDef(base); outerMem.addDef(base);
+        outer.addDef(loop); outer.addDef(outerMem);
+        var innerMem = new MemMergeNode(true);
+        innerMem.addDef(null); innerMem.addDef(outer); innerMem.addDef(outer);
+        inner.addDef(loop); inner.addDef(innerMem);
+        var mem = new MemMergeNode(true);
+        mem.addDef(null); mem.addDef(base); mem.addDef(inner);
+        PrintTestSupport.unchanged(mem, () -> org.junit.Assert.assertTrue(mem.toString().contains("Lazy_")));
+    }
+
 
     @Test
     public void testJig() {
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java
index e2a155ce..93f31e19 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java
@@ -1,4 +1,7 @@
 package com.seaofnodes.simple;
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.*;
+
 
 import com.seaofnodes.simple.codegen.CodeGen.Phase;
 import com.seaofnodes.simple.codegen.CodeGen;
@@ -9,6 +12,25 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class Chapter19Test {
+    @Test public void testPrintingFunctionLookup() {
+        var code = new CodeGen("return 0;").parse();
+        var tfp = TypeFunPtr.make((byte)2,false,new Type[]{TypeInteger.constant(987654)},TypeInteger.constant(123456),1L<<30);
+        var con = new ConstantNode(tfp);
+        var call = new CallNode(null,code._start,con,con);
+        // Diagnostic lookup may construct/intern the return-erased linker key.
+        con.toString();
+        org.junit.Assert.assertNull(call.name());
+
+        var fun = new FunNode(null,tfp,"printerTarget");
+        fun._name = "printerTarget";
+        fun.addDef(code._start);
+        code.link(fun);
+        var otherReturn = tfp.makeFrom(TypeInteger.constant(654321));
+        org.junit.Assert.assertSame(fun,code.link(otherReturn));
+        org.junit.Assert.assertTrue(con.toString().contains("printerTarget"));
+        assertEquals("printerTarget",call.name());
+    }
+
 
     @Test
     public void testJig() {
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter20Test.java
index dcea5c87..3f9f4925 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter20Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter20Test.java
@@ -1,5 +1,6 @@
 package com.seaofnodes.simple;
 
+
 import com.seaofnodes.simple.codegen.CodeGen;
 import com.seaofnodes.simple.print.ASMPrinter;
 import java.io.IOException;
@@ -11,6 +12,10 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class Chapter20Test {
+    @Test public void testPrintingRegisters() throws Exception {
+        com.seaofnodes.simple.codegen.PrintRegTestSupport.check();
+    }
+
 
     @Test
     public void testJig() {
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java
index 435b675c..45acc62a 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java
@@ -1,4 +1,7 @@
 package com.seaofnodes.simple;
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.*;
+
 
 import com.seaofnodes.simple.codegen.CodeGen;
 import com.seaofnodes.simple.node.cpus.riscv.riscv;
@@ -11,6 +14,23 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class Chapter23Test {
+    @Test public void testDiagnosticTypeAccessors() throws Exception {
+        new CodeGen("return 0;").parse();
+        var tfp = TypeFunPtr.TEST;
+        var field = Type.class.getDeclaredField("VISIT");
+        field.setAccessible(true);
+        var visit = (java.util.Map<Object,Type>)field.get(null);
+        var marker = new Object();
+        visit.put(marker,Type.BOTTOM);
+        try {
+            assertEquals(0,TypeInteger.ZERO.alignment());
+            assertEquals(0,TypeInteger.ZERO.value());
+            org.junit.Assert.assertTrue(tfp._isConstant());
+            org.junit.Assert.assertSame(Type.BOTTOM,visit.get(marker));
+            assertEquals(1,visit.size());
+        } finally { visit.clear(); }
+    }
+
 
     @Test
     public void testOrRhsLoopLocal() throws IOException {
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/codegen/PrintRegTestSupport.java b/chapter23/src/test/java/com/seaofnodes/simple/codegen/PrintRegTestSupport.java
new file mode 100644
index 00000000..b9b49c9f
--- /dev/null
+++ b/chapter23/src/test/java/com/seaofnodes/simple/codegen/PrintRegTestSupport.java
@@ -0,0 +1,26 @@
+package com.seaofnodes.simple.codegen;
+import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import static org.junit.Assert.*;
+public class PrintRegTestSupport {
+    public static void check() throws Exception {
+        var code = new CodeGen("return 0;").parse();
+        var alloc = new RegAlloc(code);
+        var n = new ConstantNode(TypeInteger.ZERO);
+        var a = new LRG((short)1);
+        var b = new LRG((short)2);
+        var c = new LRG((short)3);
+        a._reg = -1;
+        c._leader = b;
+        b._leader = a;
+        var field = RegAlloc.class.getDeclaredField("_lrgs");
+        field.setAccessible(true);
+        var map = (java.util.Map<Node,LRG>)field.get(alloc);
+        map.put(n,c);
+        assertEquals("V1",alloc.reg(n));
+        assertEquals(-1,alloc.regnum(n));
+        assertSame(c,map.get(n));
+        assertSame(b,c._leader);
+        assertSame(a,b._leader);
+    }
+}
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/node/PrintTestSupport.java b/chapter23/src/test/java/com/seaofnodes/simple/node/PrintTestSupport.java
new file mode 100644
index 00000000..01d471bf
--- /dev/null
+++ b/chapter23/src/test/java/com/seaofnodes/simple/node/PrintTestSupport.java
@@ -0,0 +1,41 @@
+package com.seaofnodes.simple.node;
+import java.util.*;
+import static org.junit.Assert.*;
+
+// Inspect raw fields: the regression must not itself use lazy accessors.
+public class PrintTestSupport {
+    public static void unchanged(Node root, Runnable print) throws Exception {
+        var hash = Node.class.getDeclaredField("_hash");
+        hash.setAccessible(true);
+        var nodes = new ArrayList<Node>();
+        var seen = new IdentityHashMap<Node,Boolean>();
+        nodes.add(root);
+        seen.put(root,true);
+        for( int i=0; i<nodes.size(); i++ ) {
+            Node n = nodes.get(i);
+            for( Node def : n._inputs )
+                if( def!=null && seen.put(def,true)==null ) nodes.add(def);
+            for( Node use : n._outputs )
+                if( use!=null && seen.put(use,true)==null ) nodes.add(use);
+        }
+        var ins = new IdentityHashMap<Node,Node[]>();
+        var outs = new IdentityHashMap<Node,Node[]>();
+        var hashes = new IdentityHashMap<Node,Integer>();
+        var depths = new IdentityHashMap<Node,Integer>();
+        for( Node n : nodes ) {
+            ins.put(n,n._inputs.toArray(new Node[0]));
+            outs.put(n,n._outputs.toArray(new Node[0]));
+            hashes.put(n,hash.getInt(n));
+            if( n instanceof CFGNode cfg ) depths.put(n,cfg._idepth);
+        }
+        print.run();
+        for( Node n : nodes ) {
+            assertEquals("hash of node "+n._nid,(int)hashes.get(n),hash.getInt(n));
+            if( n instanceof CFGNode cfg ) assertEquals("depth of node "+n._nid,(int)depths.get(n),cfg._idepth);
+            assertEquals(ins.get(n).length,n.nIns());
+            assertEquals(outs.get(n).length,n.nOuts());
+            for( int i=0; i<n.nIns(); i++ ) assertSame(ins.get(n)[i],n.in(i));
+            for( int i=0; i<n.nOuts(); i++ ) assertSame(outs.get(n)[i],n._outputs.get(i));
+        }
+    }
+}