summaryrefslogtreecommitdiff
path: root/chapter06/src/main/java/com/seaofnodes
diff options
context:
space:
mode:
authorCliff Click <cliffc@acm.org>2026-11-16 14:25:14 -0800
committerCliff Click <cliffc@acm.org>2026-11-16 14:25:14 -0800
commit0dcd3513a633479ce228f24826db4f09e4c0fc8b (patch)
treed8fb6d0fb382df5799789e9dc1eb0fae2d381cce /chapter06/src/main/java/com/seaofnodes
parent51a029304d8105b201bdfb81a7692b8a1b16b028 (diff)
downloadSimple-0dcd3513a633479ce228f24826db4f09e4c0fc8b.tar.gz
Simple-0dcd3513a633479ce228f24826db4f09e4c0fc8b.zip
Phi fix
Fix Phi/Add refactoring peephole to canonicalize regardless of peephole order. Treat class fcns as having `self` be the class pointer
Diffstat (limited to 'chapter06/src/main/java/com/seaofnodes')
-rw-r--r--chapter06/src/main/java/com/seaofnodes/simple/node/PhiNode.java34
1 files changed, 27 insertions, 7 deletions
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;
}