Chapter 16: Constructors and Final fieldslinear-chapter16

Co-authored-by: Thalia Archibald <thalia@archibald.dev>

1 files changed, 50 insertions, 15 deletions

diff --git a/src/test/java/com/seaofnodes/simple/Chapter11Test.java b/src/test/java/com/seaofnodes/simple/Chapter11Test.java
index 5f9f9cac..d6b7bb00 100644
--- a/src/test/java/com/seaofnodes/simple/Chapter11Test.java
+++ b/src/test/java/com/seaofnodes/simple/Chapter11Test.java
@@ -292,7 +292,7 @@ else {
 }
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ return 9; return 0; return 0; return 0; ]", stop.toString());
+        assertEquals("Stop[ return 9; return 0; return 0; ]", stop.toString());
     }
 
 
@@ -324,7 +324,7 @@ while( prime <= arg ) {
 return primeCount;
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("Stop[ return 0; return Phi(Loop20,1,Phi(Region87,Phi_primeCount,Phi(Region81,(Phi_primeCount+1),Phi_primeCount))); ]", stop.toString());
+        assertEquals("Stop[ return 0; return Phi(Loop23,1,Phi(Region100,Phi_primeCount,Phi(Region93,(Phi_primeCount+1),Phi_primeCount))); ]", stop.toString());
         assertEquals(0L, Evaluator.evaluate(stop,  1)); // No primes 1 or below
         assertEquals(1L, Evaluator.evaluate(stop,  2)); // 2
         assertEquals(2L, Evaluator.evaluate(stop,  3)); // 2, 3
@@ -337,7 +337,7 @@ return primeCount;
     public void testAntiDeps1() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v=new S;
 v.f = 2;
 int i=new S.f;
@@ -355,7 +355,7 @@ return i;
     public void testAntiDeps2() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v = new S;
 v.f = arg;
 S t = new S;
@@ -369,14 +369,14 @@ if (arg) {
 return i;
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("return Phi(Region40,.f,0);", stop.toString());
+        assertEquals("return Phi(Region45,.f,0);", stop.toString());
     }
 
     @Test
     public void testAntiDeps3() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v0 = new S;
 S? v1;
 if (arg) v1 = new S;
@@ -396,7 +396,7 @@ return v0;
     public void testAntiDeps4() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v = new S;
 v.f = arg;
 S t = new S;
@@ -413,7 +413,7 @@ return i;
     public void testAntiDeps5() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v = new S;
 while(1) {
     while(arg+1) { arg=arg-1; }
@@ -430,7 +430,7 @@ return v;
     public void testAntiDeps6() {
         Parser parser = new Parser(
 """
-struct s { int v; }
+struct s { int v; };
 s ptr=new s;
 while( -arg )
   ptr = new s;
@@ -445,7 +445,7 @@ while(1)
     public void testAntiDeps7() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v = new S;
 S t = new S;
 int i = v.f;
@@ -463,7 +463,7 @@ return i;
     public void testAntiDeps8() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v = new S;
 S t = new S;
 while(arg) {
@@ -476,14 +476,14 @@ while(arg) {
 return arg;
 """);
         StopNode stop = parser.parse().iterate();
-        assertEquals("return Phi(Loop17,arg,Phi(Region42,.f,0));", stop.toString());
+        assertEquals("return Phi(Loop20,arg,Phi(Region48,.f,0));", stop.toString());
     }
 
     @Test
     public void testAntiDeps9() {
         Parser parser = new Parser(
 """
-struct S { int f; }
+struct S { int f; };
 S v = new S;
 S t = new S;
 if (arg) {
@@ -500,8 +500,8 @@ return v;
     @Test
     public void testExample2() {
         Parser parser = new Parser(
-                """
-struct S { int f; }
+"""
+struct S { int f; };
 S v = new S;
 int i = arg;
 while (arg > 0) {
@@ -515,4 +515,39 @@ return v;
         StopNode stop = parser.parse().iterate();
         //assertEquals("return new S;", stop.toString());
     }
+
+    @Test
+    public void testScheduleUse() {
+        Parser parser = new Parser(
+"""
+int v0=0;
+while(0>=0) {
+    u1 v1=0;
+    v1=v0;
+    if(v1*0)
+        v0=-v1;
+}
+return 0;
+""");
+        StopNode stop = parser.parse().iterate();
+        assertEquals("return 0;", stop.toString());
+    }
+
+    @Test
+    public void testLoopCarriedDep() {
+        Parser parser = new Parser(
+"""
+u32 v0=0;
+{
+    int v1=0;
+    while(v1) {
+        v1=1>>>v0!=0;
+        v0=v1/0;
+    }
+}
+""");
+        StopNode stop = parser.parse().iterate();
+        assertEquals("return 0;", stop.toString());
+    }
+
 }