summaryrefslogtreecommitdiff
path: root/chapter29/src/test/java
diff options
context:
space:
mode:
authorCliff Click <cliffc@acm.org>2026-11-16 14:25:14 -0800
committerCliff Click <cliffc@acm.org>2026-11-16 14:25:14 -0800
commit0dcd3513a633479ce228f24826db4f09e4c0fc8b (patch)
treed8fb6d0fb382df5799789e9dc1eb0fae2d381cce /chapter29/src/test/java
parent51a029304d8105b201bdfb81a7692b8a1b16b028 (diff)
downloadSimple-0dcd3513a633479ce228f24826db4f09e4c0fc8b.tar.gz
Simple-0dcd3513a633479ce228f24826db4f09e4c0fc8b.zip
Phi fix
Fix Phi/Add refactoring peephole to canonicalize regardless of peephole order. Treat class fcns as having `self` be the class pointer
Diffstat (limited to 'chapter29/src/test/java')
-rw-r--r--chapter29/src/test/java/com/seaofnodes/simple/Chapter05Test.java24
-rw-r--r--chapter29/src/test/java/com/seaofnodes/simple/Chapter09Test.java2
-rw-r--r--chapter29/src/test/java/com/seaofnodes/simple/Chapter20Test.java6
-rw-r--r--chapter29/src/test/java/com/seaofnodes/simple/Chapter21Test.java8
-rw-r--r--chapter29/src/test/java/com/seaofnodes/simple/Chapter22Test.java6
-rw-r--r--chapter29/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java71
-rw-r--r--chapter29/src/test/java/com/seaofnodes/simple/ReceiverTest.java94
7 files changed, 200 insertions, 11 deletions
diff --git a/chapter29/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter29/src/test/java/com/seaofnodes/simple/Chapter05Test.java
index afdb1071..82a08dac 100644
--- a/chapter29/src/test/java/com/seaofnodes/simple/Chapter05Test.java
+++ b/chapter29/src/test/java/com/seaofnodes/simple/Chapter05Test.java
@@ -2,6 +2,7 @@ package com.seaofnodes.simple;
import com.seaofnodes.simple.codegen.CodeGen;
import com.seaofnodes.simple.node.*;
+import com.seaofnodes.simple.type.TypeInteger;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -201,4 +202,27 @@ return a;
catch( RuntimeException e ) { assertEquals("Undefined name 'ififif'",e.getMessage()); }
}
+ private static <N extends Node> N init(N n) { n._type=n.compute(); return n; }
+
+ @Test public void testDoublingBeforeAndAfterStrengthReduction() {
+ for( boolean reduced : new boolean[]{false,true} )
+ for( boolean reverse : new boolean[]{false,true} ) {
+ CodeGen code = new CodeGen("");
+ Node ctrl = init(new CProjNode(code._start,0,"Ctrl"));
+ RegionNode region = init(new RegionNode(null,null,ctrl,ctrl));
+ Node p = code.con(TypeInteger.BOT);
+ Node i = init(new MinusNode(p));
+ Node twice = reduced ? init(new ShlNode(null,p,code.con(1))) : init(new AddNode(p,p,(byte)1));
+ Node sum = init(new AddNode(i,p,(byte)1));
+ PhiNode phi = init(new PhiNode("sum",region,reverse ? sum : twice,reverse ? twice : sum));
+ phi.keep();
+ Node factored = phi.idealize();
+ assertTrue(factored instanceof AddNode);
+ assertSame(p,factored.in(2));
+ assertTrue(factored.in(1) instanceof PhiNode);
+ assertSame(reverse ? i : p,factored.in(1).in(1));
+ assertSame(reverse ? p : i,factored.in(1).in(2));
+ phi.unkeep();
+ }
+ }
}
diff --git a/chapter29/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter29/src/test/java/com/seaofnodes/simple/Chapter09Test.java
index 7025b98a..85d4987f 100644
--- a/chapter29/src/test/java/com/seaofnodes/simple/Chapter09Test.java
+++ b/chapter29/src/test/java/com/seaofnodes/simple/Chapter09Test.java
@@ -41,7 +41,7 @@ else {
return x;
""");
code.driver(CodeGen.Phase.FinalizeIR);
- assertEquals("return Phi(Region,(arg<<1),(Shl+1));", code.print());
+ assertEquals("return (Phi(Region,arg,1)+Phi(Region,arg,(arg<<1)));", code.print());
Assert.assertEquals( "2", Eval2.eval(code, 1));
Assert.assertEquals("23", Eval2.eval(code, 11));
}
diff --git a/chapter29/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter29/src/test/java/com/seaofnodes/simple/Chapter20Test.java
index f5eb2b36..a8f2a280 100644
--- a/chapter29/src/test/java/com/seaofnodes/simple/Chapter20Test.java
+++ b/chapter29/src/test/java/com/seaofnodes/simple/Chapter20Test.java
@@ -259,9 +259,9 @@ val hashCode = { !String self ->
""";
// Return the public hashCode wrapper; keep its helper private.
- testCPU(src,"x86_64_v2", "SystemV",12,null);
- testCPU(src,"riscv" , "SystemV",8,null);
- testCPU(src,"arm" , "SystemV",6,null);
+ testCPU(src,"x86_64_v2", "SystemV",15,null);
+ testCPU(src,"riscv" , "SystemV",11,null);
+ testCPU(src,"arm" , "SystemV",11,null);
}
@Test
diff --git a/chapter29/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter29/src/test/java/com/seaofnodes/simple/Chapter21Test.java
index e15c2581..f3af31a2 100644
--- a/chapter29/src/test/java/com/seaofnodes/simple/Chapter21Test.java
+++ b/chapter29/src/test/java/com/seaofnodes/simple/Chapter21Test.java
@@ -384,9 +384,9 @@ val hashCode = { !String self ->
};
""";
// Return the public hashCode wrapper; keep its helper private.
- testCPU(src,"x86_64_v2", "SystemV",12,null);
- testCPU(src,"riscv" , "SystemV",8,null);
- testCPU(src,"arm" , "SystemV",6,null);
+ testCPU(src,"x86_64_v2", "SystemV",15,null);
+ testCPU(src,"riscv" , "SystemV",11,null);
+ testCPU(src,"arm" , "SystemV",11,null);
}
@Test public void testStringExport() throws IOException {
@@ -423,7 +423,7 @@ val hashCode = { !String self ->
: (self._hashCode = _hashCodeString(self));
};
""";
- TestC.runC(src, "stringHash", "",12);
+ TestC.runC(src, "stringHash", "",15);
}
@Test public void testLoop2() {
diff --git a/chapter29/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter29/src/test/java/com/seaofnodes/simple/Chapter22Test.java
index e9a668a7..e81bd51d 100644
--- a/chapter29/src/test/java/com/seaofnodes/simple/Chapter22Test.java
+++ b/chapter29/src/test/java/com/seaofnodes/simple/Chapter22Test.java
@@ -302,17 +302,17 @@ val p = { u8[~] str ->
p("Hello, World!");
return 0;
""";
- TestC.runSF(src,"helloWorld", "Hello, World!",2);
+ TestC.runSF(src,"helloWorld", "Hello, World!",4);
// Evaluate on RISC5 emulator
- EvalRisc5 R5 = TestRisc5.build( src, "helloWorld", 0, 5, false);
+ EvalRisc5 R5 = TestRisc5.build( src, "helloWorld", 0, 8, false);
int trap = R5.step(100);
assertEquals(0,trap);
assertEquals(0,R5.regs[riscv.A0]);
assertEquals("Hello, World!",R5._stdout.toString());
// Evaluate on ARM emulator
- EvalArm64 arm = TestArm64.build("helloWorld", src,0, 5, false);
+ EvalArm64 arm = TestArm64.build("helloWorld", src,0, 8, false);
trap = arm.step(100);
assertEquals(0,trap);
assertEquals(0,arm.regs[0]);
diff --git a/chapter29/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java b/chapter29/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java
new file mode 100644
index 00000000..51ed10c6
--- /dev/null
+++ b/chapter29/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java
@@ -0,0 +1,71 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.codegen.CodeGen;
+import com.seaofnodes.simple.parser.Parser;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class GlobalAssignmentTest {
+ private static final String SOURCE = """
+ int value=1;
+ int writes=0;
+ u8 small=0;
+ val set={int n -> value=n; return value;};
+ val set_noInline={int n ->
+ if( n<0 ) value=3;
+ else value=n;
+ return value;
+ };
+ val rhs_noInline={ -> writes=writes+1; return value+1;};
+ val shadow={int value -> value=42; return value;};
+ struct Writer {
+ int seen;
+ new Writer={int n -> value=n; seen=value;};
+ };
+ struct InitWriter { int seen=(value=17); };
+ val main={ ->
+ if( set(5)!=5 || value!=5 ) return 1;
+ if( set_noInline(-1)!=3 || value!=3 ) return 2;
+ if( set_noInline(8)!=8 || value!=8 ) return 3;
+ int result=(value=rhs_noInline());
+ if( result!=9 || value!=9 || writes!=1 ) return 4;
+ value=writes=11;
+ if( value!=11 || writes!=11 ) return 5;
+ if( shadow(0)!=42 || value!=11 ) return 6;
+ int wide=(small=257);
+ if( wide!=257 || small!=1 ) return 7;
+ val constructed=new Writer(13);
+ if( value!=13 || constructed.seen!=13 ) return 8;
+ val initialized=new InitWriter;
+ // Default expressions run at declaration time, not per instance.
+ if( value!=13 || initialized.seen!=17 ) return 9;
+ return 0;
+ };
+ return main();
+ """;
+
+ @Test public void storesGlobalMemory() throws Exception {
+ assertEquals("0",Eval2.eval(new CodeGen(SOURCE).driver(CodeGen.Phase.TypeCheck),0));
+ TestC.runSF(SOURCE,"global_assignment","",-1);
+ }
+
+ @Test public void rejectsFinalGlobal() {
+ try {
+ new CodeGen("val value=1; val set={ -> value=2; }; return set();")
+ .driver(CodeGen.Phase.TypeCheck);
+ fail("Assigned a final global");
+ } catch( Parser.ParseException e ) {
+ assertEquals("Cannot reassign final 'value'",e.getMessage());
+ }
+ }
+
+ @Test public void rejectsIncompatibleGlobalValue() {
+ try {
+ new CodeGen("struct S { int x; }; int value=1; val set={ -> value=new S; }; set(); return value;")
+ .driver(CodeGen.Phase.TypeCheck);
+ fail("Stored an object in an integer global");
+ } catch( Parser.ParseException expected ) {
+ assertTrue(expected.getMessage(),expected.getMessage().contains("not of declared type"));
+ }
+ }
+}
diff --git a/chapter29/src/test/java/com/seaofnodes/simple/ReceiverTest.java b/chapter29/src/test/java/com/seaofnodes/simple/ReceiverTest.java
new file mode 100644
index 00000000..0342d9a2
--- /dev/null
+++ b/chapter29/src/test/java/com/seaofnodes/simple/ReceiverTest.java
@@ -0,0 +1,94 @@
+package com.seaofnodes.simple;
+
+import com.seaofnodes.simple.codegen.*;
+import com.seaofnodes.simple.type.TypeInteger;
+import com.seaofnodes.simple.util.Ary;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ReceiverTest {
+ @Test public void classAndInstanceFields() throws Exception {
+ String source="""
+ int total=1;
+ val forward={ -> late(); };
+ val early={ -> total; };
+ val late={ -> early(); };
+ val add_noInline={int n -> self.total=self.total+n; return total;};
+ val read_noInline={ -> self.total; };
+ val nested={ ->
+ val inc={ -> self.total++; };
+ inc();
+ return total;
+ };
+ struct Counter {
+ int total=100;
+ val read=read_noInline;
+ };
+ struct Writer {
+ int count=2;
+ val step={ -> self.count++; total=count; return total; };
+ };
+ u16[] !table=new u16[2];
+ val lookup={u8 c -> c<2 ? table[c] : 0;};
+ val main={ ->
+ total=1;
+ table=new u16[2]; table[0]=7; table[1]=9;
+ if( forward()!=1 ) return 4;
+ if( lookup(1)!=9 || lookup(2)!=0 ) return 5;
+ if( add_noInline(5)!=6 || nested()!=7 ) return 1;
+ val counter=new Counter;
+ if( counter.read()!=7 || counter.total!=100 ) return 2;
+ val a=new Writer, b=new Writer;
+ if( a.step()!=3 || total!=3 || a.count!=3 || b.count!=2 ) return 3;
+ return 0;
+ };
+ return main();
+ """;
+ assertEquals("0",Eval2.eval(new CodeGen(source).driver(CodeGen.Phase.TypeCheck),0));
+ TestC.runSF(source,"class_instance_receivers","",-1);
+ }
+
+ @Test public void importedCallbackKeepsItsClass() throws Exception {
+ Path build=Path.of("build/objs/receivers");
+ Files.createDirectories(build);
+ Path lib=Files.createTempDirectory(build,"classes-");
+ new CodeGen(null,lib.toString(),null,"Owner",
+ "int value=7; val get_noInline={ -> self.value; };",123,true,TypeInteger.BOT)
+ .driver(TestC.CPU_PORT,TestC.CALL_CONVENTION,false,false);
+ new CodeGen(null,lib.toString(),null,"Forwarder",
+ "int value=99; val apply_noInline={ {int} action -> action()+self.value; };",123,true,TypeInteger.BOT)
+ .driver(TestC.CPU_PORT,TestC.CALL_CONVENTION,false,false);
+ var paths=new Ary<>(new String[]{lib.toString()});
+ String source="return Forwarder.apply_noInline(Owner.get_noInline)==106 ? 0 : 1;";
+ CodeGen code=new CodeGen(null,null,paths,"ReceiverClient",source,123,true,TypeInteger.BOT)
+ .driver(CodeGen.Phase.TypeCheck);
+ assertEquals("0",Eval2.eval(code,0));
+ TestC.run(source,"imported_receivers",paths,TestC.CALL_CONVENTION,null,null,"",-1);
+ }
+
+ @Test public void classReceiverHasNoNativeArgument() throws Exception {
+ String source="""
+ int base=10;
+ val calc={i64 a,i64 b,i64 c,i64 d,i64 e,i64 f,i64 g ->
+ self.base+a+2*b+3*c+4*d+5*e+6*f+7*g;
+ };
+ val callback_noInline={i64 n -> self.base+n;};
+ { {i64 -> i64} i64 -> i64 } invoke="C";
+ val viaC={i64 n -> invoke(callback_noInline,n);};
+ """;
+ Path build=Path.of("build/objs/receivers");
+ Files.createDirectories(build);
+ Path driver=build.resolve("native_receiver.c");
+ Files.writeString(driver,"""
+ typedef long long (__attribute__((CALL_CONV)) *action_t)(long long);
+ __attribute__((CALL_CONV)) long long invoke(action_t action, long long n) { return action(n); }
+ __attribute__((CALL_CONV)) extern long long calc(long long,long long,long long,long long,long long,long long,long long);
+ __attribute__((CALL_CONV)) extern long long viaC(long long);
+ int main(void) { return calc(1,2,3,4,5,6,7)!=150 || viaC(5)!=15; }
+ """);
+ TestC.run(source,"native_receiver",null,TestC.CALL_CONVENTION,
+ TestC.CALL_CONVENTION.equals("win64") ? "ms_abi" : "sysv_abi",driver.toString(),"",-1);
+ }
+}