Small peep to drop simple store-updates out of loops

6 files changed, 23 insertions, 14 deletions

diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java
index e93da54b..3d5d2686 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter11Test.java
@@ -36,7 +36,8 @@ public class Chapter11Test {
         var stop = code._stop;
         int[] phis = {0};
         stop.walk(n -> {
-            if (n instanceof MemPhiNode) phis[0]++;
+            // Store sinking can replace field memory Phis with value Phis.
+            if (n instanceof PhiNode) phis[0]++;
             if (n instanceof MemMergeNode m && m.in(1) instanceof BulkMemPhiNode b)
                 for(int a=b._aliases.nextSetBit(0); a>=0; a=b._aliases.nextSetBit(a+1))
                     assertTrue(a<m.nIns() && m.in(a)!=null);
@@ -44,7 +45,7 @@ public class Chapter11Test {
                 !(n instanceof MemPhiNode) && !(n instanceof BulkMemPhiNode) && !(n instanceof ParmNode));
             return null;
         });
-        assertTrue(phis[0]>=3);
+        assertTrue(phis[0]>=4); // Three fields and the loop counter.
         assertEquals("S{x=1,y=2,z=3}",Eval2.eval(code,4));
     }
 
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java
index c388726c..d1e5fa70 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter19Test.java
@@ -385,13 +385,21 @@ return sq(arg) + sq(3);
 
     private static java.util.ArrayList<String> memoryPhis(Node stop) {
         var phis = new java.util.ArrayList<String>();
-        stop.walk(n -> {
+        // Count only definitions reachable from Stop, as instruction selection does.
+        // A dead Phi cycle can still appear through the reverse use edges.
+        var seen = new java.util.BitSet();
+        var work = new java.util.ArrayList<Node>();
+        work.add(stop);
+        for( int i=0; i<work.size(); i++ ) {
+            Node n = work.get(i);
+            if( n==null || seen.get(n._nid) ) continue;
+            seen.set(n._nid);
+            for( Node def : n._inputs ) work.add(def);
             if( n instanceof MemPhiNode phi ) phis.add("alias:"+phi._alias);
             if( n instanceof BulkMemPhiNode phi ) phis.add("bulk:"+phi._aliases);
             assertFalse(n instanceof PhiNode && n.isMem() &&
                 !(n instanceof MemPhiNode) && !(n instanceof BulkMemPhiNode) && !(n instanceof ParmNode));
-            return null;
-        });
+        }
         java.util.Collections.sort(phis);
         return phis;
     }
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter21Test.java
index ebfcb146..30d22fc9 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter21Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter21Test.java
@@ -337,8 +337,8 @@ public class Chapter21Test {
     @Test public void testInfinite() {
         String src = "struct S { int i; }; !S !s = new S; while(1) s.i++;";
         testCPU(src,"x86_64_v2", "SystemV",0,"return Top;");
-        testCPU(src,"riscv"    , "SystemV",2,"return Top;");
-        testCPU(src,"arm"      , "SystemV",2,"return Top;");
+        testCPU(src,"riscv"    , "SystemV",0,"return Top;");
+        testCPU(src,"arm"      , "SystemV",0,"return Top;");
     }
 
     @Test
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java
index f81a1300..ea210e3f 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java
@@ -182,8 +182,8 @@ public class Chapter22Test {
     @Test public void testInfiniteReturn() {
         String src = "struct S { int i; }; !S !s = new S; while(1) s.i++; return s.i;";
         testCPU(src,"x86_64_v2","SystemV",0,"return Top;");
-        testCPU(src,"riscv","SystemV",2,"return Top;");
-        testCPU(src,"arm","SystemV",2,"return Top;");
+        testCPU(src,"riscv","SystemV",0,"return Top;");
+        testCPU(src,"arm","SystemV",0,"return Top;");
     }
 
     // Enabled in Chapter 23; measured there by Chapter23AllocTest.
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java
index 7ed65745..58b8d3e4 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter23Test.java
@@ -259,7 +259,7 @@ return Scan.peek(s,'q');
         CodeGen code = new CodeGen(src).parse().opto().typeCheck();
         assertEquals("return Phi(Region,0,1);", code._stop.toString());
         assertEquals("1", Eval2.eval(code, 0));
-        testCPU(src,"x86_64_v2", "Win64"  ,17,null);
+        testCPU(src,"x86_64_v2", "Win64"  ,23,null);
     };
 
     @Test
@@ -311,7 +311,7 @@ return s.require('[');
         CodeGen code = new CodeGen(src).parse().opto().typeCheck();
         assertEquals("return (.[]==91);", code._stop.toString());
         assertEquals("1", Eval2.eval(code, 0));
-        testCPU(src,"x86_64_v2", "Win64"  ,16,null);
+        testCPU(src,"x86_64_v2", "Win64"  ,4,null);
     };
 
 
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/MemoryEncodingTest.java b/chapter23/src/test/java/com/seaofnodes/simple/MemoryEncodingTest.java
index 6388228e..52c0a573 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/MemoryEncodingTest.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/MemoryEncodingTest.java
@@ -142,12 +142,12 @@ public class MemoryEncodingTest {
     }
 
     @Test public void testNeverMemory() {
-        // A synthetic exit must retain both precise slices of a no-exit loop.
+        // A varying pointer prevents store sinking: the synthetic exit needs both slices.
         for( String target : new String[]{"x86_64_v2","riscv","arm"} ) {
             CodeGen code = new CodeGen("""
                 struct S { int x; int y; };
-                !S !a=new S;
-                if( arg ) while( 1 ) { a.x+=arg; a.y+=a.x; }
+                !S !a=new S; !S !b=new S; !S !p=a;
+                if( arg ) while( 1 ) { p.x+=arg; p.y+=p.x; p=p==a ? b : a; }
                 return a.x+a.y;
                 """).driver(CodeGen.Phase.LoopTree);
             assertNotNull(code._stop.walk(n -> {