summaryrefslogtreecommitdiff
path: root/chapter32/src/main/java
diff options
context:
space:
mode:
authorCliff Click <cliffc@acm.org>2026-11-15 16:54:06 -0800
committerCliff Click <cliffc@acm.org>2026-11-15 16:54:06 -0800
commit8b80d94ce545060c09dab9487393f64acbc3e6fe (patch)
tree4517ec6518e5617a5e7f64ff3ec891a5b2c83d8c /chapter32/src/main/java
parent9fe7c6f9697b5bbf3041261fdc60040e75cc674f (diff)
downloadSimple-8b80d94ce545060c09dab9487393f64acbc3e6fe.tar.gz
Simple-8b80d94ce545060c09dab9487393f64acbc3e6fe.zip
Bunch of unrelated speedups
And some modest tracking bugs
Diffstat (limited to 'chapter32/src/main/java')
-rw-r--r--chapter32/src/main/java/com/seaofnodes/simple/codegen/IterPeeps.java12
-rw-r--r--chapter32/src/main/java/com/seaofnodes/simple/node/IfNode.java4
-rw-r--r--chapter32/src/main/java/com/seaofnodes/simple/node/PhiNode.java3
3 files changed, 16 insertions, 3 deletions
diff --git a/chapter32/src/main/java/com/seaofnodes/simple/codegen/IterPeeps.java b/chapter32/src/main/java/com/seaofnodes/simple/codegen/IterPeeps.java
index ba6cb5d8..fe935a69 100644
--- a/chapter32/src/main/java/com/seaofnodes/simple/codegen/IterPeeps.java
+++ b/chapter32/src/main/java/com/seaofnodes/simple/codegen/IterPeeps.java
@@ -125,7 +125,13 @@ public class IterPeeps {
// A self-returning peephole can have rewritten its input
// edges. The new defs gained a user and may have
// backwards, user-sensitive peepholes of their own.
- for( Node z : x._inputs ) _work.push(z);
+ boolean edited = x!=n || x.isUnlocked();
+ for( Node z : x._inputs )
+ // A type-only update adds no users. A stable memory
+ // Phi has no backwards rewrite based on user types.
+ // Keep first-use and edited/unprocessed Phis queued.
+ if( edited || !(z instanceof MemPhiNode) || z.nOuts()<=1 || z.isUnlocked() )
+ _work.push(z);
// If the result is not self, revisit all inputs (because
// there's a new user), and replace in the graph.
if( x != n ) {
@@ -237,7 +243,9 @@ public class IterPeeps {
}
return found;
}
- return CFGNode.safeCFG(use);
+ // A memory op can execute after its control (e.g. a range check).
+ // Like schedEarly, include its data inputs before constraining its defs.
+ return use instanceof MemOpNode ? CFGNode.earlyCFG(use,earlyCache,VISIT) : CFGNode.safeCFG(use);
}
private static String badSchedule(Node n, CFGNode early, CFGNode lca) {
diff --git a/chapter32/src/main/java/com/seaofnodes/simple/node/IfNode.java b/chapter32/src/main/java/com/seaofnodes/simple/node/IfNode.java
index c83c81d0..ad8de653 100644
--- a/chapter32/src/main/java/com/seaofnodes/simple/node/IfNode.java
+++ b/chapter32/src/main/java/com/seaofnodes/simple/node/IfNode.java
@@ -56,7 +56,9 @@ public class IfNode extends CFGNode implements MultiNode {
public Node idealize() {
// Hunt up the immediate dominator tree. If we find an identical if
// test on either the true or false branch, that side wins.
- if( !pred()._type.isHighOrConst() )
+ // Known branches fold through CProj; they need no dominator search
+ // or subscriptions to changes higher up the control flow.
+ if( _type==TypeTuple.IF_BOTH )
for( CFGNode dom = idom(), prior=this; dom!=null; prior = dom, dom = dom.idom() )
if( addDep(dom) instanceof IfNode iff &&
prior instanceof CProjNode prj &&
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 f45c7325..7544962f 100644
--- a/chapter32/src/main/java/com/seaofnodes/simple/node/PhiNode.java
+++ b/chapter32/src/main/java/com/seaofnodes/simple/node/PhiNode.java
@@ -147,6 +147,9 @@ public class PhiNode extends Node {
return null;
if( !(r.in(3-nzIdx) instanceof CProjNode z && z._idx==1 && z.ctrl()==iff) )
return null;
+ // A rewritten predicate can make this guard match without changing the Phi inputs.
+ addDep(iff);
+ addDep(iff.pred()); // subsume wakes the replaced predicate's dependents.
// Predicate was guarded?
Node n = cast.in(1), tested = null;
while( true ) {