diff options
| author | Cliff Click <cliffc@acm.org> | 2026-11-16 14:25:14 -0800 |
|---|---|---|
| committer | Cliff Click <cliffc@acm.org> | 2026-11-16 14:25:14 -0800 |
| commit | 0dcd3513a633479ce228f24826db4f09e4c0fc8b (patch) | |
| tree | d8fb6d0fb382df5799789e9dc1eb0fae2d381cce | |
| parent | 51a029304d8105b201bdfb81a7692b8a1b16b028 (diff) | |
| download | Simple-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
153 files changed, 3256 insertions, 638 deletions
diff --git a/chapter05/README.md b/chapter05/README.md index 40886af2..0955f36a 100644 --- a/chapter05/README.md +++ b/chapter05/README.md @@ -413,6 +413,21 @@ return a; +### Factoring after strength reduction + +Peephole order should not hide the same arithmetic from Phi factoring. +`Phi(x+x,y+x)` can become `Phi(x,y)+x`, but an earlier peephole may already have +replaced `x+x` with `x*2`. The Phi matcher therefore views `x*2` as two copies of +`x` while factoring mixed Add/Mul arms. It does not expand the graph into an Add +that would immediately fold back to a multiply. If all arms are multiplies, +ordinary multiply factoring still applies. + +[Chapter05Test](src/test/java/com/seaofnodes/simple/Chapter05Test.java) +checks the factored operands before and after strength reduction and with either +arm order. Later chapters extend this same view to `x<<1` when shifts arrive. +The rule stays local to doubling; arbitrary coefficients would require creating +another multiplication, with a less clear benefit. + [^1]: Click, C. (1995). Combining Analyses, Combining Optimizations, 132. diff --git a/chapter05/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter05/src/main/java/com/seaofnodes/simple/node/PhiNode.java index da3917c7..0db72880 100644 --- a/chapter05/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter05/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; public class PhiNode extends Node { @@ -40,14 +41,14 @@ public class PhiNode extends Node { // Phi, but Phis do not make code. // Phi(op(A,B),op(Q,R),op(X,Y)) becomes // op(Phi(A,Q,X), Phi(B,R,Y)). - Node op = in(1); - if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op() ) { + Node op = factoringOp(); + if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op(op) ) { Node[] lhss = new Node[nIns()]; Node[] rhss = new Node[nIns()]; lhss[0] = rhss[0] = in(0); // Set Region for( int i=1; i<nIns(); i++ ) { - lhss[i] = in(i).in(1); - rhss[i] = in(i).in(2); + lhss[i] = factoringInput(op,in(i),1); + rhss[i] = factoringInput(op,in(i),2); } Node phi_lhs = new PhiNode(_label,lhss).peephole(); Node phi_rhs = new PhiNode(_label,rhss).peephole(); @@ -57,9 +58,28 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { - for( int i=2; i<nIns(); i++ ) - if( in(1).getClass() != in(i).getClass() ) + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { + for( int i=1; i<nIns(); i++ ) + if( op.getClass()!=in(i).getClass() && !(op instanceof AddNode && doubled(in(i))) ) return false; return true; } diff --git a/chapter05/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter05/src/test/java/com/seaofnodes/simple/Chapter05Test.java index d6c91a4a..282215f1 100644 --- a/chapter05/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter05/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -222,4 +222,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + 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/chapter06/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter06/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 6acb5535..ff7d5cf7 100644 --- a/chapter06/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter06/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; public class PhiNode extends Node { @@ -41,14 +42,14 @@ public class PhiNode extends Node { // Phi, but Phis do not make code. // Phi(op(A,B),op(Q,R),op(X,Y)) becomes // op(Phi(A,Q,X), Phi(B,R,Y)). - Node op = in(1); - if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op() ) { + Node op = factoringOp(); + if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op(op) ) { Node[] lhss = new Node[nIns()]; Node[] rhss = new Node[nIns()]; lhss[0] = rhss[0] = in(0); // Set Region for( int i=1; i<nIns(); i++ ) { - lhss[i] = in(i).in(1); - rhss[i] = in(i).in(2); + lhss[i] = factoringInput(op,in(i),1); + rhss[i] = factoringInput(op,in(i),2); } Node phi_lhs = new PhiNode(_label,lhss).peephole(); Node phi_rhs = new PhiNode(_label,rhss).peephole(); @@ -58,9 +59,28 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { - for( int i=2; i<nIns(); i++ ) - if( in(1).getClass() != in(i).getClass() ) + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { + for( int i=1; i<nIns(); i++ ) + if( op.getClass()!=in(i).getClass() && !(op instanceof AddNode && doubled(in(i))) ) return false; return true; } diff --git a/chapter06/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter06/src/test/java/com/seaofnodes/simple/Chapter05Test.java index d6c91a4a..282215f1 100644 --- a/chapter06/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter06/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -222,4 +222,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + 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/chapter07/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter07/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 64cd3dd7..2f94e486 100644 --- a/chapter07/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter07/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; public class PhiNode extends Node { @@ -49,14 +50,14 @@ public class PhiNode extends Node { // Phi, but Phis do not make code. // Phi(op(A,B),op(Q,R),op(X,Y)) becomes // op(Phi(A,Q,X), Phi(B,R,Y)). - Node op = in(1); - if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op() ) { + Node op = factoringOp(); + if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op(op) ) { Node[] lhss = new Node[nIns()]; Node[] rhss = new Node[nIns()]; lhss[0] = rhss[0] = in(0); // Set Region for( int i=1; i<nIns(); i++ ) { - lhss[i] = in(i).in(1); - rhss[i] = in(i).in(2); + lhss[i] = factoringInput(op,in(i),1); + rhss[i] = factoringInput(op,in(i),2); } Node phi_lhs = new PhiNode(_label,lhss).peephole(); Node phi_rhs = new PhiNode(_label,rhss).peephole(); @@ -66,9 +67,28 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { - for( int i=2; i<nIns(); i++ ) - if( in(1).getClass() != in(i).getClass() ) + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { + for( int i=1; i<nIns(); i++ ) + if( op.getClass()!=in(i).getClass() && !(op instanceof AddNode && doubled(in(i))) ) return false; return true; } diff --git a/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java index d6c91a4a..282215f1 100644 --- a/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter07/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -222,4 +222,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + 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/chapter08/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter08/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 14622140..5f8b0251 100644 --- a/chapter08/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter08/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; public class PhiNode extends Node { @@ -49,14 +50,14 @@ public class PhiNode extends Node { // Phi, but Phis do not make code. // Phi(op(A,B),op(Q,R),op(X,Y)) becomes // op(Phi(A,Q,X), Phi(B,R,Y)). - Node op = in(1); - if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op() ) { + Node op = factoringOp(); + if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op(op) ) { Node[] lhss = new Node[nIns()]; Node[] rhss = new Node[nIns()]; lhss[0] = rhss[0] = in(0); // Set Region for( int i=1; i<nIns(); i++ ) { - lhss[i] = in(i).in(1); - rhss[i] = in(i).in(2); + lhss[i] = factoringInput(op,in(i),1); + rhss[i] = factoringInput(op,in(i),2); } Node phi_lhs = new PhiNode(_label,lhss).peephole(); Node phi_rhs = new PhiNode(_label,rhss).peephole(); @@ -66,9 +67,28 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { - for( int i=2; i<nIns(); i++ ) - if( in(1).getClass() != in(i).getClass() ) + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { + for( int i=1; i<nIns(); i++ ) + if( op.getClass()!=in(i).getClass() && !(op instanceof AddNode && doubled(in(i))) ) return false; return true; } diff --git a/chapter08/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter08/src/test/java/com/seaofnodes/simple/Chapter05Test.java index fa9a5e37..5fbffd41 100644 --- a/chapter08/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter08/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -224,4 +224,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + 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/chapter09/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter09/src/main/java/com/seaofnodes/simple/node/PhiNode.java index fe6231fa..1612b860 100644 --- a/chapter09/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter09/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; public class PhiNode extends Node { @@ -55,14 +56,14 @@ public class PhiNode extends Node { // Phi, but Phis do not make code. // Phi(op(A,B),op(Q,R),op(X,Y)) becomes // op(Phi(A,Q,X), Phi(B,R,Y)). - Node op = in(1); - if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op() ) { + Node op = factoringOp(); + if( op.nIns()==3 && op.in(0)==null && !op.isCFG() && same_op(op) ) { Node[] lhss = new Node[nIns()]; Node[] rhss = new Node[nIns()]; lhss[0] = rhss[0] = in(0); // Set Region for( int i=1; i<nIns(); i++ ) { - lhss[i] = in(i).in(1); - rhss[i] = in(i).in(2); + lhss[i] = factoringInput(op,in(i),1); + rhss[i] = factoringInput(op,in(i),2); } Node phi_lhs = new PhiNode(_label,lhss).peephole(); Node phi_rhs = new PhiNode(_label,rhss).peephole(); @@ -72,9 +73,28 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { - for( int i=2; i<nIns(); i++ ) - if( in(1).getClass() != in(i).getClass() ) + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { + for( int i=1; i<nIns(); i++ ) + if( op.getClass()!=in(i).getClass() && !(op instanceof AddNode && doubled(in(i))) ) return false; return true; } diff --git a/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 2c869033..a0037792 100644 --- a/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter09/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + 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/chapter10/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter10/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 24a72aa4..fafedcef 100644 --- a/chapter10/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter10/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -63,7 +64,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -92,15 +94,34 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op.isCFG() || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode ) return false; Node busy = null; for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -118,21 +139,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = new PhiNode(_label,t.glb(),ins); diff --git a/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java index cf7bd6cf..55eb08d6 100644 --- a/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter10/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter11/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter11/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 6995cc2f..952faf68 100644 --- a/chapter11/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter11/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -67,7 +68,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -96,8 +98,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op.isCFG() || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -115,7 +135,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -133,21 +154,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter11/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter11/src/test/java/com/seaofnodes/simple/Chapter05Test.java index cf7bd6cf..55eb08d6 100644 --- a/chapter11/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter11/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter12/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter12/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 6995cc2f..952faf68 100644 --- a/chapter12/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter12/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -67,7 +68,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -96,8 +98,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op.isCFG() || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -115,7 +135,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -133,21 +154,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 97cd9940..466cd119 100644 --- a/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new ProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter13/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter13/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 8dfa04cf..29de3536 100644 --- a/chapter13/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter13/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -66,7 +67,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -95,8 +97,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof MulNode && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==2; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op.isCFG() || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -114,7 +134,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -132,21 +153,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter13/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter13/src/test/java/com/seaofnodes/simple/Chapter05Test.java index cd646126..42c22ee2 100644 --- a/chapter13/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter13/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new CProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter14/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter14/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 309cd8b5..2a481c52 100644 --- a/chapter14/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter14/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -66,7 +67,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -95,8 +97,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 and x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return (n instanceof MulNode || n instanceof ShlNode) && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==(n instanceof MulNode ? 2 : 1); + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op.isCFG() || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -114,7 +134,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -132,21 +153,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter14/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter14/src/test/java/com/seaofnodes/simple/Chapter05Test.java index cd646126..42c22ee2 100644 --- a/chapter14/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter14/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new CProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter15/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter15/src/main/java/com/seaofnodes/simple/node/PhiNode.java index ea5eeb89..815847fe 100644 --- a/chapter15/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter15/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -66,7 +67,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -95,8 +97,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 and x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return (n instanceof MulNode || n instanceof ShlNode) && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==(n instanceof MulNode ? 2 : 1); + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -114,7 +134,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -132,21 +153,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter15/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter15/src/test/java/com/seaofnodes/simple/Chapter05Test.java index cd646126..42c22ee2 100644 --- a/chapter15/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter15/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new CProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter16/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter16/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 8479b4dc..17fe6cef 100644 --- a/chapter16/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter16/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -66,7 +67,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -95,8 +97,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 and x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return (n instanceof MulNode || n instanceof ShlNode) && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==(n instanceof MulNode ? 2 : 1); + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -114,7 +134,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -132,21 +153,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter16/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter16/src/test/java/com/seaofnodes/simple/Chapter05Test.java index cd646126..42c22ee2 100644 --- a/chapter16/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter16/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -225,4 +225,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new CProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter17a/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter17a/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 942748e7..836722d8 100644 --- a/chapter17a/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter17a/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -66,7 +67,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -95,8 +97,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 and x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return (n instanceof MulNode || n instanceof ShlNode) && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==(n instanceof MulNode ? 2 : 1); + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -114,7 +134,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -132,21 +153,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter17a/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter17a/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 7ea75f49..f0b37a53 100644 --- a/chapter17a/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter17a/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -224,4 +224,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new CProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter17b/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter17b/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 942748e7..836722d8 100644 --- a/chapter17b/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter17b/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -3,6 +3,7 @@ package com.seaofnodes.simple.node; import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypeInteger; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.Utils; @@ -66,7 +67,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -95,8 +97,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 and x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return (n instanceof MulNode || n instanceof ShlNode) && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==(n instanceof MulNode ? 2 : 1); + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -114,7 +134,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -132,21 +153,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter17b/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter17b/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 7ea75f49..f0b37a53 100644 --- a/chapter17b/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter17b/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -224,4 +224,27 @@ return a; } } + 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} ) { + new Parser(""); + Node ctrl = init(new CProjNode(Parser.START,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter18/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter18/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 9b5e1c26..012b6498 100644 --- a/chapter18/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter18/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -72,7 +72,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -103,8 +104,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x*2 and x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return (n instanceof MulNode || n instanceof ShlNode) && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==(n instanceof MulNode ? 2 : 1); + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -122,7 +141,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -140,21 +160,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java index e88474a4..03604584 100644 --- a/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -1,6 +1,7 @@ package com.seaofnodes.simple; import com.seaofnodes.simple.node.*; +import com.seaofnodes.simple.type.TypeInteger; import org.junit.Test; import static org.junit.Assert.*; @@ -225,4 +226,27 @@ return a; } } + 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("return 0;").parse(); + Node ctrl = init(new CProjNode(code._start,0,"Ctrl")); + RegionNode region = init(new RegionNode(new Node[]{null,ctrl,ctrl})); + Node p = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new MulNode(p,init(new ConstantNode(TypeInteger.constant(2))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter18/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter18/src/test/java/com/seaofnodes/simple/Chapter09Test.java index d6ced4e0..8b8f8156 100644 --- a/chapter18/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter18/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -40,7 +40,7 @@ else { return x; """); code.parse().iter(); - assertEquals("return Phi(Region,(arg*2),(Mul+1));", code.print()); + assertEquals("return (Phi(Region,arg,1)+Phi(Region,arg,(arg*2)));", code.print()); Assert.assertEquals( "2", Eval2.eval(code, 1)); Assert.assertEquals("23", Eval2.eval(code, 11)); } diff --git a/chapter19/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter19/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 6fb315b4..e8a37a4d 100644 --- a/chapter19/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter19/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -74,7 +74,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -105,8 +106,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -124,7 +143,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -142,21 +162,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter19/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter19/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 09e7f7c7..338b26dc 100644 --- a/chapter19/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter19/src/test/java/com/seaofnodes/simple/Chapter05Test.java @@ -1,6 +1,7 @@ package com.seaofnodes.simple; import com.seaofnodes.simple.node.*; +import com.seaofnodes.simple.type.TypeInteger; import org.junit.Test; import static org.junit.Assert.*; @@ -197,4 +198,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(1))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter19/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter19/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 5672d566..a5620e13 100644 --- a/chapter19/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter19/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -40,7 +40,7 @@ else { return x; """); code.parse().iter(); - 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/chapter20/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/PhiNode.java index a752977b..e858a21c 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -78,7 +78,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -109,8 +110,26 @@ public class PhiNode extends Node { return null; } - private boolean same_op() { + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + n.in(2).addDep(this)._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -128,7 +147,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( region().in(i).addDep(this)._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -146,21 +166,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter20/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter20/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 44493d87..8a771349 100644 --- a/chapter20/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter20/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(1))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter20/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter20/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 0a3049e6..be8e125a 100644 --- a/chapter20/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter20/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -41,7 +41,7 @@ else { return x; """); code.parse().iter(); - 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/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java index e075ea5c..45d5f1ae 100644 --- a/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter21/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -78,7 +78,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -109,10 +110,28 @@ public class PhiNode extends Node { return null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -130,7 +149,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -148,21 +168,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter05Test.java index c809f72f..47690beb 100644 --- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter21/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(1))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter21/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 0a3049e6..be8e125a 100644 --- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -41,7 +41,7 @@ else { return x; """); code.parse().iter(); - 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/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java index b19d1bb5..bba96016 100644 --- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java +++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter21Test.java @@ -380,7 +380,8 @@ public class Chapter21Test { // Evaluate on RISC5 emulator; expect return of an array of primes in // the simulated heap. - EvalRisc5 R5 = TestRisc5.build("sieve", 100, 92, false); + // Phi factoring changes split placement in this chapter's allocator. + EvalRisc5 R5 = TestRisc5.build("sieve", 100, 164, false); int trap = R5.step(10000); assertEquals(0,trap); // Return register A0 holds sieve(100) diff --git a/chapter22/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter22/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 8aa123f7..7438f417 100644 --- a/chapter22/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter22/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -78,7 +78,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -109,10 +110,28 @@ public class PhiNode extends Node { return null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -130,7 +149,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -148,21 +168,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } PhiNode phi = j==1 && op instanceof MemOpNode mem diff --git a/chapter22/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter22/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 8168594a..31e77b49 100644 --- a/chapter22/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter22/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(1))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter22/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter22/src/test/java/com/seaofnodes/simple/Chapter09Test.java index df590448..85529d63 100644 --- a/chapter22/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter22/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -41,7 +41,7 @@ else { return x; """); code.parse().iter().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/chapter23/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter23/src/main/java/com/seaofnodes/simple/node/PhiNode.java index af5d900b..424f9d20 100644 --- a/chapter23/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter23/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -106,7 +106,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -137,10 +138,28 @@ public class PhiNode extends Node { return null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -158,7 +177,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -176,21 +196,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Not accepts both pointers and integers, but a Phi cannot mix them. diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 8168594a..31e77b49 100644 --- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter23/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(1))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter23/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 3a4415d9..b60e2462 100644 --- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter09Test.java @@ -41,7 +41,7 @@ else { return x; """); code.parse().iter().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/chapter24a/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter24a/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 953e009e..f63efa24 100644 --- a/chapter24a/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter24a/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -129,7 +129,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -161,10 +162,28 @@ public class PhiNode extends Node { return null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -182,7 +201,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -200,21 +220,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Not accepts both pointers and integers, but a Phi cannot mix them. diff --git a/chapter24a/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter24a/src/test/java/com/seaofnodes/simple/Chapter05Test.java index b234209f..5c6bdf85 100644 --- a/chapter24a/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter24a/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(1))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter24a/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter24a/src/test/java/com/seaofnodes/simple/Chapter09Test.java index f24d96eb..bfa4d776 100644 --- a/chapter24a/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter24a/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/chapter24b/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter24b/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 7f2bb1f4..70bb5877 100644 --- a/chapter24b/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter24b/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -130,7 +130,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; // If merging Phi(N, cast(N)) - we are losing the cast JOIN effects, so just remove. if( nIns()==3 ) { @@ -162,10 +163,28 @@ public class PhiNode extends Node { return null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -183,7 +202,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -201,21 +221,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Not accepts both pointers and integers, but a Phi cannot mix them. diff --git a/chapter24b/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter24b/src/test/java/com/seaofnodes/simple/Chapter05Test.java index b234209f..5c6bdf85 100644 --- a/chapter24b/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter24b/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(1))))) : init(new AddNode(p,p)); + Node sum = init(new AddNode(i,p)); + PhiNode phi = init(new PhiNode("sum",TypeInteger.BOT,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/chapter24b/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter24b/src/test/java/com/seaofnodes/simple/Chapter09Test.java index f24d96eb..bfa4d776 100644 --- a/chapter24b/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter24b/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/chapter25/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter25/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 064852e4..9f800e2f 100644 --- a/chapter25/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter25/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -107,7 +107,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; if( nIns()==3 ) { Node merge = matchingGuardMerge(r,1); @@ -165,10 +166,28 @@ public class PhiNode extends Node { return tested!=null && ScopeNode.availableAt(n,r,new java.util.BitSet()) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -186,7 +205,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -204,21 +224,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Not accepts both pointers and integers, but a Phi cannot mix them. diff --git a/chapter25/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter25/src/test/java/com/seaofnodes/simple/Chapter05Test.java index b234209f..460db1b1 100644 --- a/chapter25/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter25/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(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/chapter25/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter25/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 50410618..6e167d9e 100644 --- a/chapter25/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter25/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/chapter26/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter26/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 064852e4..9f800e2f 100644 --- a/chapter26/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter26/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -107,7 +107,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; if( nIns()==3 ) { Node merge = matchingGuardMerge(r,1); @@ -165,10 +166,28 @@ public class PhiNode extends Node { return tested!=null && ScopeNode.availableAt(n,r,new java.util.BitSet()) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -186,7 +205,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -204,21 +224,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Not accepts both pointers and integers, but a Phi cannot mix them. diff --git a/chapter26/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter26/src/test/java/com/seaofnodes/simple/Chapter05Test.java index b234209f..460db1b1 100644 --- a/chapter26/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter26/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(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/chapter26/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter26/src/test/java/com/seaofnodes/simple/Chapter09Test.java index f24d96eb..bfa4d776 100644 --- a/chapter26/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter26/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/chapter27/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter27/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 064852e4..9f800e2f 100644 --- a/chapter27/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter27/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -107,7 +107,8 @@ public class PhiNode extends Node { // Phi(op(a,b,...),op(c,d,...)) -> op(Phi(a,c),Phi(b,d),...). Node down; - if( same_op() && (down=drop_same_op())!=null ) return down; + Node op = factoringOp(); + if( same_op(op) && (down=drop_same_op(op))!=null ) return down; if( nIns()==3 ) { Node merge = matchingGuardMerge(r,1); @@ -165,10 +166,28 @@ public class PhiNode extends Node { return tested!=null && ScopeNode.availableAt(n,r,new java.util.BitSet()) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -186,7 +205,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -204,21 +224,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Not accepts both pointers and integers, but a Phi cannot mix them. diff --git a/chapter27/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter27/src/test/java/com/seaofnodes/simple/Chapter05Test.java index b234209f..460db1b1 100644 --- a/chapter27/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter27/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.*; @@ -198,4 +199,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 = init(new ConstantNode(TypeInteger.BOT)); + Node i = init(new MinusNode(p)); + Node twice = reduced ? init(new ShlNode(null,p,init(new ConstantNode(TypeInteger.constant(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/chapter27/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter27/src/test/java/com/seaofnodes/simple/Chapter09Test.java index f24d96eb..bfa4d776 100644 --- a/chapter27/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter27/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/chapter28a/README.md b/chapter28a/README.md index 2f127e19..d61d642c 100644 --- a/chapter28a/README.md +++ b/chapter28a/README.md @@ -23,6 +23,52 @@ This chapter adds file and class semantics to the escape analysis we already have. All required Simple source is available in one compilation. +## Globals use the same receiver as fields + +Every function has a source-visible `self`. An instance method receives its +instance; a global function receives its defining file's class singleton. +For example: + +```simple +int f0=7; +int f1=0; +val touch={int n -> f1=n; return f0+f1;}; +``` + +The function body means `self.f1=n; return self.f0+self.f1;`. Once the class is +initialized, `touch(5)` returns 12. Bare reads, assignments, and compound updates +all resolve the field's receiver and use the same field-access path. A bare +assignment must emit a Store, rather than updating only a lexical Scope slot. +Locals and explicit parameters still shadow fields; an explicitly declared +parameter named `self` shadows the implicit receiver. + +The [parser](src/main/java/com/seaofnodes/simple/Parser.java) supplies a receiver +parameter instead of manufacturing a class constant for each global read. +Normal constant folding removes that parameter for class functions. Its function +signature retains `TypePtr.PTR`, the marker for a hidden receiver with no native +argument slot, so ordinary C callers and callbacks retain their ABI. +[CallNode](src/main/java/com/seaofnodes/simple/node/CallNode.java) binds that slot +to the callee's declared class view even when another class forwards the callback +or an instance stores its function pointer. An instance method can also name its +enclosing class's fields through that declaration's receiver. This does not add +closures or bound method values. + +The class view keeps fields discovered so far and remains open until SCCP +installs the completed shape. This matters for forward functions and for globals +declared after a struct. Class declarations still accumulate Scope values until +initializer exit; this chapter also retains its existing Scope-based instance +constructor handling. Active field uses retain their class-initialization checks. +Passing the hidden class receiver does not itself publish the caller's class to +unknown code; actual escaping fields are tracked normally. + +[GlobalAssignmentTest](src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java) +checks assignments, branches, chained updates, RHS effects, local shadowing, +conversions, constructors, and rejected stores. +[ReceiverTest](src/test/java/com/seaofnodes/simple/ReceiverTest.java) checks explicit +class `self`, nested functions, instance/global name collisions, forward fields, +and native argument/callback ABI behavior. Chapter 28b extends this to imported +functions and summaries. + ## Example: Lazy class initialization, or Pay-As-You-Go Suppose an application sometimes needs a `Table` but not often; many runs may diff --git a/chapter28a/src/main/java/com/seaofnodes/simple/Parser.java b/chapter28a/src/main/java/com/seaofnodes/simple/Parser.java index 3b5a8ce7..fd9d9753 100644 --- a/chapter28a/src/main/java/com/seaofnodes/simple/Parser.java +++ b/chapter28a/src/main/java/com/seaofnodes/simple/Parser.java @@ -290,8 +290,16 @@ public class Parser { // All args, "as-if" called externally for( int i=0; i<ids.length; i++ ) { Type t = sig.arg(i); + // The body sees its owning class receiver. PTR remains in the + // signature as the ABI marker for a receiver with no machine slot. + if( i==0 && t==TypePtr.PTR ) { + TypeStruct clz = ((TypeMemPtr)fun.defaultArg(i))._obj; + // A file can add globals after its struct declaration closes. + // Keep this view open until SCCP installs the completed class. + t = TypeMemPtr.make((byte)2,TypeStruct.make(clz._name,true,clz._fields),true); + } // Args take a default input if called from Start/external-world - _scope.define(ids[i], t, (i==0 && ids[0]=="self") || (finals!=null && finals.get(i)), new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(fun.defaultArg(i)).peephole()).peephole(), loc); + _scope.define(ids[i], t, (i==0 && ids[0]=="self") || (finals!=null && finals.get(i)), new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(i==0 && t instanceof TypeMemPtr ? t : fun.defaultArg(i)).peephole()).peephole(), loc); } if( isCtor && !isInit ) { @@ -1075,6 +1083,10 @@ public class Parser { throw error("Cannot reassign final '"+name+"'"); checkSharedFunction(def); + // All fields use the same receiver-based lvalue path. + if( fieldSelf(def)!=null ) + { pos(old); return parseExpression(); } + // Parse assignment expression Node expr = parseAsgn(); @@ -1084,27 +1096,6 @@ public class Parser { // Update _scope.update(name,lift); - // Check for storing into an instance field instead of a local var - int kx = _scope.kindx(def); // Declaration scope - int fx = _scope.enclosingFunction(); // Enclosing function scope - Kind kk = _scope._kinds.at(kx); - Kind fk = _scope._kinds.at(fx); - // Access instance field from 'self' - if( kx+1 == fx && kk instanceof Kind.Func inst && FunNode.isInstance(inst._name) && - fk instanceof Kind.Func method && !inExplicitConstructor() ) { - // Named field offset on an unknown struct type - TypeMemPtr self = (TypeMemPtr)_scope.var(fk._lexSize).type(); - TypeStruct sobj = (TypeStruct)TYPES.get(self._obj._name); - Field fld = sobj.field(name); - int alias = fld._alias; - Node ptr = _scope.in(method._lexSize); - Node off = fldoff(ptr,name); - Node prior = mem().keep(); - Node st = new StoreNode(loc(), name, alias, decl, ctrl(), prior, ptr, off, lift, inExplicitConstructor()).peephole().keep(); - storeMem(st,alias,prior); - st.unkeep(); - prior.unkeep(); - } lift.unkill(); @@ -2099,35 +2090,12 @@ public class Parser { if( inExplicitConstructor() && var._uninit && missingInit(rvalue,new BitSet()) ) throw error("Field '"+id+"' might not be initialized",var._loc); - // Check for an instance field load - int kx = _scope.kindx(var); // Declaration scope - int fx = _scope.enclosingFunction(); // Enclosing function scope - Kind kk = _scope._kinds.at(kx); - Kind fk = _scope._kinds.at(fx); - // Access instance field from 'self' - if( kx+1 == fx && kk instanceof Kind.Func inst && FunNode.isInstance(inst._name) && fk instanceof Kind.Func method && !inExplicitConstructor() ) - return parsePostfixName(_scope.in(method._lexSize),id,pre); - - // Check for a function-escaping variable; these require true - // closures. Final constants are OK; final vars require a hidden var - // argument; not-final fields can just use an explicit struct arg. - if( kx < fx && !inExplicitConstructor() && // Out of scope - !(var._final && rvalue._type.isConstant()) ) { // Not a final constant - if( kx > 0 ) // Global scope is OK, only ever one of these (not one per function invoke) - throw error("Variable '"+var._name+"' is out of function scope and must be a final constant"); - - // var.idx==2 is self argument, 3 is args, 4 or more are now static globals - if( var._idx >= 4 ) { - // Read from global scope. - // Surely a nicer way to get the top-level scope compile name? - Var clzptr = _scope.var( 2 ); - // Get the most recent sharpen global - TypeStruct clz = (TypeStruct) TYPES.get( ((TypeMemPtr) clzptr.type())._obj._name ); - TypeMemPtr clztmp = TypeMemPtr.make( (byte) 2, clz, true ); - return parsePostfixName( con( clztmp ), id,pre ); - //return parsePostfixName(_scope.in(2),id); - } - } + Node self = fieldSelf(var); + if( self!=null ) return parsePostfixName(self,id,pre); + int kx = _scope.kindx(var), fx = _scope.enclosingFunction(); + if( kx>0 && kx<fx && !inExplicitConstructor() && + !(var._final && rvalue._type.isConstant()) ) + throw error("Variable '"+var._name+"' is out of function scope and must be a final constant"); // Check for assign-update, x += e0; char ch = pre==0 ? _lexer.matchOperAssign() : (char)pre; @@ -2372,6 +2340,31 @@ public class Parser { return parsePostfixMethod(value,defaultSelf()); } + // Find the receiver for a field lvalue. Initializers retain Scope values; + // class declarations retain their Scope values until initializer exit. + private Node fieldSelf(Var var) { + int kx = _scope.kindx(var); + ScopeNode.Kind kind = _scope._kinds.at(kx); + if( !(kind instanceof Kind.Func owner) || !FunNode.isInit(owner._name) || var._idx<owner._lexSize+2 ) return null; + // Instance constructors still accumulate their fields in Scope here. + if( FunNode.isInstance(owner._name) && (inExplicitConstructor() || _scope.enclosingFuncOrDecl()==kx) ) return null; + // Class declarations still accumulate their initial values in Scope. + // This also preserves declaration-time struct default expressions. + if( FunNode.isClz(owner._name) && _scope.enclosingFunction()==kx ) return null; + // Nested functions have their own receiver parameter. Resolve fields + // through it even across intervening function and block scopes. + Node self = defaultSelf(); + Var receiver = _scope.var(owner._lexSize); + if( self._type instanceof TypeMemPtr ptr && receiver.type() instanceof TypeMemPtr declared && + ptr._obj._name.equals(declared._obj._name) ) return self; + // An instance method can also name fields of its enclosing class. + // Use that declaration's receiver; normal folding handles its identity. + if( !FunNode.isClz(owner._name) ) return null; + // The enclosing declaration may have discovered more fields since + // creating its receiver. View that same receiver with its current type. + return peep(new ConvertNode(receiver.type().upgradeType(TYPES),_scope.in(receiver))); + } + private void checkSharedFunction(Var v) { if( _scope.canInit(v) && v._final && v.type() instanceof TypeFunPtr t && t.isConstant() ) throw error("Cannot reassign shared function '"+v._name+"'"); @@ -2563,7 +2556,7 @@ public class Parser { java.util.BitSet finals = new java.util.BitSet(); Type self = implicitSelfType(); ts.push(self); - ids.push(self == TypePtr.PTR ? "#self" : "self"); + ids.push("self"); // Parse other arguments _lexer.skipWhiteSpace(); @@ -2573,6 +2566,10 @@ public class Parser { if( t==null ) break; finals.set(ids.size(),bindingFinal(t)); String id = requireId(); + // Older free functions may explicitly name a source argument + // "self". It shadows the implicit class receiver, not its ABI slot. + if( id=="self" && ts.at(0)==TypePtr.PTR && ids.at(0)=="self" ) + ids.set(0,"#self"); ts .push(t ); // Push type/arg pairs ids.push(id); match(","); diff --git a/chapter28a/src/main/java/com/seaofnodes/simple/node/CallNode.java b/chapter28a/src/main/java/com/seaofnodes/simple/node/CallNode.java index 1a8da215..e453387b 100644 --- a/chapter28a/src/main/java/com/seaofnodes/simple/node/CallNode.java +++ b/chapter28a/src/main/java/com/seaofnodes/simple/node/CallNode.java @@ -5,6 +5,7 @@ import com.seaofnodes.print.ExprPrinter; import com.seaofnodes.simple.Parser; import com.seaofnodes.simple.codegen.CodeGen; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypePtr; import com.seaofnodes.simple.type.TypeFunPtr; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.type.TypeRPC; @@ -73,13 +74,14 @@ public class CallNode extends CFGNode { // A broad scalar target can refine to a function pointer during Iter. // It cannot yet promise that the call exposes nothing. if( _type!=Type.CONTROL ) return TypeMem.BOT; - if( !(fptr()._type instanceof TypeFunPtr) ) + if( !(fptr()._type instanceof TypeFunPtr tfp) ) return fptr()._type.isHigh() ? TypeMem.START : TypeMem.BOT; if( !external() ) return TypeMem.START; Type input = dep.addDepForwards(mem())._type; TypeMem escaped = input instanceof TypeMem m ? m : input.isHigh() ? TypeMem.TOP : TypeMem.BOT; TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns()-1; i++ ) + // A class receiver belongs to the callee; the caller does not expose its class. + for( int i = tfp.nargs()>0 && tfp.arg(0)==TypePtr.PTR ? 3 : 2; i<nIns()-1; i++ ) escaped = escaped.escapesFrom(dep.addDepForwards(arg(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,escaped._escFs,escaped._escAs); } @@ -156,7 +158,10 @@ public class CallNode extends CFGNode { CodeGen.CODE.add(fun).addDef(this); for( Node use : fun._outputs ) if( use instanceof ParmNode parm ) { - Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() : arg(parm._idx); + // Match the callee's declared receiver view, including forward fields. + Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() + : parm._idx==2 && fun.sig().arg(0)==TypePtr.PTR + ? ConstantNode.seed(parm._declaredType).peephole() : arg(parm._idx); CodeGen.CODE.add(parm).addDef(def); // Linking can happen during post-SCCP inlining. Keep an RPC // Parm's cached finite set synchronized with its newly added diff --git a/chapter28a/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter28a/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 61e4b468..afab6082 100644 --- a/chapter28a/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter28a/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -105,7 +105,8 @@ public class PhiNode extends Node { // Generic "pull down op" Node progress; - if( same_op() && (progress = drop_same_op()) != null ) + Node op = factoringOp(); + if( same_op(op) && (progress = drop_same_op(op)) != null ) return progress; // If merging Phi(ZERO, guardNZ(N)) at the matching `if(N)` join, the @@ -141,10 +142,28 @@ public class PhiNode extends Node { return tested!=null && (early==null || early.dominates(r,this)) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof EscapeNode || op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -162,7 +181,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -180,21 +200,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Do not introduce an operand Phi mixing incompatible type families. diff --git a/chapter28a/src/main/java/com/seaofnodes/simple/node/RegionNode.java b/chapter28a/src/main/java/com/seaofnodes/simple/node/RegionNode.java index 923773c4..e0860233 100644 --- a/chapter28a/src/main/java/com/seaofnodes/simple/node/RegionNode.java +++ b/chapter28a/src/main/java/com/seaofnodes/simple/node/RegionNode.java @@ -65,7 +65,7 @@ public class RegionNode extends CFGNode { if( use instanceof PhiNode phi ) { PhiNode phi2 = phi.in(i) instanceof PhiNode phi2x && phi2x.region()==region ? phi2x : null; for( int j=1; j<region.nIns(); j++ ) - phi.addDef(phi2==null ? phi.in(i) : phi2.in(j)); + phi.addDef(CodeGen.CODE.add(phi2==null ? phi.in(i) : phi2.in(j))); CodeGen.CODE.add(phi); } } diff --git a/chapter28a/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter28a/src/test/java/com/seaofnodes/simple/Chapter05Test.java index afdb1071..82a08dac 100644 --- a/chapter28a/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter28a/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/chapter28a/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter28a/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 7025b98a..85d4987f 100644 --- a/chapter28a/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter28a/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/chapter28a/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter28a/src/test/java/com/seaofnodes/simple/Chapter20Test.java index 7eb1f255..19408f3b 100644 --- a/chapter28a/src/test/java/com/seaofnodes/simple/Chapter20Test.java +++ b/chapter28a/src/test/java/com/seaofnodes/simple/Chapter20Test.java @@ -257,9 +257,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/chapter28a/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter28a/src/test/java/com/seaofnodes/simple/Chapter21Test.java index e15c2581..f3af31a2 100644 --- a/chapter28a/src/test/java/com/seaofnodes/simple/Chapter21Test.java +++ b/chapter28a/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/chapter28a/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter28a/src/test/java/com/seaofnodes/simple/Chapter22Test.java index 00d77f65..115ee1ca 100644 --- a/chapter28a/src/test/java/com/seaofnodes/simple/Chapter22Test.java +++ b/chapter28a/src/test/java/com/seaofnodes/simple/Chapter22Test.java @@ -301,17 +301,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/chapter28a/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java b/chapter28a/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java new file mode 100644 index 00000000..e24baee0 --- /dev/null +++ b/chapter28a/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java @@ -0,0 +1,71 @@ +package com.seaofnodes.simple; + +import com.seaofnodes.simple.codegen.CodeGen; + +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/chapter28a/src/test/java/com/seaofnodes/simple/ReceiverTest.java b/chapter28a/src/test/java/com/seaofnodes/simple/ReceiverTest.java new file mode 100644 index 00000000..9384b42a --- /dev/null +++ b/chapter28a/src/test/java/com/seaofnodes/simple/ReceiverTest.java @@ -0,0 +1,93 @@ +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 sourceCallbackKeepsItsClass() throws Exception { + Path build=Path.of("build/objs/receivers"); + Files.createDirectories(build); + Path source=Files.createTempDirectory(build,"sources-"); + Files.createDirectories(source.resolve("Root")); + Files.writeString(source.resolve("Root.smp"),""); + Files.writeString(source.resolve("Root/Owner.smp"), + "int value=7; val get_noInline={ -> self.value; };"); + Files.writeString(source.resolve("Root/Forwarder.smp"), + "int value=99; val apply_noInline={ {int} action -> action()+self.value; };"); + Files.writeString(source.resolve("Root/Main.smp"), + "return Forwarder.apply_noInline(Owner.get_noInline)==106 ? 0 : 1;"); + CodeGen code=new CodeGen(source.toString(),source.toString(),"Root/Main",null,123,true,TypeInteger.BOT) + .driver(CodeGen.Phase.TypeCheck); + assertEquals("0",Eval2.eval(code,0)); + } + + @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); + } +} diff --git a/chapter28b/README.md b/chapter28b/README.md index 84e538ea..5d8cbdf9 100644 --- a/chapter28b/README.md +++ b/chapter28b/README.md @@ -120,7 +120,14 @@ those exclusions by owner and slot, then restores the complement. Treating this set as FULL would expose private library functions. Unknown callback arguments, results, and unloaded summaries use the evolving Start/Stop state; no frozen public-function list supplies their bounds. Hidden class receivers -default to the defining class singleton even after import. The +default to the defining class singleton even after import, following +[chapter 28a's receiver model](../chapter28a/README.md#globals-use-the-same-receiver-as-fields). +`SummaryNode` excludes that hidden receiver from its conservative argument-escape +scan: the caller supplies no class object through the ABI, and actual publication +of the callee's class fields is already represented by the saved summary state. +Instance receivers remain ordinary arguments and participate in that scan. +[ReceiverTest](src/test/java/com/seaofnodes/simple/ReceiverTest.java) checks a +callback forwarded by another compiled class with a different field value. The [escape-flow implementation notes](../chapter29/docs/escape-flow.md) explain the shared design and the identity-remapping checks in more detail. diff --git a/chapter28b/src/main/java/com/seaofnodes/simple/Parser.java b/chapter28b/src/main/java/com/seaofnodes/simple/Parser.java index cef7091a..0e8eb5a9 100644 --- a/chapter28b/src/main/java/com/seaofnodes/simple/Parser.java +++ b/chapter28b/src/main/java/com/seaofnodes/simple/Parser.java @@ -291,8 +291,16 @@ public class Parser { // All args, "as-if" called externally for( int i=0; i<ids.length; i++ ) { Type t = sig.arg(i); + // The body sees its owning class receiver. PTR remains in the + // signature as the ABI marker for a receiver with no machine slot. + if( i==0 && t==TypePtr.PTR ) { + TypeStruct clz = ((TypeMemPtr)fun.defaultArg(i))._obj; + // A file can add globals after its struct declaration closes. + // Keep this view open until SCCP installs the completed class. + t = TypeMemPtr.make((byte)2,TypeStruct.make(clz._name,true,clz._fields),true); + } // Args take a default input if called from Start/external-world - _scope.define(ids[i], t, (i==0 && ids[0]=="self") || (finals!=null && finals.get(i)), new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(fun.defaultArg(i)).peephole()).peephole(), loc); + _scope.define(ids[i], t, (i==0 && ids[0]=="self") || (finals!=null && finals.get(i)), new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(i==0 && t instanceof TypeMemPtr ? t : fun.defaultArg(i)).peephole()).peephole(), loc); } if( isCtor && !isInit ) { @@ -1085,6 +1093,10 @@ public class Parser { throw error("Cannot reassign final '"+name+"'"); checkSharedFunction(def); + // All fields use the same receiver-based lvalue path. + if( fieldSelf(def)!=null ) + { pos(old); return parseExpression(); } + // Parse assignment expression Node expr = parseAsgn(); @@ -1094,27 +1106,6 @@ public class Parser { // Update _scope.update(name,lift); - // Check for storing into an instance field instead of a local var - int kx = _scope.kindx(def); // Declaration scope - int fx = _scope.enclosingFunction(); // Enclosing function scope - Kind kk = _scope._kinds.at(kx); - Kind fk = _scope._kinds.at(fx); - // Access instance field from 'self' - if( kx+1 == fx && kk instanceof Kind.Func inst && FunNode.isInstance(inst._name) && - fk instanceof Kind.Func method && !inExplicitConstructor() ) { - // Named field offset on an unknown struct type - TypeMemPtr self = (TypeMemPtr)_scope.var(fk._lexSize).type(); - TypeStruct sobj = (TypeStruct)TYPES.get(self._obj._name); - Field fld = sobj.field(name); - int alias = fld._alias; - Node ptr = _scope.in(method._lexSize); - Node off = fldoff(ptr,name); - Node prior = mem().keep(); - Node st = new StoreNode(loc(), name, alias, decl, ctrl(), prior, ptr, off, lift, inExplicitConstructor()).peephole().keep(); - storeMem(st,alias,prior); - st.unkeep(); - prior.unkeep(); - } lift.unkill(); @@ -2109,35 +2100,12 @@ public class Parser { if( inExplicitConstructor() && var._uninit && missingInit(rvalue,new BitSet()) ) throw error("Field '"+id+"' might not be initialized",var._loc); - // Check for an instance field load - int kx = _scope.kindx(var); // Declaration scope - int fx = _scope.enclosingFunction(); // Enclosing function scope - Kind kk = _scope._kinds.at(kx); - Kind fk = _scope._kinds.at(fx); - // Access instance field from 'self' - if( kx+1 == fx && kk instanceof Kind.Func inst && FunNode.isInstance(inst._name) && fk instanceof Kind.Func method && !inExplicitConstructor() ) - return parsePostfixName(_scope.in(method._lexSize),id,pre); - - // Check for a function-escaping variable; these require true - // closures. Final constants are OK; final vars require a hidden var - // argument; not-final fields can just use an explicit struct arg. - if( kx < fx && !inExplicitConstructor() && // Out of scope - !(var._final && rvalue._type.isConstant()) ) { // Not a final constant - if( kx > 0 ) // Global scope is OK, only ever one of these (not one per function invoke) - throw error("Variable '"+var._name+"' is out of function scope and must be a final constant"); - - // var.idx==2 is self argument, 3 is args, 4 or more are now static globals - if( var._idx >= 4 ) { - // Read from global scope. - // Surely a nicer way to get the top-level scope compile name? - Var clzptr = _scope.var( 2 ); - // Get the most recent sharpen global - TypeStruct clz = (TypeStruct) TYPES.get( ((TypeMemPtr) clzptr.type())._obj._name ); - TypeMemPtr clztmp = TypeMemPtr.make( (byte) 2, clz, true ); - return parsePostfixName( con( clztmp ), id,pre ); - //return parsePostfixName(_scope.in(2),id); - } - } + Node self = fieldSelf(var); + if( self!=null ) return parsePostfixName(self,id,pre); + int kx = _scope.kindx(var), fx = _scope.enclosingFunction(); + if( kx>0 && kx<fx && !inExplicitConstructor() && + !(var._final && rvalue._type.isConstant()) ) + throw error("Variable '"+var._name+"' is out of function scope and must be a final constant"); // Check for assign-update, x += e0; char ch = pre==0 ? _lexer.matchOperAssign() : (char)pre; @@ -2382,6 +2350,31 @@ public class Parser { return parsePostfixMethod(value,defaultSelf()); } + // Find the receiver for a field lvalue. Initializers retain Scope values; + // class declarations retain their Scope values until initializer exit. + private Node fieldSelf(Var var) { + int kx = _scope.kindx(var); + ScopeNode.Kind kind = _scope._kinds.at(kx); + if( !(kind instanceof Kind.Func owner) || !FunNode.isInit(owner._name) || var._idx<owner._lexSize+2 ) return null; + // Instance constructors still accumulate their fields in Scope here. + if( FunNode.isInstance(owner._name) && (inExplicitConstructor() || _scope.enclosingFuncOrDecl()==kx) ) return null; + // Class declarations still accumulate their initial values in Scope. + // This also preserves declaration-time struct default expressions. + if( FunNode.isClz(owner._name) && _scope.enclosingFunction()==kx ) return null; + // Nested functions have their own receiver parameter. Resolve fields + // through it even across intervening function and block scopes. + Node self = defaultSelf(); + Var receiver = _scope.var(owner._lexSize); + if( self._type instanceof TypeMemPtr ptr && receiver.type() instanceof TypeMemPtr declared && + ptr._obj._name.equals(declared._obj._name) ) return self; + // An instance method can also name fields of its enclosing class. + // Use that declaration's receiver; normal folding handles its identity. + if( !FunNode.isClz(owner._name) ) return null; + // The enclosing declaration may have discovered more fields since + // creating its receiver. View that same receiver with its current type. + return peep(new ConvertNode(receiver.type().upgradeType(TYPES),_scope.in(receiver))); + } + private void checkSharedFunction(Var v) { if( _scope.canInit(v) && v._final && v.type() instanceof TypeFunPtr t && t.isConstant() ) throw error("Cannot reassign shared function '"+v._name+"'"); @@ -2573,7 +2566,7 @@ public class Parser { java.util.BitSet finals = new java.util.BitSet(); Type self = implicitSelfType(); ts.push(self); - ids.push(self == TypePtr.PTR ? "#self" : "self"); + ids.push("self"); // Parse other arguments _lexer.skipWhiteSpace(); @@ -2583,6 +2576,10 @@ public class Parser { if( t==null ) break; finals.set(ids.size(),bindingFinal(t)); String id = requireId(); + // Older free functions may explicitly name a source argument + // "self". It shadows the implicit class receiver, not its ABI slot. + if( id=="self" && ts.at(0)==TypePtr.PTR && ids.at(0)=="self" ) + ids.set(0,"#self"); ts .push(t ); // Push type/arg pairs ids.push(id); match(","); diff --git a/chapter28b/src/main/java/com/seaofnodes/simple/node/CallNode.java b/chapter28b/src/main/java/com/seaofnodes/simple/node/CallNode.java index 23188e84..a69708c0 100644 --- a/chapter28b/src/main/java/com/seaofnodes/simple/node/CallNode.java +++ b/chapter28b/src/main/java/com/seaofnodes/simple/node/CallNode.java @@ -6,6 +6,7 @@ import com.seaofnodes.simple.Parser; import com.seaofnodes.simple.codegen.CodeGen; import com.seaofnodes.simple.codegen.Iter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypePtr; import com.seaofnodes.simple.type.TypeFunPtr; import com.seaofnodes.simple.type.TypeMem; import com.seaofnodes.simple.type.TypeRPC; @@ -90,13 +91,14 @@ public class CallNode extends CFGNode { // A broad scalar target can refine to a function pointer during Iter. // It cannot yet promise that the call exposes nothing. if( _type!=Type.CONTROL ) return TypeMem.BOT; - if( !(fptr()._type instanceof TypeFunPtr) ) + if( !(fptr()._type instanceof TypeFunPtr tfp) ) return fptr()._type.isHigh() ? TypeMem.START : TypeMem.BOT; if( !external() ) return TypeMem.START; Type input = dep.addDepForwards(mem())._type; TypeMem escaped = input instanceof TypeMem m ? m : input.isHigh() ? TypeMem.TOP : TypeMem.BOT; TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns()-1; i++ ) + // A class receiver belongs to the callee; the caller does not expose its class. + for( int i = tfp.nargs()>0 && tfp.arg(0)==TypePtr.PTR ? 3 : 2; i<nIns()-1; i++ ) escaped = escaped.escapesFrom(dep.addDepForwards(arg(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,escaped._escFs,escaped._escAs); } @@ -173,7 +175,10 @@ public class CallNode extends CFGNode { CodeGen.CODE.add(fun).addDef(this); for( Node use : fun._outputs ) if( use instanceof ParmNode parm ) { - Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() : arg(parm._idx); + // Match the callee's declared receiver view, including forward fields. + Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() + : parm._idx==2 && fun.sig().arg(0)==TypePtr.PTR + ? ConstantNode.seed(parm._declaredType).peephole() : arg(parm._idx); CodeGen.CODE.add(parm).addDef(def); // Linking can happen during post-SCCP inlining. Keep an RPC // Parm's cached finite set synchronized with its newly added diff --git a/chapter28b/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter28b/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 3cf6f854..de255a97 100644 --- a/chapter28b/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter28b/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -114,7 +114,8 @@ public class PhiNode extends Node { // Generic "pull down op" Node progress; - if( same_op() && (progress = drop_same_op()) != null ) + Node op = factoringOp(); + if( same_op(op) && (progress = drop_same_op(op)) != null ) return progress; // If merging Phi(ZERO, guardNZ(N)) at the matching `if(N)` join, the @@ -150,10 +151,28 @@ public class PhiNode extends Node { return tested!=null && (early==null || early.dominates(r,this)) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof EscapeNode || op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -171,7 +190,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -189,21 +209,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp.addDef(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Do not introduce an operand Phi mixing incompatible type families. diff --git a/chapter28b/src/main/java/com/seaofnodes/simple/node/RegionNode.java b/chapter28b/src/main/java/com/seaofnodes/simple/node/RegionNode.java index 8883ba8e..55f635ae 100644 --- a/chapter28b/src/main/java/com/seaofnodes/simple/node/RegionNode.java +++ b/chapter28b/src/main/java/com/seaofnodes/simple/node/RegionNode.java @@ -68,7 +68,7 @@ public class RegionNode extends CFGNode { if( use instanceof PhiNode phi ) { PhiNode phi2 = phi.in(i) instanceof PhiNode phi2x && phi2x.region()==region ? phi2x : null; for( int j=1; j<region.nIns(); j++ ) - phi.addDef(phi2==null ? phi.in(i) : phi2.in(j)); + phi.addDef(CodeGen.CODE.add(phi2==null ? phi.in(i) : phi2.in(j))); CodeGen.CODE.add(phi); } } diff --git a/chapter28b/src/main/java/com/seaofnodes/simple/node/SummaryNode.java b/chapter28b/src/main/java/com/seaofnodes/simple/node/SummaryNode.java index 483aab89..d0da3250 100644 --- a/chapter28b/src/main/java/com/seaofnodes/simple/node/SummaryNode.java +++ b/chapter28b/src/main/java/com/seaofnodes/simple/node/SummaryNode.java @@ -27,7 +27,7 @@ public class SummaryNode extends CFGNode implements MultiNode { TypeMem mem = in(1)._type instanceof TypeMem m ? m : in(1)._type.isHigh() ? TypeMem.TOP : TypeMem.BOT; mem = (TypeMem)mem.meet(_state.mem()); TypeMem outside = CodeGen.CODE._start.outside(this); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); return TypeTuple.make(_state.ctl(),mem,_state.ret()); } @Override public Node idealize() { return null; } @@ -36,9 +36,16 @@ public class SummaryNode extends CFGNode implements MultiNode { if( dep.addDepForwards(in(0))._type.isHigh() ) return TypeMem.START; TypeMem mem = (TypeMem)_state.mem(); TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,mem._escFs,mem._escAs); } + // A class receiver is supplied by the callee, not exposed by its caller. + // Actual uses which publish self are already represented in _state. + private int firstArgument() { + if( !(in(0) instanceof FunNode fun) ) return 2; + TypeFunPtr sig = fun.sig(); + return sig.nargs()>0 && sig.arg(0)==TypePtr.PTR ? 3 : 2; + } @Override boolean _upgradeType(HashMap<String,Type> types) { TypeTuple state = (TypeTuple)_state.upgradeType(types); if( state==_state ) return false; diff --git a/chapter28b/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter28b/src/test/java/com/seaofnodes/simple/Chapter05Test.java index afdb1071..82a08dac 100644 --- a/chapter28b/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter28b/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/chapter28b/src/test/java/com/seaofnodes/simple/Chapter09Test.java b/chapter28b/src/test/java/com/seaofnodes/simple/Chapter09Test.java index 7025b98a..85d4987f 100644 --- a/chapter28b/src/test/java/com/seaofnodes/simple/Chapter09Test.java +++ b/chapter28b/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/chapter28b/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter28b/src/test/java/com/seaofnodes/simple/Chapter20Test.java index 7eb1f255..19408f3b 100644 --- a/chapter28b/src/test/java/com/seaofnodes/simple/Chapter20Test.java +++ b/chapter28b/src/test/java/com/seaofnodes/simple/Chapter20Test.java @@ -257,9 +257,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/chapter28b/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter28b/src/test/java/com/seaofnodes/simple/Chapter21Test.java index e15c2581..f3af31a2 100644 --- a/chapter28b/src/test/java/com/seaofnodes/simple/Chapter21Test.java +++ b/chapter28b/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/chapter28b/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter28b/src/test/java/com/seaofnodes/simple/Chapter22Test.java index 00d77f65..115ee1ca 100644 --- a/chapter28b/src/test/java/com/seaofnodes/simple/Chapter22Test.java +++ b/chapter28b/src/test/java/com/seaofnodes/simple/Chapter22Test.java @@ -301,17 +301,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/chapter28b/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java b/chapter28b/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java new file mode 100644 index 00000000..e24baee0 --- /dev/null +++ b/chapter28b/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java @@ -0,0 +1,71 @@ +package com.seaofnodes.simple; + +import com.seaofnodes.simple.codegen.CodeGen; + +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/chapter28b/src/test/java/com/seaofnodes/simple/ReceiverTest.java b/chapter28b/src/test/java/com/seaofnodes/simple/ReceiverTest.java new file mode 100644 index 00000000..0342d9a2 --- /dev/null +++ b/chapter28b/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); + } +} diff --git a/chapter29/README.md b/chapter29/README.md index ed39de98..03c9a116 100644 --- a/chapter29/README.md +++ b/chapter29/README.md @@ -14,6 +14,9 @@ backporting the cleanups, in part to show the normal progression of large project development. +This snapshot retains [chapter 28a's shared class receiver](../chapter28a/README.md#globals-use-the-same-receiver-as-fields) +and chapter 28b's imported-callback handling. + ## Following the grammar The old `Parser.java` had grown beyond 3,000 lines, mixing recursive descent, diff --git a/chapter29/docs/29-grammar.md b/chapter29/docs/29-grammar.md index cb231ce0..d580a28b 100644 --- a/chapter29/docs/29-grammar.md +++ b/chapter29/docs/29-grammar.md @@ -57,6 +57,7 @@ constructorParameter : type '^'? bindingModifier? IDENTIFIER ; // A method is an ordinary fixed function binding in a struct definition. // The compiler supplies self; it is not written in parameterList. +// Global functions use their owning class singleton as self. // Function types and expressions both receive their implicit receiver here. methodDeclaration : 'val' bindingModifier? IDENTIFIER '=' functionExpression ';' ; @@ -220,10 +221,10 @@ one-pass IR builder: - A statement beginning with `{` might be a block or a function-type binding. `Declarations` and `Types` use speculative parsing and cursor restore; qualified type lookup also stops before a suffix that belongs to an expression. -- Bare assignment, field assignment, and compound updates share the grammar's - precedence but use different IR paths. `References` decides between an SSA - local, a constructor field's local value, and an actual memory access. A - function-valued field may also supply an implicit receiver to a call. +- Bare fields resolve through their receiver, so reads, assignments, and + updates share the field-access path. Locals use SSA; class declarations + retain Scope values until initializer exit. Global functions receive their + owning class singleton as `self`; instance methods receive their object. - `for` updates are scanned first and parsed after the body, where their effects belong. Explicit constructor bodies are scanned first and parsed after field discovery, so later fields have local slots. Both use `Lexer.skipTo`, which diff --git a/chapter29/src/main/java/com/seaofnodes/simple/node/CallNode.java b/chapter29/src/main/java/com/seaofnodes/simple/node/CallNode.java index 91d27330..0a48e7aa 100644 --- a/chapter29/src/main/java/com/seaofnodes/simple/node/CallNode.java +++ b/chapter29/src/main/java/com/seaofnodes/simple/node/CallNode.java @@ -7,6 +7,7 @@ import com.seaofnodes.simple.parser.Parser; import com.seaofnodes.simple.codegen.CodeGen; import com.seaofnodes.simple.codegen.Iter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypePtr; import com.seaofnodes.simple.type.TypeMemPtr; import com.seaofnodes.simple.type.TypeFunPtr; import com.seaofnodes.simple.type.TypeMem; @@ -95,13 +96,14 @@ public class CallNode extends CFGNode { // A broad scalar target can refine to a function pointer during Iter. // It cannot yet promise that the call exposes nothing. if( _type!=Type.CONTROL ) return TypeMem.BOT; - if( !(fptr()._type instanceof TypeFunPtr) ) + if( !(fptr()._type instanceof TypeFunPtr tfp) ) return fptr()._type.isHigh() ? TypeMem.START : TypeMem.BOT; if( !external() ) return TypeMem.START; Type input = dep.addDepForwards(mem())._type; TypeMem escaped = input instanceof TypeMem m ? m : input.isHigh() ? TypeMem.TOP : TypeMem.BOT; TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns()-1; i++ ) + // A class receiver belongs to the callee; the caller does not expose its class. + for( int i = tfp.nargs()>0 && tfp.arg(0)==TypePtr.PTR ? 3 : 2; i<nIns()-1; i++ ) escaped = escaped.escapesFrom(dep.addDepForwards(arg(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,escaped._escFs,escaped._escAs); } @@ -179,7 +181,10 @@ public class CallNode extends CFGNode { CodeGen.CODE.add(fun).addDef(this); for( Node use : fun._outputs ) if( use instanceof ParmNode parm ) { - Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() : arg(parm._idx); + // Match the callee's declared receiver view, including forward fields. + Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() + : parm._idx==2 && fun.sig().arg(0)==TypePtr.PTR + ? ConstantNode.seed(parm._declaredType).peephole() : arg(parm._idx); CodeGen.CODE.add(parm).addDef(def); // Linking can happen during post-SCCP inlining. Keep an RPC // Parm's cached finite set synchronized with its newly added diff --git a/chapter29/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter29/src/main/java/com/seaofnodes/simple/node/PhiNode.java index f45c7325..af24a94b 100644 --- a/chapter29/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter29/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -122,7 +122,8 @@ public class PhiNode extends Node { // Generic "pull down op" Node progress; - if( same_op() && (progress = drop_same_op()) != null ) + Node op = factoringOp(); + if( same_op(op) && (progress = drop_same_op(op)) != null ) return progress; // If merging Phi(ZERO, guardNZ(N)) at the matching `if(N)` join, the @@ -158,10 +159,28 @@ public class PhiNode extends Node { return tested!=null && (early==null || early.dominates(r,this)) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof EscapeNode || op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -179,7 +198,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -197,21 +217,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp._inputs.add(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Do not introduce an operand Phi mixing incompatible type families. diff --git a/chapter29/src/main/java/com/seaofnodes/simple/node/RegionNode.java b/chapter29/src/main/java/com/seaofnodes/simple/node/RegionNode.java index eee1c150..3ed63862 100644 --- a/chapter29/src/main/java/com/seaofnodes/simple/node/RegionNode.java +++ b/chapter29/src/main/java/com/seaofnodes/simple/node/RegionNode.java @@ -69,7 +69,7 @@ public class RegionNode extends CFGNode { if( use instanceof PhiNode phi ) { PhiNode phi2 = phi.in(i) instanceof PhiNode phi2x && phi2x.region()==region ? phi2x : null; for( int j=1; j<region.nIns(); j++ ) - phi.addDef(phi2==null ? phi.in(i) : phi2.in(j)); + phi.addDef(CodeGen.CODE.add(phi2==null ? phi.in(i) : phi2.in(j))); CodeGen.CODE.add(phi); } } diff --git a/chapter29/src/main/java/com/seaofnodes/simple/node/SummaryNode.java b/chapter29/src/main/java/com/seaofnodes/simple/node/SummaryNode.java index 483aab89..d0da3250 100644 --- a/chapter29/src/main/java/com/seaofnodes/simple/node/SummaryNode.java +++ b/chapter29/src/main/java/com/seaofnodes/simple/node/SummaryNode.java @@ -27,7 +27,7 @@ public class SummaryNode extends CFGNode implements MultiNode { TypeMem mem = in(1)._type instanceof TypeMem m ? m : in(1)._type.isHigh() ? TypeMem.TOP : TypeMem.BOT; mem = (TypeMem)mem.meet(_state.mem()); TypeMem outside = CodeGen.CODE._start.outside(this); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); return TypeTuple.make(_state.ctl(),mem,_state.ret()); } @Override public Node idealize() { return null; } @@ -36,9 +36,16 @@ public class SummaryNode extends CFGNode implements MultiNode { if( dep.addDepForwards(in(0))._type.isHigh() ) return TypeMem.START; TypeMem mem = (TypeMem)_state.mem(); TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,mem._escFs,mem._escAs); } + // A class receiver is supplied by the callee, not exposed by its caller. + // Actual uses which publish self are already represented in _state. + private int firstArgument() { + if( !(in(0) instanceof FunNode fun) ) return 2; + TypeFunPtr sig = fun.sig(); + return sig.nargs()>0 && sig.arg(0)==TypePtr.PTR ? 3 : 2; + } @Override boolean _upgradeType(HashMap<String,Type> types) { TypeTuple state = (TypeTuple)_state.upgradeType(types); if( state==_state ) return false; diff --git a/chapter29/src/main/java/com/seaofnodes/simple/parser/Expressions.java b/chapter29/src/main/java/com/seaofnodes/simple/parser/Expressions.java index 93c07d8a..806e5f7f 100644 --- a/chapter29/src/main/java/com/seaofnodes/simple/parser/Expressions.java +++ b/chapter29/src/main/java/com/seaofnodes/simple/parser/Expressions.java @@ -31,6 +31,9 @@ final class Expressions { { P.pos(old); return parseExpression(); } P.references.checkAssignment(def); + // All fields use the same receiver-based lvalue path. + if( P.references.fieldSelf(def)!=null ) + { P.pos(old); return parseExpression(); } return P.references.assign(def,parseAssignment()); } diff --git a/chapter29/src/main/java/com/seaofnodes/simple/parser/Functions.java b/chapter29/src/main/java/com/seaofnodes/simple/parser/Functions.java index 14dee33b..4d80b100 100644 --- a/chapter29/src/main/java/com/seaofnodes/simple/parser/Functions.java +++ b/chapter29/src/main/java/com/seaofnodes/simple/parser/Functions.java @@ -30,7 +30,7 @@ final class Functions { BitSet finals = new BitSet(); Type self = P.types.implicitSelfType(); ts.push(self); - ids.push(self == TypePtr.PTR ? "#self" : "self"); + ids.push("self"); // Parse other arguments P._lexer.skipWhiteSpace(); @@ -81,6 +81,10 @@ final class Functions { } finals.set(ids.size(),P.declarations.bindingFinal(t)); String id = P.requireId(); + // Older free functions may explicitly name a source argument + // "self". It shadows the implicit class receiver, not its ABI slot. + if( id=="self" && ts.at(0)==TypePtr.PTR && ids.at(0)=="self" ) + ids.set(0,"#self"); ts .push(t ); // Push type/arg pairs ids.push(id); P.match(","); @@ -291,8 +295,16 @@ final class Functions { // All args, "as-if" called externally for( int i = 0; i<ids.length; i++ ) { Type t = sig.arg(i); + // The body sees its owning class receiver. PTR remains in the + // signature as the ABI marker for a receiver with no machine slot. + if( i==0 && t==TypePtr.PTR ) { + TypeStruct clz = ((TypeMemPtr)fun.defaultArg(i))._obj; + // A file can add globals after its struct declaration closes. + // Keep this view open until SCCP installs the completed class. + t = TypeMemPtr.make((byte)2,TypeStruct.make(clz._name,true,clz._fields),true); + } // Args take a default input if called from Start/external-world - Node parm = new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(fun.defaultArg(i)).peephole()).peephole(); + Node parm = new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(i==0 && t instanceof TypeMemPtr ? t : fun.defaultArg(i)).peephole()).peephole(); if( t instanceof TypeMemPtr ptr && ptr._partial ) parm = new ConstructNode(parm).peephole(); P._scope.define(ids[i], t, (i==0 && ids[0]=="self") || (finals!=null && finals.get(i)), parm, loc); } diff --git a/chapter29/src/main/java/com/seaofnodes/simple/parser/References.java b/chapter29/src/main/java/com/seaofnodes/simple/parser/References.java index 483bd7a8..eaf4ce65 100644 --- a/chapter29/src/main/java/com/seaofnodes/simple/parser/References.java +++ b/chapter29/src/main/java/com/seaofnodes/simple/parser/References.java @@ -70,23 +70,9 @@ final class References { // Check for a function-escaping variable; these require true // closures. Final constants are OK; final vars require a hidden var // argument; not-final fields can just use an explicit struct arg. - if( kx < fx && !P.structs.inExplicitConstructor() && // Out of scope - !(var._final && rvalue._type.isConstant()) ) { // Not a final constant - if( kx > 0 ) // Global scope is OK, only ever one of these (not one per function invoke) - throw P.error("Variable '"+var._name+"' is out of function scope and must be a final constant"); - - // var.idx==2 is self argument, 3 is args, 4 or more are now static globals - if( var._idx >= 4 ) { - // Read from global scope. - // Surely a nicer way to get the top-level scope compile name? - Var clzptr = P._scope.var( 2 ); - // Get the most recent sharpen global - TypeStruct clz = (TypeStruct) Parser.TYPES.get( ((TypeMemPtr) clzptr.type())._obj._name ); - TypeMemPtr clztmp = TypeMemPtr.make( (byte) 2, clz, true ); - return parseField( P.con( clztmp ), id,pre ); - //return parseField(_scope.in(2),id); - } - } + if( kx>0 && kx<fx && !P.structs.inExplicitConstructor() && + !(var._final && rvalue._type.isConstant()) ) + throw P.error("Variable '"+var._name+"' is out of function scope and must be a final constant"); // Check for assign-update, x += e0; char ch = pre==0 ? P._lexer.matchOperAssign() : (char)pre; @@ -119,19 +105,6 @@ final class References { } Node assign(Var def, Node expr) { - Node self = fieldSelf(def); - if( self!=null ) { - TypeStruct ts = P.types.latestStruct(((TypeMemPtr)self._type)._obj); - Field fld = ts.field(def._name); - Node val = expr.keep(); - Node lift = P.conversions.convertExpr(val,def.type()); - Node mem = P.construction.storeMemory(self).keep(); - Node st = new StoreNode(P.loc(),fld._fname,fld._alias,fld._t,P.ctrl(),mem,self, - ConFldOffNode.make(ts,fld._fname),lift,P.construction.own(self)).peephole(); - P.construction.store(self,fld._alias,st,mem); - mem.unkeep(); - return val.unkeep(); - } String name = def._name; // Lift expression, based on type Type decl = def.type(); // Declared type @@ -280,14 +253,27 @@ final class References { return P._scope.in(P._scope.update(P._scope.var(selfx),null)); } - // Fields are lvalues in memory, including inside their initializer and - // explicit constructor. Scope slots retain declaration metadata only. - private Node fieldSelf(Var var) { - int kx = P._scope.kindx(var), fx = P._scope.enclosingFuncOrDecl(); + // Find the receiver for a field lvalue. Instance initializers use memory; + // class declarations retain their Scope values until initializer exit. + Node fieldSelf(Var var) { + int kx = P._scope.kindx(var); ScopeNode.Kind kind = P._scope._kinds.at(kx); - if( !(kind instanceof Kind.Func inst) || !FunNode.isInstance(inst._name) || var._idx<inst._lexSize+2 ) return null; - if( kx==fx || kx+1==fx ) return defaultSelf(); - return null; + if( !(kind instanceof Kind.Func owner) || !FunNode.isInit(owner._name) || var._idx<owner._lexSize+2 ) return null; + // Class declarations still accumulate their initial values in Scope. + // This also preserves declaration-time struct default expressions. + if( FunNode.isClz(owner._name) && P._scope.enclosingFunction()==kx ) return null; + // Nested functions have their own receiver parameter. Resolve fields + // through it even across intervening function and block scopes. + Node self = defaultSelf(); + Var receiver = P._scope.var(owner._lexSize); + if( self._type instanceof TypeMemPtr ptr && receiver.type() instanceof TypeMemPtr declared && + ptr._obj._name.equals(declared._obj._name) ) return self; + // An instance method can also name fields of its enclosing class. + // Use that declaration's receiver; normal folding handles its identity. + if( !FunNode.isClz(owner._name) ) return null; + // The enclosing declaration may have discovered more fields since + // creating its receiver. View that same receiver with its current type. + return P.peep(new ConvertNode(receiver.type().upgradeType(Parser.TYPES),P._scope.in(receiver))); } private void checkSharedFunction(Var v) { 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); + } +} diff --git a/chapter30/README.md b/chapter30/README.md index 2e172e33..d8e32f80 100644 --- a/chapter30/README.md +++ b/chapter30/README.md @@ -12,6 +12,9 @@ squares are rejected, and play ends with a win or draw. Runnable programs, including sorting, file I/O, and shortest-path examples, live in [`docs/examples`](docs/examples/). +This snapshot retains [chapter 28a's shared class receiver](../chapter28a/README.md#globals-use-the-same-receiver-as-fields) +and chapter 28b's imported-callback handling. + ## Terminal input and diagnostics [`sys.io.getch()`](src/main/smp/sys/io.smp) reads one byte without waiting for diff --git a/chapter30/docs/30-grammar.md b/chapter30/docs/30-grammar.md index 189a7c04..7ff7b024 100644 --- a/chapter30/docs/30-grammar.md +++ b/chapter30/docs/30-grammar.md @@ -60,6 +60,7 @@ constructorParameter : type '^'? bindingModifier? IDENTIFIER ; // A method is an ordinary fixed function binding in a struct definition. // The compiler supplies self; it is not written in parameterList. +// Global functions use their owning class singleton as self. // Function types and expressions both receive their implicit receiver here. methodDeclaration : 'val' bindingModifier? memberName '=' functionExpression ';' ; memberName : IDENTIFIER | primitiveType ; @@ -235,10 +236,10 @@ one-pass IR builder: - A statement beginning with `{` might be a block or a function-type binding. `Declarations` and `Types` use speculative parsing and cursor restore; qualified type lookup also stops before a suffix that belongs to an expression. -- Bare assignment, field assignment, and compound updates share the grammar's - precedence but use different IR paths. `References` decides between an SSA - local, a constructor field's local value, and an actual memory access. A - function-valued field may also supply an implicit receiver to a call. +- Bare fields resolve through their receiver, so reads, assignments, and + updates share the field-access path. Locals use SSA; class declarations + retain Scope values until initializer exit. Global functions receive their + owning class singleton as `self`; instance methods receive their object. - `for` updates are scanned first and parsed after the body, where their effects belong. Explicit constructor bodies are scanned first and parsed after field discovery, so later fields have local slots. Both use `Lexer.skipTo`, which diff --git a/chapter30/src/main/java/com/seaofnodes/simple/node/CallNode.java b/chapter30/src/main/java/com/seaofnodes/simple/node/CallNode.java index ac5e4eee..be142889 100644 --- a/chapter30/src/main/java/com/seaofnodes/simple/node/CallNode.java +++ b/chapter30/src/main/java/com/seaofnodes/simple/node/CallNode.java @@ -7,6 +7,7 @@ import com.seaofnodes.simple.parser.Parser; import com.seaofnodes.simple.codegen.CodeGen; import com.seaofnodes.simple.codegen.Iter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypePtr; import com.seaofnodes.simple.type.TypeMemPtr; import com.seaofnodes.simple.type.TypeFunPtr; import com.seaofnodes.simple.type.TypeMem; @@ -95,13 +96,14 @@ public class CallNode extends CFGNode { // A broad scalar target can refine to a function pointer during Iter. // It cannot yet promise that the call exposes nothing. if( _type!=Type.CONTROL ) return TypeMem.BOT; - if( !(fptr()._type instanceof TypeFunPtr) ) + if( !(fptr()._type instanceof TypeFunPtr tfp) ) return fptr()._type.isHigh() ? TypeMem.START : TypeMem.BOT; if( !external() ) return TypeMem.START; Type input = dep.addDepForwards(mem())._type; TypeMem escaped = input instanceof TypeMem m ? m : input.isHigh() ? TypeMem.TOP : TypeMem.BOT; TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns()-1; i++ ) + // A class receiver belongs to the callee; the caller does not expose its class. + for( int i = tfp.nargs()>0 && tfp.arg(0)==TypePtr.PTR ? 3 : 2; i<nIns()-1; i++ ) escaped = escaped.escapesFrom(dep.addDepForwards(arg(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,escaped._escFs,escaped._escAs); } @@ -179,7 +181,10 @@ public class CallNode extends CFGNode { CodeGen.CODE.add(fun).addDef(this); for( Node use : fun._outputs ) if( use instanceof ParmNode parm ) { - Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() : arg(parm._idx); + // Match the callee's declared receiver view, including forward fields. + Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() + : parm._idx==2 && fun.sig().arg(0)==TypePtr.PTR + ? ConstantNode.seed(parm._declaredType).peephole() : arg(parm._idx); CodeGen.CODE.add(parm).addDef(def); // Linking can happen during post-SCCP inlining. Keep an RPC // Parm's cached finite set synchronized with its newly added diff --git a/chapter30/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter30/src/main/java/com/seaofnodes/simple/node/PhiNode.java index f45c7325..af24a94b 100644 --- a/chapter30/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter30/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -122,7 +122,8 @@ public class PhiNode extends Node { // Generic "pull down op" Node progress; - if( same_op() && (progress = drop_same_op()) != null ) + Node op = factoringOp(); + if( same_op(op) && (progress = drop_same_op(op)) != null ) return progress; // If merging Phi(ZERO, guardNZ(N)) at the matching `if(N)` join, the @@ -158,10 +159,28 @@ public class PhiNode extends Node { return tested!=null && (early==null || early.dominates(r,this)) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof EscapeNode || op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -179,7 +198,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -197,21 +217,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp._inputs.add(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Do not introduce an operand Phi mixing incompatible type families. diff --git a/chapter30/src/main/java/com/seaofnodes/simple/node/RegionNode.java b/chapter30/src/main/java/com/seaofnodes/simple/node/RegionNode.java index eee1c150..3ed63862 100644 --- a/chapter30/src/main/java/com/seaofnodes/simple/node/RegionNode.java +++ b/chapter30/src/main/java/com/seaofnodes/simple/node/RegionNode.java @@ -69,7 +69,7 @@ public class RegionNode extends CFGNode { if( use instanceof PhiNode phi ) { PhiNode phi2 = phi.in(i) instanceof PhiNode phi2x && phi2x.region()==region ? phi2x : null; for( int j=1; j<region.nIns(); j++ ) - phi.addDef(phi2==null ? phi.in(i) : phi2.in(j)); + phi.addDef(CodeGen.CODE.add(phi2==null ? phi.in(i) : phi2.in(j))); CodeGen.CODE.add(phi); } } diff --git a/chapter30/src/main/java/com/seaofnodes/simple/node/SummaryNode.java b/chapter30/src/main/java/com/seaofnodes/simple/node/SummaryNode.java index 483aab89..d0da3250 100644 --- a/chapter30/src/main/java/com/seaofnodes/simple/node/SummaryNode.java +++ b/chapter30/src/main/java/com/seaofnodes/simple/node/SummaryNode.java @@ -27,7 +27,7 @@ public class SummaryNode extends CFGNode implements MultiNode { TypeMem mem = in(1)._type instanceof TypeMem m ? m : in(1)._type.isHigh() ? TypeMem.TOP : TypeMem.BOT; mem = (TypeMem)mem.meet(_state.mem()); TypeMem outside = CodeGen.CODE._start.outside(this); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); return TypeTuple.make(_state.ctl(),mem,_state.ret()); } @Override public Node idealize() { return null; } @@ -36,9 +36,16 @@ public class SummaryNode extends CFGNode implements MultiNode { if( dep.addDepForwards(in(0))._type.isHigh() ) return TypeMem.START; TypeMem mem = (TypeMem)_state.mem(); TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,mem._escFs,mem._escAs); } + // A class receiver is supplied by the callee, not exposed by its caller. + // Actual uses which publish self are already represented in _state. + private int firstArgument() { + if( !(in(0) instanceof FunNode fun) ) return 2; + TypeFunPtr sig = fun.sig(); + return sig.nargs()>0 && sig.arg(0)==TypePtr.PTR ? 3 : 2; + } @Override boolean _upgradeType(HashMap<String,Type> types) { TypeTuple state = (TypeTuple)_state.upgradeType(types); if( state==_state ) return false; diff --git a/chapter30/src/main/java/com/seaofnodes/simple/parser/Expressions.java b/chapter30/src/main/java/com/seaofnodes/simple/parser/Expressions.java index 247d974e..e664f16c 100644 --- a/chapter30/src/main/java/com/seaofnodes/simple/parser/Expressions.java +++ b/chapter30/src/main/java/com/seaofnodes/simple/parser/Expressions.java @@ -36,6 +36,9 @@ final class Expressions { { P.pos(old); return parseExpression(); } P.references.checkAssignment(def,site); + // All fields use the same receiver-based lvalue path. + if( P.references.fieldSelf(def)!=null ) + { P.pos(old); return parseExpression(); } return P.references.assign(def,parseAssignment()); } diff --git a/chapter30/src/main/java/com/seaofnodes/simple/parser/Functions.java b/chapter30/src/main/java/com/seaofnodes/simple/parser/Functions.java index 5175acc6..9a7ed396 100644 --- a/chapter30/src/main/java/com/seaofnodes/simple/parser/Functions.java +++ b/chapter30/src/main/java/com/seaofnodes/simple/parser/Functions.java @@ -30,7 +30,7 @@ final class Functions { BitSet finals = new BitSet(); Type self = P.types.implicitSelfType(); ts.push(self); - ids.push(self == TypePtr.PTR ? "#self" : "self"); + ids.push("self"); // Parse other arguments P._lexer.skipWhiteSpace(); @@ -85,6 +85,10 @@ final class Functions { P._lexer.skipWhiteSpace(); Lexer nameLoc=P.loc(); String id = P.requireId(); + // Older free functions may explicitly name a source argument + // "self". It shadows the implicit class receiver, not its ABI slot. + if( id=="self" && ts.at(0)==TypePtr.PTR && ids.at(0)=="self" ) + ids.set(0,"#self"); if( ids.find(id)!=-1 ) throw Parser.error("Duplicate parameter '"+id+"'",nameLoc); ts .push(t ); // Push type/arg pairs ids.push(id); @@ -300,8 +304,16 @@ final class Functions { // All args, "as-if" called externally for( int i = 0; i<ids.length; i++ ) { Type t = sig.arg(i); + // The body sees its owning class receiver. PTR remains in the + // signature as the ABI marker for a receiver with no machine slot. + if( i==0 && t==TypePtr.PTR ) { + TypeStruct clz = ((TypeMemPtr)fun.defaultArg(i))._obj; + // A file can add globals after its struct declaration closes. + // Keep this view open until SCCP installs the completed class. + t = TypeMemPtr.make((byte)2,TypeStruct.make(clz._name,true,clz._fields),true); + } // Args take a default input if called from Start/external-world - Node parm = new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(fun.defaultArg(i)).peephole()).peephole(); + Node parm = new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(i==0 && t instanceof TypeMemPtr ? t : fun.defaultArg(i)).peephole()).peephole(); if( t instanceof TypeMemPtr ptr && ptr._partial ) parm = new ConstructNode(parm).peephole(); P._scope.define(ids[i], t, (i==0 && ids[0]=="self") || (finals!=null && finals.get(i)), parm, loc); } diff --git a/chapter30/src/main/java/com/seaofnodes/simple/parser/References.java b/chapter30/src/main/java/com/seaofnodes/simple/parser/References.java index 6335bad2..134fee90 100644 --- a/chapter30/src/main/java/com/seaofnodes/simple/parser/References.java +++ b/chapter30/src/main/java/com/seaofnodes/simple/parser/References.java @@ -93,23 +93,9 @@ final class References { // Check for a function-escaping variable; these require true // closures. Final constants are OK; final vars require a hidden var // argument; not-final fields can just use an explicit struct arg. - if( kx < fx && !P.structs.inExplicitConstructor() && // Out of scope - !(var._final && rvalue._type.isConstant()) ) { // Not a final constant - if( kx > 0 ) // Global scope is OK, only ever one of these (not one per function invoke) - throw Parser.error("Variable '"+var._name+"' is out of function scope and must be a final constant",site); - - // var.idx==2 is self argument, 3 is args, 4 or more are now static globals - if( var._idx >= 4 ) { - // Read from global scope. - // Surely a nicer way to get the top-level scope compile name? - Var clzptr = P._scope.var( 2 ); - // Get the most recent sharpen global - TypeStruct clz = (TypeStruct) Parser.TYPES.get( ((TypeMemPtr) clzptr.type())._obj._name ); - TypeMemPtr clztmp = TypeMemPtr.make( (byte) 2, clz, true ); - return parseField( P.con( clztmp ), id,pre ); - //return parseField(_scope.in(2),id); - } - } + if( kx>0 && kx<fx && !P.structs.inExplicitConstructor() && + !(var._final && rvalue._type.isConstant()) ) + throw Parser.error("Variable '"+var._name+"' is out of function scope and must be a final constant",site); // Check for assign-update, x += e0; char ch = pre==0 ? P._lexer.matchOperAssign() : (char)pre; @@ -142,19 +128,6 @@ final class References { } Node assign(Var def, Node expr) { - Node self = fieldSelf(def); - if( self!=null ) { - TypeStruct ts = P.types.latestStruct(((TypeMemPtr)self._type)._obj); - Field fld = ts.field(def._name); - Node val = expr.keep(); - Node lift = P.conversions.convertExpr(val,def.type()); - Node mem = P.construction.storeMemory(self).keep(); - Node st = new StoreNode(P.loc(),fld._fname,fld._alias,fld._t,P.ctrl(),mem,self, - ConFldOffNode.make(ts,fld._fname),lift,P.construction.own(self)).peephole(); - P.construction.store(self,fld._alias,st,mem); - mem.unkeep(); - return val.unkeep(); - } String name = def._name; // Lift expression, based on type Type decl = def.type(); // Declared type @@ -303,14 +276,27 @@ final class References { return P._scope.in(P._scope.update(P._scope.var(selfx),null)); } - // Fields are lvalues in memory, including inside their initializer and - // explicit constructor. Scope slots retain declaration metadata only. - private Node fieldSelf(Var var) { - int kx = P._scope.kindx(var), fx = P._scope.enclosingFuncOrDecl(); + // Find the receiver for a field lvalue. Instance initializers use memory; + // class declarations retain their Scope values until initializer exit. + Node fieldSelf(Var var) { + int kx = P._scope.kindx(var); ScopeNode.Kind kind = P._scope._kinds.at(kx); - if( !(kind instanceof Kind.Func inst) || !FunNode.isInstance(inst._name) || var._idx<inst._lexSize+2 ) return null; - if( kx==fx || kx+1==fx ) return defaultSelf(); - return null; + if( !(kind instanceof Kind.Func owner) || !FunNode.isInit(owner._name) || var._idx<owner._lexSize+2 ) return null; + // Class declarations still accumulate their initial values in Scope. + // This also preserves declaration-time struct default expressions. + if( FunNode.isClz(owner._name) && P._scope.enclosingFunction()==kx ) return null; + // Nested functions have their own receiver parameter. Resolve fields + // through it even across intervening function and block scopes. + Node self = defaultSelf(); + Var receiver = P._scope.var(owner._lexSize); + if( self._type instanceof TypeMemPtr ptr && receiver.type() instanceof TypeMemPtr declared && + ptr._obj._name.equals(declared._obj._name) ) return self; + // An instance method can also name fields of its enclosing class. + // Use that declaration's receiver; normal folding handles its identity. + if( !FunNode.isClz(owner._name) ) return null; + // The enclosing declaration may have discovered more fields since + // creating its receiver. View that same receiver with its current type. + return P.peep(new ConvertNode(receiver.type().upgradeType(Parser.TYPES),P._scope.in(receiver))); } private void checkSharedFunction(Var v) { diff --git a/chapter30/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter30/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 43057c00..ed4a54bd 100644 --- a/chapter30/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter30/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/chapter30/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter30/src/test/java/com/seaofnodes/simple/Chapter20Test.java index 273d76ba..226425ca 100644 --- a/chapter30/src/test/java/com/seaofnodes/simple/Chapter20Test.java +++ b/chapter30/src/test/java/com/seaofnodes/simple/Chapter20Test.java @@ -262,8 +262,8 @@ val hashCode = { !String self -> """; // Return the public hashCode wrapper; keep its helper private. testCPU(src,"x86_64_v2", "SystemV",28,null); - testCPU(src,"riscv" , "SystemV",8,null); - testCPU(src,"arm" , "SystemV",6,null); + testCPU(src,"riscv" , "SystemV",11,null); + testCPU(src,"arm" , "SystemV",11,null); } @Test diff --git a/chapter30/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter30/src/test/java/com/seaofnodes/simple/Chapter21Test.java index c6d558eb..9106a212 100644 --- a/chapter30/src/test/java/com/seaofnodes/simple/Chapter21Test.java +++ b/chapter30/src/test/java/com/seaofnodes/simple/Chapter21Test.java @@ -386,8 +386,8 @@ val hashCode = { !String self -> """; // Return the public hashCode wrapper; keep its helper private. testCPU(src,"x86_64_v2", "SystemV",28,null); - testCPU(src,"riscv" , "SystemV",8,null); - testCPU(src,"arm" , "SystemV",6,null); + testCPU(src,"riscv" , "SystemV",11,null); + testCPU(src,"arm" , "SystemV",11,null); } @Test public void testStringExport() throws IOException { @@ -531,7 +531,7 @@ val sieve = { int N -> String sprimes = sb.p("]").toString(); // Compile, link against native C; expect the above string of primes to be printed out by C - TestC.runC(src, "sieve", sprimes,344); + TestC.runC(src, "sieve", sprimes,216); // Evaluate on RISC5 emulator; expect return of an array of primes in // the simulated heap. diff --git a/chapter30/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter30/src/test/java/com/seaofnodes/simple/Chapter22Test.java index 9bebee23..305ebf98 100644 --- a/chapter30/src/test/java/com/seaofnodes/simple/Chapter22Test.java +++ b/chapter30/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/chapter30/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java b/chapter30/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java new file mode 100644 index 00000000..51ed10c6 --- /dev/null +++ b/chapter30/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/chapter30/src/test/java/com/seaofnodes/simple/ReceiverTest.java b/chapter30/src/test/java/com/seaofnodes/simple/ReceiverTest.java new file mode 100644 index 00000000..d50ee28a --- /dev/null +++ b/chapter30/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={int a,int b,int c,int d,int e,int f,int g -> + self.base+a+2*b+3*c+4*d+5*e+6*f+7*g; + }; + val callback_noInline={int n -> self.base+n;}; + { {int -> i64} int -> i64 } invoke="C"; + val viaC={int 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)(int); + __attribute__((CALL_CONV)) long long invoke(action_t action, int n) { return action(n); } + __attribute__((CALL_CONV)) extern long long calc(int,int,int,int,int,int,int); + __attribute__((CALL_CONV)) extern long long viaC(int); + 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); + } +} diff --git a/chapter31/Makefile b/chapter31/Makefile index c9a398e8..6dba57fa 100644 --- a/chapter31/Makefile +++ b/chapter31/Makefile @@ -15,7 +15,9 @@ test_raw_sys := 25 # Convert chapter numbers to test files test_raw0 := $(patsubst %,com.seaofnodes.simple.Chapter%Test,$(test_raw_nums0)) test_raw1 := $(patsubst %,com.seaofnodes.simple.Chapter%Test,$(test_raw_nums1)) -test_sys := $(patsubst %,com.seaofnodes.simple.Chapter%Test,$(test_raw_sys) ) +# TimeTest uses sys and compiles a wide library. Keep it out of the catch-all +# JVM, whose accumulated pooled types can exhaust this snapshot's 16-bit IDs. +test_sys := $(patsubst %,com.seaofnodes.simple.Chapter%Test,$(test_raw_sys) ) com.seaofnodes.simple.TimeTest # All the 'src/test/java' files ending in 'Test' test_cp0 := $(patsubst $(TST)/$(SIMPLE)/%.java,com.seaofnodes.simple.%,$(wildcard $(TST)/$(SIMPLE)/*Test.java)) # Minus raw0, raw1, alone tests diff --git a/chapter31/README.md b/chapter31/README.md index 57f5557c..7a758f77 100644 --- a/chapter31/README.md +++ b/chapter31/README.md @@ -10,6 +10,9 @@ octal parsing, move constant arrays into the ELF constant pool. We then write a few games, with the drawing and game logic written in Simple. +This snapshot retains [chapter 28a's shared class receiver](../chapter28a/README.md#globals-use-the-same-receiver-as-fields) +and chapter 28b's imported-callback handling. + ## Games and demos All graphical demos support resizing. Canvas scales their base layouts and diff --git a/chapter31/docs/31-grammar.md b/chapter31/docs/31-grammar.md index 37300c46..ee8490a5 100644 --- a/chapter31/docs/31-grammar.md +++ b/chapter31/docs/31-grammar.md @@ -68,6 +68,7 @@ constructorParameter : type '^'? bindingModifier? IDENTIFIER ; // A method is an ordinary fixed function binding in a struct definition. // The compiler supplies self; it is not written in parameterList. +// Global functions use their owning class singleton as self. // Function types and expressions both receive their implicit receiver here. methodDeclaration : 'val' bindingModifier? memberName '=' functionExpression ';' ; memberName : IDENTIFIER | primitiveType ; @@ -254,10 +255,10 @@ one-pass IR builder: - A statement beginning with `{` might be a block or a function-type binding. `Declarations` and `Types` use speculative parsing and cursor restore; qualified type lookup also stops before a suffix that belongs to an expression. -- Bare assignment, field assignment, and compound updates share the grammar's - precedence but use different IR paths. `References` decides between an SSA - local, a constructor field's local value, and an actual memory access. A - function-valued field may also supply an implicit receiver to a call. +- Bare fields resolve through their receiver, so reads, assignments, and + updates share the field-access path. Locals use SSA; class declarations + retain Scope values until initializer exit. Global functions receive their + owning class singleton as `self`; instance methods receive their object. - `for` updates are scanned first and parsed after the body, where their effects belong. Explicit constructor bodies are scanned first and parsed after field discovery, so later fields have local slots. Both use `Lexer.skipTo`, which diff --git a/chapter31/src/main/java/com/seaofnodes/simple/node/CallNode.java b/chapter31/src/main/java/com/seaofnodes/simple/node/CallNode.java index 9e9c5224..9030d43d 100644 --- a/chapter31/src/main/java/com/seaofnodes/simple/node/CallNode.java +++ b/chapter31/src/main/java/com/seaofnodes/simple/node/CallNode.java @@ -7,6 +7,7 @@ import com.seaofnodes.simple.parser.Parser; import com.seaofnodes.simple.codegen.CodeGen; import com.seaofnodes.simple.codegen.Iter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypePtr; import com.seaofnodes.simple.type.TypeMemPtr; import com.seaofnodes.simple.type.TypeFunPtr; import com.seaofnodes.simple.type.TypeMem; @@ -95,14 +96,15 @@ public class CallNode extends CFGNode { // A broad scalar target can refine to a function pointer during Iter. // It cannot yet promise that the call exposes nothing. if( _type!=Type.CONTROL ) return TypeMem.BOT; - if( !(fptr()._type instanceof TypeFunPtr) ) + if( !(fptr()._type instanceof TypeFunPtr tfp) ) return fptr()._type.isHigh() ? TypeMem.START : TypeMem.BOT; if( Intrinsic.pure(this) ) return TypeMem.START; if( !external() ) return TypeMem.START; Type input = dep.addDepForwards(mem())._type; TypeMem escaped = input instanceof TypeMem m ? m : input.isHigh() ? TypeMem.TOP : TypeMem.BOT; TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns()-1; i++ ) + // A class receiver belongs to the callee; the caller does not expose its class. + for( int i = tfp.nargs()>0 && tfp.arg(0)==TypePtr.PTR ? 3 : 2; i<nIns()-1; i++ ) escaped = escaped.escapesFrom(dep.addDepForwards(arg(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,escaped._escFs,escaped._escAs); } @@ -180,7 +182,10 @@ public class CallNode extends CFGNode { CodeGen.CODE.add(fun).addDef(this); for( Node use : fun._outputs ) if( use instanceof ParmNode parm ) { - Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() : arg(parm._idx); + // Match the callee's declared receiver view, including forward fields. + Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() + : parm._idx==2 && fun.sig().arg(0)==TypePtr.PTR + ? ConstantNode.seed(parm._declaredType).peephole() : arg(parm._idx); CodeGen.CODE.add(parm).addDef(def); // Linking can happen during post-SCCP inlining. Keep an RPC // Parm's cached finite set synchronized with its newly added diff --git a/chapter31/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter31/src/main/java/com/seaofnodes/simple/node/PhiNode.java index f45c7325..af24a94b 100644 --- a/chapter31/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter31/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -122,7 +122,8 @@ public class PhiNode extends Node { // Generic "pull down op" Node progress; - if( same_op() && (progress = drop_same_op()) != null ) + Node op = factoringOp(); + if( same_op(op) && (progress = drop_same_op(op)) != null ) return progress; // If merging Phi(ZERO, guardNZ(N)) at the matching `if(N)` join, the @@ -158,10 +159,28 @@ public class PhiNode extends Node { return tested!=null && (early==null || early.dominates(r,this)) ? n : null; } + // View x<<1 as x+x only while matching mixed Phi arms. Do not + // expand the graph into Adds that would immediately strength-reduce again. + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return in(i); + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && + addDep(n.in(2))._type instanceof TypeInteger con && con.isConstant() && con.value()==1; + } + + private static Node factoringInput(Node op, Node n, int j) { + return op instanceof AddNode && !(n instanceof AddNode) ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof EscapeNode || op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -179,7 +198,8 @@ public class PhiNode extends Node { for( int i=1; i<nIns(); i++ ) { Node n = in(i); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !((op.getClass()==n.getClass() && op.eq(n)) || (op instanceof AddNode add && add._mode==1 && doubled(n))) || + n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -197,21 +217,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp._inputs.add(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Do not introduce an operand Phi mixing incompatible type families. diff --git a/chapter31/src/main/java/com/seaofnodes/simple/node/RegionNode.java b/chapter31/src/main/java/com/seaofnodes/simple/node/RegionNode.java index eee1c150..3ed63862 100644 --- a/chapter31/src/main/java/com/seaofnodes/simple/node/RegionNode.java +++ b/chapter31/src/main/java/com/seaofnodes/simple/node/RegionNode.java @@ -69,7 +69,7 @@ public class RegionNode extends CFGNode { if( use instanceof PhiNode phi ) { PhiNode phi2 = phi.in(i) instanceof PhiNode phi2x && phi2x.region()==region ? phi2x : null; for( int j=1; j<region.nIns(); j++ ) - phi.addDef(phi2==null ? phi.in(i) : phi2.in(j)); + phi.addDef(CodeGen.CODE.add(phi2==null ? phi.in(i) : phi2.in(j))); CodeGen.CODE.add(phi); } } diff --git a/chapter31/src/main/java/com/seaofnodes/simple/node/SummaryNode.java b/chapter31/src/main/java/com/seaofnodes/simple/node/SummaryNode.java index 483aab89..d0da3250 100644 --- a/chapter31/src/main/java/com/seaofnodes/simple/node/SummaryNode.java +++ b/chapter31/src/main/java/com/seaofnodes/simple/node/SummaryNode.java @@ -27,7 +27,7 @@ public class SummaryNode extends CFGNode implements MultiNode { TypeMem mem = in(1)._type instanceof TypeMem m ? m : in(1)._type.isHigh() ? TypeMem.TOP : TypeMem.BOT; mem = (TypeMem)mem.meet(_state.mem()); TypeMem outside = CodeGen.CODE._start.outside(this); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(in(i)._type,outside); return TypeTuple.make(_state.ctl(),mem,_state.ret()); } @Override public Node idealize() { return null; } @@ -36,9 +36,16 @@ public class SummaryNode extends CFGNode implements MultiNode { if( dep.addDepForwards(in(0))._type.isHigh() ) return TypeMem.START; TypeMem mem = (TypeMem)_state.mem(); TypeMem outside = CodeGen.CODE._start.outside(dep); - for( int i = 2; i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); + for( int i = firstArgument(); i<nIns(); i++ ) mem = mem.escapesFrom(dep.addDepForwards(in(i))._type,outside); return TypeMem.make(1,Type.BOTTOM,false,false,false,mem._escFs,mem._escAs); } + // A class receiver is supplied by the callee, not exposed by its caller. + // Actual uses which publish self are already represented in _state. + private int firstArgument() { + if( !(in(0) instanceof FunNode fun) ) return 2; + TypeFunPtr sig = fun.sig(); + return sig.nargs()>0 && sig.arg(0)==TypePtr.PTR ? 3 : 2; + } @Override boolean _upgradeType(HashMap<String,Type> types) { TypeTuple state = (TypeTuple)_state.upgradeType(types); if( state==_state ) return false; diff --git a/chapter31/src/main/java/com/seaofnodes/simple/parser/Expressions.java b/chapter31/src/main/java/com/seaofnodes/simple/parser/Expressions.java index ffc96f57..f791a34c 100644 --- a/chapter31/src/main/java/com/seaofnodes/simple/parser/Expressions.java +++ b/chapter31/src/main/java/com/seaofnodes/simple/parser/Expressions.java @@ -36,6 +36,9 @@ final class Expressions { { P.pos(old); return parseExpression(); } P.references.checkAssignment(def,site); + // All fields use the same receiver-based lvalue path. + if( P.references.fieldSelf(def)!=null ) + { P.pos(old); return parseExpression(); } return P.references.assign(def,parseAssignment()); } diff --git a/chapter31/src/main/java/com/seaofnodes/simple/parser/Functions.java b/chapter31/src/main/java/com/seaofnodes/simple/parser/Functions.java index 84bd509e..a7726521 100644 --- a/chapter31/src/main/java/com/seaofnodes/simple/parser/Functions.java +++ b/chapter31/src/main/java/com/seaofnodes/simple/parser/Functions.java @@ -36,7 +36,7 @@ final class Functions { Type self = P.types.implicitSelfType(); if( P.structs.inStructDeclaration() ) self = self.makeRO(); ts.push(self); - ids.push(self == TypePtr.PTR ? "#self" : "self"); + ids.push("self"); // Parse other arguments P._lexer.skipWhiteSpace(); @@ -130,6 +130,10 @@ final class Functions { P._lexer.skipWhiteSpace(); Lexer nameLoc=P.loc(); String id = P.requireId(); + // Older free functions may explicitly name a source argument + // "self". It shadows the implicit class receiver, not its ABI slot. + if( id=="self" && ts.at(0)==TypePtr.PTR && ids.at(0)=="self" ) + ids.set(0,"#self"); if( ids.find(id)!=-1 ) throw Parser.error("Duplicate parameter '"+id+"'",nameLoc); ts .push(t ); // Push type/arg pairs ids.push(id); @@ -359,6 +363,14 @@ final class Functions { if( i == 0 && ids[0].equals("self") && !FunNode.isInit(funName) && !(sig.ret() instanceof TypeMem) && t instanceof TypeMemPtr ptr ) t = ptr.withAccess(false); + // The body sees its owning class receiver. PTR remains in the + // signature as the ABI marker for a receiver with no machine slot. + if( i==0 && t==TypePtr.PTR ) { + TypeStruct clz = ((TypeMemPtr)fun.defaultArg(i))._obj; + // A file can add globals after its struct declaration closes. + // Keep this view open until SCCP installs the completed class. + t = TypeMemPtr.make((byte)2,TypeStruct.make(clz._name,true,clz._fields),true); + } // Args take a default input if called from Start/external-world Type seed = i == 0 && t instanceof TypeMemPtr ? t : fun.defaultArg(i); Node parm = new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(seed).peephole()).peephole(); diff --git a/chapter31/src/main/java/com/seaofnodes/simple/parser/References.java b/chapter31/src/main/java/com/seaofnodes/simple/parser/References.java index 7724103e..91cf6859 100644 --- a/chapter31/src/main/java/com/seaofnodes/simple/parser/References.java +++ b/chapter31/src/main/java/com/seaofnodes/simple/parser/References.java @@ -93,23 +93,9 @@ final class References { // Check for a function-escaping variable; these require true // closures. Final constants are OK; final vars require a hidden var // argument; not-final fields can just use an explicit struct arg. - if( kx < fx && !P.structs.inExplicitConstructor() && // Out of scope - !(var._final && rvalue._type.isConstant()) ) { // Not a final constant - if( kx > 0 ) // Global scope is OK, only ever one of these (not one per function invoke) - throw Parser.error("Variable '"+var._name+"' is out of function scope and must be a final constant",site); - - // var.idx==2 is self argument, 3 is args, 4 or more are now static globals - if( var._idx >= 4 ) { - // Read from global scope. - // Surely a nicer way to get the top-level scope compile name? - Var clzptr = P._scope.var( 2 ); - // Get the most recent sharpen global - TypeStruct clz = (TypeStruct) Parser.TYPES.get( ((TypeMemPtr) clzptr.type())._obj._name ); - TypeMemPtr clztmp = TypeMemPtr.make( (byte) 2, clz, true ); - return parseField( P.con( clztmp ), id,pre ); - //return parseField(_scope.in(2),id); - } - } + if( kx>0 && kx<fx && !P.structs.inExplicitConstructor() && + !(var._final && rvalue._type.isConstant()) ) + throw Parser.error("Variable '"+var._name+"' is out of function scope and must be a final constant",site); // Check for assign-update, x += e0; char ch = pre==0 ? P._lexer.matchOperAssign() : (char)pre; @@ -144,19 +130,6 @@ final class References { } Node assign(Var def, Node expr) { - Node self = fieldSelf(def); - if( self!=null ) { - TypeStruct ts = P.types.latestStruct(((TypeMemPtr)self._type)._obj); - Field fld = ts.field(def._name); - Node val = expr.keep(); - Node lift = P.conversions.convertExpr(val,def.type()); - Node mem = P.construction.storeMemory(self).keep(); - Node st = new StoreNode(P.loc(),fld._fname,fld._alias,fld._t,P.ctrl(),mem,self, - ConFldOffNode.make(ts,fld._fname),lift,P.construction.own(self)).peephole(); - P.construction.store(self,fld._alias,st,mem); - mem.unkeep(); - return val.unkeep(); - } String name = def._name; // Lift expression, based on type Type decl = def.type(); // Declared type @@ -305,19 +278,27 @@ final class References { return P._scope.in(P._scope.update(P._scope.var(selfx),null)); } - // Fields are lvalues in memory, including inside their initializer and - // explicit constructor. Scope slots retain declaration metadata only. - private Node fieldSelf(Var var) { + // Find the receiver for a field lvalue. Instance initializers use memory; + // class declarations retain their Scope values until initializer exit. + Node fieldSelf(Var var) { int kx = P._scope.kindx(var); ScopeNode.Kind kind = P._scope._kinds.at(kx); - if( !(kind instanceof Kind.Func inst) || !FunNode.isInstance(inst._name) || var._idx<inst._lexSize+2 ) return null; + if( !(kind instanceof Kind.Func owner) || !FunNode.isInit(owner._name) || var._idx<owner._lexSize+2 ) return null; + // Class declarations still accumulate their initial values in Scope. + // This also preserves declaration-time struct default expressions. + if( FunNode.isClz(owner._name) && P._scope.enclosingFunction()==kx ) return null; // Nested functions have their own receiver parameter. Resolve fields // through it even across intervening function and block scopes. Node self = defaultSelf(); - Type owner = P._scope.var(inst._lexSize).type(); - if( self._type instanceof TypeMemPtr ptr && owner instanceof TypeMemPtr declared && + Var receiver = P._scope.var(owner._lexSize); + if( self._type instanceof TypeMemPtr ptr && receiver.type() instanceof TypeMemPtr declared && ptr._obj._name.equals(declared._obj._name) ) return self; - return null; + // An instance method can also name fields of its enclosing class. + // Use that declaration's receiver; normal folding handles its identity. + if( !FunNode.isClz(owner._name) ) return null; + // The enclosing declaration may have discovered more fields since + // creating its receiver. View that same receiver with its current type. + return P.peep(new ConvertNode(receiver.type().upgradeType(Parser.TYPES),P._scope.in(receiver))); } private void checkSharedFunction(Var v) { diff --git a/chapter31/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter31/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 43057c00..ed4a54bd 100644 --- a/chapter31/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter31/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/chapter31/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter31/src/test/java/com/seaofnodes/simple/Chapter20Test.java index 273d76ba..226425ca 100644 --- a/chapter31/src/test/java/com/seaofnodes/simple/Chapter20Test.java +++ b/chapter31/src/test/java/com/seaofnodes/simple/Chapter20Test.java @@ -262,8 +262,8 @@ val hashCode = { !String self -> """; // Return the public hashCode wrapper; keep its helper private. testCPU(src,"x86_64_v2", "SystemV",28,null); - testCPU(src,"riscv" , "SystemV",8,null); - testCPU(src,"arm" , "SystemV",6,null); + testCPU(src,"riscv" , "SystemV",11,null); + testCPU(src,"arm" , "SystemV",11,null); } @Test diff --git a/chapter31/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter31/src/test/java/com/seaofnodes/simple/Chapter21Test.java index 347f2ce4..bd2a453a 100644 --- a/chapter31/src/test/java/com/seaofnodes/simple/Chapter21Test.java +++ b/chapter31/src/test/java/com/seaofnodes/simple/Chapter21Test.java @@ -386,8 +386,8 @@ val hashCode = { !String self -> """; // Return the public hashCode wrapper; keep its helper private. testCPU(src,"x86_64_v2", "SystemV",28,null); - testCPU(src,"riscv" , "SystemV",8,null); - testCPU(src,"arm" , "SystemV",6,null); + testCPU(src,"riscv" , "SystemV",11,null); + testCPU(src,"arm" , "SystemV",11,null); } @Test public void testStringExport() throws IOException { diff --git a/chapter31/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter31/src/test/java/com/seaofnodes/simple/Chapter22Test.java index c9791de4..f9146ae6 100644 --- a/chapter31/src/test/java/com/seaofnodes/simple/Chapter22Test.java +++ b/chapter31/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/chapter31/src/test/java/com/seaofnodes/simple/Chapter23Test.java b/chapter31/src/test/java/com/seaofnodes/simple/Chapter23Test.java index 8667c0bd..f1ad4898 100644 --- a/chapter31/src/test/java/com/seaofnodes/simple/Chapter23Test.java +++ b/chapter31/src/test/java/com/seaofnodes/simple/Chapter23Test.java @@ -279,7 +279,7 @@ return _s.peek('q'); CodeGen code = new CodeGen(src).driver(CodeGen.Phase.TypeCheck); assertEquals("return Phi(Region,0,1);", code.print()); assertEquals("1", Eval2.eval(code, 0)); - testCPU(src,"x86_64_v2", "win64",23,null); + testCPU(src,"x86_64_v2", "win64",31,null); }; @Test diff --git a/chapter31/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java b/chapter31/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java new file mode 100644 index 00000000..51ed10c6 --- /dev/null +++ b/chapter31/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/chapter31/src/test/java/com/seaofnodes/simple/ReceiverTest.java b/chapter31/src/test/java/com/seaofnodes/simple/ReceiverTest.java new file mode 100644 index 00000000..83bf6768 --- /dev/null +++ b/chapter31/src/test/java/com/seaofnodes/simple/ReceiverTest.java @@ -0,0 +1,93 @@ +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; }; + }; + val table=new u16[~2]{7,9}; + val lookup={u8 c -> c<2 ? table[c] : 0;}; + val main={ -> + total=1; + 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={int a,int b,int c,int d,int e,int f,int g -> + self.base+a+2*b+3*c+4*d+5*e+6*f+7*g; + }; + val callback_noInline={int n -> self.base+n;}; + { {int -> i64} int -> i64 } invoke="C"; + val viaC={int 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)(int); + __attribute__((CALL_CONV)) long long invoke(action_t action, int n) { return action(n); } + __attribute__((CALL_CONV)) extern long long calc(int,int,int,int,int,int,int); + __attribute__((CALL_CONV)) extern long long viaC(int); + 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); + } +} diff --git a/chapter32/README.md b/chapter32/README.md index f06b404f..7a814966 100644 --- a/chapter32/README.md +++ b/chapter32/README.md @@ -460,6 +460,109 @@ must be rebuilt; an old header produces an explicit rebuild error. For an existing chapter32 build, `make clean` followed by `make -j 8 release` rebuilds the generated artifacts. Rebuild any separately maintained Simple libraries too. +## Receiver backport and spill investigation + +The shared class receiver is taught in +[chapter 28a](../chapter28a/README.md#globals-use-the-same-receiver-as-fields), +with imported summaries in [chapter 28b](../chapter28b/README.md). +Those fixes are carried through the later snapshots. Phi factoring after +strength reduction starts in +[chapter 5](../chapter05/README.md#factoring-after-strength-reduction), using +multiply-by-two there and shift-by-one where that representation is introduced. + +The receiver investigation also exposed a missed notification in +[RegionNode](src/main/java/com/seaofnodes/simple/node/RegionNode.java): flattening +regions adds Phi inputs, so their definitions must be queued too. A newly added +precise memory user can require its bulk-memory input to split immediately. +That prerequisite accompanies the receiver backport. + +The following measurements describe the chapter32 investigation before backporting. + +Validation: all 817 test executions pass on Windows with log8 verification and +Linux with the default log10. A focused 62-test run passes with log1, checking +every progress step. Native callbacks, imported receivers, FileIO, and ARM/RISC-V +execution remain covered. + +There is a compilation/code-size cost to review. The following Windows comparison +uses the preceding uncommitted assignment fix as its baseline, assertions enabled, +two JVM processors, seed 456, and each compiler's freshly built libraries. Times +are medians of four warm rounds after discarding the first round; this is a small +local sample, not a timing guarantee. Sys sizes sum its 22 object files. + +| Compile | Time, ms (before → after) | Peepholes (before → after) | `.text` bytes (before → after) | +| --- | ---: | ---: | ---: | +| sys | 961 → 977 | 185,960 → 208,552 | 37,725 → 40,355 | +| Clock | 256 → 381 | 86,873 → 106,615 | 6,717 → 7,053 | +| Breakout | 553 → 593 | 158,712 → 174,500 | 14,868 → 15,031 | +| TicTacToe | 161 → 177 | 56,222 → 63,774 | 4,251 → 4,411 | + +The small String and HelloWorld examples also retain additional initialization +checks, and their spill expectations have been updated. The receiver-only change +exposed an existing ordering sensitivity in Sieve: across seeds 120–127, both +compilers produced seven 28-split/343-weight results and one 26-split/215-weight +result, with the smaller result moving from seed 126 to 121. + +The spill investigation separates compile time from generated moves: Clock's +weighted split score improves from 785 to 762. These scores count all retained +SplitNodes, including register copies, with weight `8^loopDepth`; they are not +counts of stack spills. Sieve's 215-to-343 change is two extra register copies +inside its depth-two loop. Early `p+p` strength reduction in +[AddNode](src/main/java/com/seaofnodes/simple/node/AddNode.java) turns the entry +value into `p<<1` before [PhiNode](src/main/java/com/seaofnodes/simple/node/PhiNode.java) +can factor `Phi(p+p,i+p)` into `Phi(p,i)+p`. + +Phi factoring now views `x<<1` as `x+x` when matching mixed Add/Shl arms. It uses +the existing factoring checks and trial graph, without expanding a shift into +an Add that would immediately strength-reduce again. Pure shift arms retain +ordinary shift factoring. Multiply-by-two already reduces to this shift, so it +is covered too. This is a local canonicalization: peeling one `x` from `k*x` for +arbitrary k would require a new `(k-1)*x` expression, with less clear cost and +rewrite-order benefits. The implementation stops at doubling. + +All eight Sieve seeds now produce 26 splits and score 215, with every-step +verification; the spill expectation is 215. Direct graph tests check factoring +before and after strength reduction, either arm order, and rejection of a +different shift count. The 819-test Windows sweep passes with log8 verification +(the Sieve group rerun after updating its expectation), and 64 focused tests +pass with log1. Native and emulator Sieve results are checked too. + +The largest individual sys increase in the receiver-only comparison was +`Canvas._circle`, from 455 to 517. +Allocation keeps the loop-invariant boolean in a general register and the pixel +pointer in an XMM register; recovering the pointer adds a transfer at each pixel +store. The baseline makes the opposite choice. Both ranges receive the default +score 1000 in [IFG.pickRiskyScore](src/main/java/com/seaofnodes/simple/codegen/IFG.java), +leaving their selection sensitive to ordering. An isolated trial giving SetX86 +candidates one extra priority point brings `_circle` to 454 and total sys to +8869, versus baseline 8719 and current 8932. Other sys functions' weighted scores +are unchanged by that trial. This identifies an allocator sensitivity; the +opcode-specific preference is diagnostic, not an adopted heuristic. + +With Phi factoring fixed, sys's weighted score is 8850 and `_circle` returns to +455 through another ordering change. Clock stays at 762, Breakout changes from +3387 to 3393, and TicTacToe stays at 1468. A bounded allocator follow-up tried +three cheap refinements of the default score: breaking ties toward fewer excess +neighbors (degree minus available colors), toward more excess neighbors, and a +bonus for cheap single-def/single-use splits based on loop depth. Sys scored +9039, 8844, and 8850 respectively; the three games were unchanged. The tiny +six-point gain does not justify adopting the degree tie-break on this evidence. +The production allocator remains unchanged; no additional graph walks or +searches were added. + +Backporting retains each chapter's allocator. Code-quality expectations are +therefore checked locally: chapter21's RISC-V Sieve score changes from 92 to +164, despite the chapter32 improvement above, and chapter31's forward-field +scanner test changes from 23 to 31 on x86-64/Win64. Execution checks remain in +place; these earlier snapshots do not inherit the later allocator experiments. +Chapter31 also groups `TimeTest` with its sys tests: its wide-library compile +passes in a fresh JVM, but following the large catch-all suite exhausted that +snapshot's existing 16-bit type IDs. This keeps the checks and the older type +implementation intact; it does not remove the compiler's type-ID limit. + +The saved baseline, comparison drivers, measurements, and verification logs are +under `build/receiver-profile/`. Proving initialization checks redundant is the +main follow-up suggested by these measurements. + ## Build and test From `chapter32`, using the existing offline dependency caches: diff --git a/chapter32/docs/32-grammar.md b/chapter32/docs/32-grammar.md index 2628f566..4a794341 100644 --- a/chapter32/docs/32-grammar.md +++ b/chapter32/docs/32-grammar.md @@ -69,6 +69,7 @@ constructorParameter : type '^'? bindingModifier? IDENTIFIER ; // A method is an ordinary fixed function binding in a struct definition. // The compiler supplies self; it is not written in parameterList. // Function types and expressions both receive their implicit receiver here. +// Global functions use their owning class singleton as self. methodDeclaration : 'val' bindingModifier? memberName '=' functionExpression ';' ; memberName : IDENTIFIER | primitiveType ; @@ -254,10 +255,11 @@ one-pass IR builder: - A statement beginning with `{` might be a block or a function-type binding. `Declarations` and `Types` use speculative parsing and cursor restore; qualified type lookup also stops before a suffix that belongs to an expression. -- Bare assignment, field assignment, and compound updates share the grammar's - precedence but use different IR paths. `References` decides between an SSA - local, a constructor field's local value, and an actual memory access. A - function-valued field may also supply an implicit receiver to a call. +- `References` resolves bare fields through their receiver, so assignments, + reads, and updates share the field-access path. Locals use SSA; class + initializer declarations retain their Scope values until initializer exit. + Global functions receive their owning class singleton as `self`, including + when invoked through a callback. Instance methods receive their object. - `for` updates are scanned first and parsed after the body, where their effects belong. Explicit constructor bodies are scanned first and parsed after field discovery, so later fields have local slots. Both use `Lexer.skipTo`, which diff --git a/chapter32/src/main/java/com/seaofnodes/simple/node/CallNode.java b/chapter32/src/main/java/com/seaofnodes/simple/node/CallNode.java index 3b2dc75b..5506621b 100644 --- a/chapter32/src/main/java/com/seaofnodes/simple/node/CallNode.java +++ b/chapter32/src/main/java/com/seaofnodes/simple/node/CallNode.java @@ -7,6 +7,7 @@ import com.seaofnodes.simple.parser.Parser; import com.seaofnodes.simple.codegen.CodeGen; import com.seaofnodes.simple.codegen.Iter; import com.seaofnodes.simple.type.Type; +import com.seaofnodes.simple.type.TypePtr; import com.seaofnodes.simple.type.TypeMemPtr; import com.seaofnodes.simple.type.TypeFunPtr; import com.seaofnodes.simple.type.TypeMem; @@ -95,13 +96,15 @@ public class CallNode extends CFGNode { // A broad scalar target can refine to a function pointer during Iter. // It cannot yet promise that the call exposes nothing. if( _type!=Type.CONTROL ) return TypeMem.BOT; - if( !(fptr()._type instanceof TypeFunPtr) ) + if( !(fptr()._type instanceof TypeFunPtr tfp) ) return fptr()._type.isHigh() ? TypeMem.START : TypeMem.BOT; if( Intrinsic.pure(this) ) return TypeMem.START; if( !external() ) return TypeMem.START; Type input = dep.addDepForwards(mem())._type; TypeMem escaped = input instanceof TypeMem m ? m : input.isHigh() ? TypeMem.TOP : TypeMem.BOT; - for( int i = 2; i<nIns()-1; i++ ) { + // The class-receiver slot is absent from the ABI. The callee supplies + // its own singleton, so passing a callback does not expose our class. + for( int i = tfp.nargs()>0 && tfp.arg(0)==TypePtr.PTR ? 3 : 2; i<nIns()-1; i++ ) { Type arg = dep.addDepForwards(arg(i))._type; TypeMem outside = TypeMem.opaque(arg) ? CodeGen.CODE._start.outside(dep) : TypeMem.BOT; escaped = escaped.escapesFrom(arg,outside); @@ -182,7 +185,13 @@ public class CallNode extends CFGNode { CodeGen.CODE.add(fun).addDef(this); for( Node use : fun._outputs ) if( use instanceof ParmNode parm ) { - Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() : arg(parm._idx); + // A class function's receiver belongs to the callee, even + // when a different class or an instance forwards its callback. + // Match its declared view: before SCCP, forward fields can + // still differ from the completed class layout. + Node def = parm._idx==0 ? ConstantNode.seed(cend()._rpc).peephole() + : parm._idx==2 && fun.sig().arg(0)==TypePtr.PTR + ? ConstantNode.seed(parm._declaredType).peephole() : arg(parm._idx); CodeGen.CODE.add(parm).addDef(def); // Linking can happen during post-SCCP inlining. Keep an RPC // Parm's cached finite set synchronized with its newly added diff --git a/chapter32/src/main/java/com/seaofnodes/simple/node/PhiNode.java b/chapter32/src/main/java/com/seaofnodes/simple/node/PhiNode.java index 7544962f..94376086 100644 --- a/chapter32/src/main/java/com/seaofnodes/simple/node/PhiNode.java +++ b/chapter32/src/main/java/com/seaofnodes/simple/node/PhiNode.java @@ -122,7 +122,8 @@ public class PhiNode extends Node { // Generic "pull down op" Node progress; - if( same_op() && (progress = drop_same_op()) != null ) + Node op = factoringOp(); + if( same_op(op) && (progress = drop_same_op(op)) != null ) return progress; // If merging Phi(ZERO, guardNZ(N)) at the matching `if(N)` join, the @@ -161,10 +162,28 @@ public class PhiNode extends Node { return tested!=null && (early==null || early.dominates(r,this)) ? n : null; } + // View x<<1 as x+x when factoring mixed Add/Shl arms. Do not expand the + // graph: Add would immediately strength-reduce it again. If all arms are + // shifts, keep the ordinary shift factoring (including arbitrary counts). + private Node factoringOp() { + Node op = in(1); + if( doubled(op) ) + for( int i=2; i<nIns(); i++ ) + if( in(i) instanceof AddNode add && add._mode==1 ) return add; + return op; + } + + private boolean doubled(Node n) { + return n instanceof ShlNode && addDep(n.in(2))._type==TypeInteger.TRUE; + } + + private static Node factoringInput(Node op, Node n, int j) { + return n instanceof ShlNode && op instanceof AddNode ? n.in(1) : n.in(j); + } + // Same op on all Phi paths; all ops have only the Phi as a use. // None have a control input. - private boolean same_op() { - Node op = in(1); + private boolean same_op(Node op) { if( op instanceof EscapeNode || op instanceof CFGNode || op instanceof ConstantNode || op instanceof PhiNode || op instanceof ProjNode || op instanceof NewNode || op instanceof ScopeNode || op instanceof MemMergeNode ) return false; // A bulk Phi must split its aliases before factoring precise Stores. @@ -181,8 +200,10 @@ public class PhiNode extends Node { Node busy = null; for( int i=1; i<nIns(); i++ ) { Node n = in(i); + boolean same = op.getClass()==n.getClass() && op.eq(n); + if( !same && op instanceof AddNode add && add._mode==1 ) same = doubled(n); if( addDep(region().in(i))._type==Type.XCONTROL || - op.getClass()!=n.getClass() || n.nIns()!=op.nIns() || n.in(0)!=null || !op.eq(n) ) return false; + !same || n.nIns()!=op.nIns() || n.in(0)!=null ) return false; if( n instanceof MemOpNode mem && !mem.canDrop((MemOpNode)op,this) ) return false; // Moving a Store must remove the old effect, not duplicate it. // Allow one shared arm: the other arms disappear into the single @@ -200,21 +221,21 @@ public class PhiNode extends Node { return true; } - private Node drop_same_op() { - Node op = in(1), cp = op.copyEmpty(); + private Node drop_same_op(Node op) { + Node cp = op.copyEmpty(); cp._type = null; cp._inputs.add(null); for( int j=1; j<op.nIns(); j++ ) { - Node x = op.in(j); + Node x = factoringInput(op,in(1),j); boolean different = false; for( int i=2; i<nIns(); i++ ) - if( in(i).in(j)!=x ) different=true; + if( factoringInput(op,in(i),j)!=x ) different=true; if( different ) { Node[] ins = new Node[nIns()]; ins[0] = region(); Type t = Type.TOP; for( int i=1; i<nIns(); i++ ) { - ins[i] = in(i).in(j); + ins[i] = factoringInput(op,in(i),j); t = t.meet(ins[i]._type); } // Do not introduce an operand Phi mixing incompatible type families. diff --git a/chapter32/src/main/java/com/seaofnodes/simple/node/RegionNode.java b/chapter32/src/main/java/com/seaofnodes/simple/node/RegionNode.java index ca358b5a..17126f27 100644 --- a/chapter32/src/main/java/com/seaofnodes/simple/node/RegionNode.java +++ b/chapter32/src/main/java/com/seaofnodes/simple/node/RegionNode.java @@ -68,8 +68,9 @@ public class RegionNode extends CFGNode { for( Node use : _outputs ) { if( use instanceof PhiNode phi ) { PhiNode phi2 = phi.in(i) instanceof PhiNode phi2x && phi2x.region()==region ? phi2x : null; + // New users can require a bulk-memory input to split. for( int j=1; j<region.nIns(); j++ ) - phi.addDef(phi2==null ? phi.in(i) : phi2.in(j)); + phi.addDef(CodeGen.CODE.add(phi2==null ? phi.in(i) : phi2.in(j))); CodeGen.CODE.add(phi); } } diff --git a/chapter32/src/main/java/com/seaofnodes/simple/node/SummaryNode.java b/chapter32/src/main/java/com/seaofnodes/simple/node/SummaryNode.java index f73ba611..5b945457 100644 --- a/chapter32/src/main/java/com/seaofnodes/simple/node/SummaryNode.java +++ b/chapter32/src/main/java/com/seaofnodes/simple/node/SummaryNode.java @@ -26,7 +26,7 @@ public class SummaryNode extends CFGNode implements MultiNode { // A library summary does not forget escapes already present in the caller. TypeMem mem = in(1)._type instanceof TypeMem m ? m : in(1)._type.isHigh() ? TypeMem.TOP : TypeMem.BOT; mem = (TypeMem)mem.meet(_state.mem()); - for( int i = 2; i<nIns(); i++ ) { + for( int i = firstArgument(); i<nIns(); i++ ) { Type arg = in(i)._type; // Only opaque arguments can hide identities supplied by outside code. TypeMem outside = TypeMem.opaque(arg) ? CodeGen.CODE._start.outside(this) : TypeMem.BOT; @@ -39,13 +39,20 @@ public class SummaryNode extends CFGNode implements MultiNode { dep.addDepForwards(this); if( dep.addDepForwards(in(0))._type.isHigh() ) return TypeMem.START; TypeMem mem = (TypeMem)_state.mem(); - for( int i = 2; i<nIns(); i++ ) { + for( int i = firstArgument(); i<nIns(); i++ ) { Type arg = dep.addDepForwards(in(i))._type; TypeMem outside = TypeMem.opaque(arg) ? CodeGen.CODE._start.outside(dep) : TypeMem.BOT; mem = mem.escapesFrom(arg,outside); } return TypeMem.make(1,Type.BOTTOM,false,false,false,mem._escFs,mem._escAs); } + // A class receiver is supplied by the callee, not exposed by its caller. + // Actual uses which publish self are already represented in _state. + private int firstArgument() { + if( !(in(0) instanceof FunNode fun) ) return 2; + TypeFunPtr sig = fun.sig(); + return sig.nargs()>0 && sig.arg(0)==TypePtr.PTR ? 3 : 2; + } @Override boolean _upgradeType(HashMap<String,Type> types) { TypeTuple state = (TypeTuple)_state.upgradeType(types); if( state==_state ) return false; diff --git a/chapter32/src/main/java/com/seaofnodes/simple/parser/Expressions.java b/chapter32/src/main/java/com/seaofnodes/simple/parser/Expressions.java index ffc96f57..f791a34c 100644 --- a/chapter32/src/main/java/com/seaofnodes/simple/parser/Expressions.java +++ b/chapter32/src/main/java/com/seaofnodes/simple/parser/Expressions.java @@ -36,6 +36,9 @@ final class Expressions { { P.pos(old); return parseExpression(); } P.references.checkAssignment(def,site); + // All fields use the same receiver-based lvalue path. + if( P.references.fieldSelf(def)!=null ) + { P.pos(old); return parseExpression(); } return P.references.assign(def,parseAssignment()); } diff --git a/chapter32/src/main/java/com/seaofnodes/simple/parser/Functions.java b/chapter32/src/main/java/com/seaofnodes/simple/parser/Functions.java index 84bd509e..a7726521 100644 --- a/chapter32/src/main/java/com/seaofnodes/simple/parser/Functions.java +++ b/chapter32/src/main/java/com/seaofnodes/simple/parser/Functions.java @@ -36,7 +36,7 @@ final class Functions { Type self = P.types.implicitSelfType(); if( P.structs.inStructDeclaration() ) self = self.makeRO(); ts.push(self); - ids.push(self == TypePtr.PTR ? "#self" : "self"); + ids.push("self"); // Parse other arguments P._lexer.skipWhiteSpace(); @@ -130,6 +130,10 @@ final class Functions { P._lexer.skipWhiteSpace(); Lexer nameLoc=P.loc(); String id = P.requireId(); + // Older free functions may explicitly name a source argument + // "self". It shadows the implicit class receiver, not its ABI slot. + if( id=="self" && ts.at(0)==TypePtr.PTR && ids.at(0)=="self" ) + ids.set(0,"#self"); if( ids.find(id)!=-1 ) throw Parser.error("Duplicate parameter '"+id+"'",nameLoc); ts .push(t ); // Push type/arg pairs ids.push(id); @@ -359,6 +363,14 @@ final class Functions { if( i == 0 && ids[0].equals("self") && !FunNode.isInit(funName) && !(sig.ret() instanceof TypeMem) && t instanceof TypeMemPtr ptr ) t = ptr.withAccess(false); + // The body sees its owning class receiver. PTR remains in the + // signature as the ABI marker for a receiver with no machine slot. + if( i==0 && t==TypePtr.PTR ) { + TypeStruct clz = ((TypeMemPtr)fun.defaultArg(i))._obj; + // A file can add globals after its struct declaration closes. + // Keep this view open until SCCP installs the completed class. + t = TypeMemPtr.make((byte)2,TypeStruct.make(clz._name,true,clz._fields),true); + } // Args take a default input if called from Start/external-world Type seed = i == 0 && t instanceof TypeMemPtr ? t : fun.defaultArg(i); Node parm = new ParmNode(ids[i],i+2,t,fun,ConstantNode.seed(seed).peephole()).peephole(); diff --git a/chapter32/src/main/java/com/seaofnodes/simple/parser/References.java b/chapter32/src/main/java/com/seaofnodes/simple/parser/References.java index 7724103e..91cf6859 100644 --- a/chapter32/src/main/java/com/seaofnodes/simple/parser/References.java +++ b/chapter32/src/main/java/com/seaofnodes/simple/parser/References.java @@ -93,23 +93,9 @@ final class References { // Check for a function-escaping variable; these require true // closures. Final constants are OK; final vars require a hidden var // argument; not-final fields can just use an explicit struct arg. - if( kx < fx && !P.structs.inExplicitConstructor() && // Out of scope - !(var._final && rvalue._type.isConstant()) ) { // Not a final constant - if( kx > 0 ) // Global scope is OK, only ever one of these (not one per function invoke) - throw Parser.error("Variable '"+var._name+"' is out of function scope and must be a final constant",site); - - // var.idx==2 is self argument, 3 is args, 4 or more are now static globals - if( var._idx >= 4 ) { - // Read from global scope. - // Surely a nicer way to get the top-level scope compile name? - Var clzptr = P._scope.var( 2 ); - // Get the most recent sharpen global - TypeStruct clz = (TypeStruct) Parser.TYPES.get( ((TypeMemPtr) clzptr.type())._obj._name ); - TypeMemPtr clztmp = TypeMemPtr.make( (byte) 2, clz, true ); - return parseField( P.con( clztmp ), id,pre ); - //return parseField(_scope.in(2),id); - } - } + if( kx>0 && kx<fx && !P.structs.inExplicitConstructor() && + !(var._final && rvalue._type.isConstant()) ) + throw Parser.error("Variable '"+var._name+"' is out of function scope and must be a final constant",site); // Check for assign-update, x += e0; char ch = pre==0 ? P._lexer.matchOperAssign() : (char)pre; @@ -144,19 +130,6 @@ final class References { } Node assign(Var def, Node expr) { - Node self = fieldSelf(def); - if( self!=null ) { - TypeStruct ts = P.types.latestStruct(((TypeMemPtr)self._type)._obj); - Field fld = ts.field(def._name); - Node val = expr.keep(); - Node lift = P.conversions.convertExpr(val,def.type()); - Node mem = P.construction.storeMemory(self).keep(); - Node st = new StoreNode(P.loc(),fld._fname,fld._alias,fld._t,P.ctrl(),mem,self, - ConFldOffNode.make(ts,fld._fname),lift,P.construction.own(self)).peephole(); - P.construction.store(self,fld._alias,st,mem); - mem.unkeep(); - return val.unkeep(); - } String name = def._name; // Lift expression, based on type Type decl = def.type(); // Declared type @@ -305,19 +278,27 @@ final class References { return P._scope.in(P._scope.update(P._scope.var(selfx),null)); } - // Fields are lvalues in memory, including inside their initializer and - // explicit constructor. Scope slots retain declaration metadata only. - private Node fieldSelf(Var var) { + // Find the receiver for a field lvalue. Instance initializers use memory; + // class declarations retain their Scope values until initializer exit. + Node fieldSelf(Var var) { int kx = P._scope.kindx(var); ScopeNode.Kind kind = P._scope._kinds.at(kx); - if( !(kind instanceof Kind.Func inst) || !FunNode.isInstance(inst._name) || var._idx<inst._lexSize+2 ) return null; + if( !(kind instanceof Kind.Func owner) || !FunNode.isInit(owner._name) || var._idx<owner._lexSize+2 ) return null; + // Class declarations still accumulate their initial values in Scope. + // This also preserves declaration-time struct default expressions. + if( FunNode.isClz(owner._name) && P._scope.enclosingFunction()==kx ) return null; // Nested functions have their own receiver parameter. Resolve fields // through it even across intervening function and block scopes. Node self = defaultSelf(); - Type owner = P._scope.var(inst._lexSize).type(); - if( self._type instanceof TypeMemPtr ptr && owner instanceof TypeMemPtr declared && + Var receiver = P._scope.var(owner._lexSize); + if( self._type instanceof TypeMemPtr ptr && receiver.type() instanceof TypeMemPtr declared && ptr._obj._name.equals(declared._obj._name) ) return self; - return null; + // An instance method can also name fields of its enclosing class. + // Use that declaration's receiver; normal folding handles its identity. + if( !FunNode.isClz(owner._name) ) return null; + // The enclosing declaration may have discovered more fields since + // creating its receiver. View that same receiver with its current type. + return P.peep(new ConvertNode(receiver.type().upgradeType(Parser.TYPES),P._scope.in(receiver))); } private void checkSharedFunction(Var v) { diff --git a/chapter32/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter32/src/test/java/com/seaofnodes/simple/Chapter05Test.java index 43057c00..9f733da5 100644 --- a/chapter32/src/test/java/com/seaofnodes/simple/Chapter05Test.java +++ b/chapter32/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,38 @@ return a; catch( RuntimeException e ) { assertEquals("Undefined name 'ififif'",e.getMessage()); } } + @Test public void testDoublingBeforeAndAfterStrengthReduction() { + for( boolean shift : new boolean[]{false,true} ) + for( boolean reverse : new boolean[]{false,true} ) { + CodeGen code = new CodeGen(""); + Node ctrl = new CProjNode(code._start,0,"Ctrl").init(); + RegionNode region = new RegionNode(null,null,ctrl,ctrl).init(); + Node p = code.con(TypeInteger.BOT), i = code.con(TypeInteger.I32); + Node twice = shift ? new ShlNode(null,p,code.con(1)).init() + : new AddNode(p,p,(byte)1).init(); + Node sum = new AddNode(i,p,(byte)1).init(); + PhiNode phi = new PhiNode("sum",region,reverse ? sum : twice,reverse ? twice : sum).init(); + 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(); + } + } + + @Test public void testOtherShiftIsNotDoubling() { + CodeGen code = new CodeGen(""); + Node ctrl = new CProjNode(code._start,0,"Ctrl").init(); + RegionNode region = new RegionNode(null,null,ctrl,ctrl).init(); + Node p = code.con(TypeInteger.BOT), i = code.con(TypeInteger.I32); + Node shift = new ShlNode(null,p,code.con(2)).init(); + Node sum = new AddNode(i,p,(byte)1).init(); + PhiNode phi = new PhiNode("sum",region,shift,sum).init(); + phi.keep(); + assertNull(phi.idealize()); + phi.unkeep(); + } } diff --git a/chapter32/src/test/java/com/seaofnodes/simple/Chapter20Test.java b/chapter32/src/test/java/com/seaofnodes/simple/Chapter20Test.java index 273d76ba..226425ca 100644 --- a/chapter32/src/test/java/com/seaofnodes/simple/Chapter20Test.java +++ b/chapter32/src/test/java/com/seaofnodes/simple/Chapter20Test.java @@ -262,8 +262,8 @@ val hashCode = { !String self -> """; // Return the public hashCode wrapper; keep its helper private. testCPU(src,"x86_64_v2", "SystemV",28,null); - testCPU(src,"riscv" , "SystemV",8,null); - testCPU(src,"arm" , "SystemV",6,null); + testCPU(src,"riscv" , "SystemV",11,null); + testCPU(src,"arm" , "SystemV",11,null); } @Test diff --git a/chapter32/src/test/java/com/seaofnodes/simple/Chapter21Test.java b/chapter32/src/test/java/com/seaofnodes/simple/Chapter21Test.java index 347f2ce4..7a59adb0 100644 --- a/chapter32/src/test/java/com/seaofnodes/simple/Chapter21Test.java +++ b/chapter32/src/test/java/com/seaofnodes/simple/Chapter21Test.java @@ -386,8 +386,8 @@ val hashCode = { !String self -> """; // Return the public hashCode wrapper; keep its helper private. testCPU(src,"x86_64_v2", "SystemV",28,null); - testCPU(src,"riscv" , "SystemV",8,null); - testCPU(src,"arm" , "SystemV",6,null); + testCPU(src,"riscv" , "SystemV",11,null); + testCPU(src,"arm" , "SystemV",11,null); } @Test public void testStringExport() throws IOException { @@ -533,8 +533,8 @@ val sieve = { int N -> String sprimes = sb.p("]").toString(); // Compile, link against native C; expect the above string of primes to be printed out by C - // Load/Phi hoisting now requires the pointer before the loop entry. - TestC.runC(src, "sieve", sprimes,216); + // Phi factoring also recognizes p<<1 after p+p strength reduction. + TestC.runC(src, "sieve", sprimes,215); // Evaluate on RISC5 emulator; expect return of an array of primes in // the simulated heap. diff --git a/chapter32/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter32/src/test/java/com/seaofnodes/simple/Chapter22Test.java index c9791de4..f9146ae6 100644 --- a/chapter32/src/test/java/com/seaofnodes/simple/Chapter22Test.java +++ b/chapter32/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/chapter32/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java b/chapter32/src/test/java/com/seaofnodes/simple/GlobalAssignmentTest.java new file mode 100644 index 00000000..51ed10c6 --- /dev/null +++ b/chapter32/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/chapter32/src/test/java/com/seaofnodes/simple/ReceiverTest.java b/chapter32/src/test/java/com/seaofnodes/simple/ReceiverTest.java new file mode 100644 index 00000000..83bf6768 --- /dev/null +++ b/chapter32/src/test/java/com/seaofnodes/simple/ReceiverTest.java @@ -0,0 +1,93 @@ +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; }; + }; + val table=new u16[~2]{7,9}; + val lookup={u8 c -> c<2 ? table[c] : 0;}; + val main={ -> + total=1; + 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={int a,int b,int c,int d,int e,int f,int g -> + self.base+a+2*b+3*c+4*d+5*e+6*f+7*g; + }; + val callback_noInline={int n -> self.base+n;}; + { {int -> i64} int -> i64 } invoke="C"; + val viaC={int 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)(int); + __attribute__((CALL_CONV)) long long invoke(action_t action, int n) { return action(n); } + __attribute__((CALL_CONV)) extern long long calc(int,int,int,int,int,int,int); + __attribute__((CALL_CONV)) extern long long viaC(int); + 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); + } +} diff --git a/chapter32/src/test/java/com/seaofnodes/simple/SeparateCompilationTest.java b/chapter32/src/test/java/com/seaofnodes/simple/SeparateCompilationTest.java index 404201e3..cc4e552f 100644 --- a/chapter32/src/test/java/com/seaofnodes/simple/SeparateCompilationTest.java +++ b/chapter32/src/test/java/com/seaofnodes/simple/SeparateCompilationTest.java @@ -16,7 +16,7 @@ public class SeparateCompilationTest { Path lib=Files.createTempDirectory(build,"wide-memory-"); StringBuilder source=new StringBuilder("int f0=7;\n"); for( int i=1; i<300; i++ ) source.append("int f").append(i).append("=0;\n"); - source.append("val touch={int n -> f299+=n; return f0+f299;};"); + source.append("val touch={int n -> f299=n; return f0+f299;};"); new CodeGen(null,lib.toString(),null,"Wide",source.toString(),123,true,TypeInteger.BOT) .driver(TestC.CPU_PORT,TestC.CALL_CONVENTION,false,false); var paths=new Ary<>(new String[]{lib.toString()}); diff --git a/skills/chapter25-codex-notes.md b/skills/chapter25-codex-notes.md index e7362c3b..7cf22839 100644 --- a/skills/chapter25-codex-notes.md +++ b/skills/chapter25-codex-notes.md @@ -35,6 +35,20 @@ callers promise no initialized fields. No new passes or backward demand walks. ## Chapter 32: restart guidance (2026-11-15) +On 2026-11-16, Cliff requested backporting the shared class receiver to chapter +28a, imported-summary handling to 28b, and both through the later snapshots. +The chapter28a README now owns that explanation. Preserve 28a/28b's monolithic +parser and Scope-based instance construction when adapting this fix; do not +copy chapter29's parser or construction machinery backward. Native fixtures +must also respect the older chapters' 64-bit `int` ABI. + +The Phi factoring fix starts in chapter5: match `x*2` as `x+x` without expanding +the graph. Chapter14 also recognizes `x<<1`; chapter19 and later use that shift +as doubling's strength-reduced representation. Keep each snapshot's existing +factoring guards, type checks, and dependency direction. The chapter5 README +teaches the rule; chapter32 retains the investigation and measurements. No +allocator scoring experiments were adopted or backported. + Continue in `chapter32/` on branch `ch32`. Chapter 31 is complete as the graphics, games, and library snapshot; keep its compiler before the speedups. The chapter32 README teaches the current performance work: parallel test JVMs |
