Mercurial > hg > graal-compiler
changeset 5225:a693408f737c
Merge node simplification: Combine merge cascades into a single merge.
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Tue, 10 Apr 2012 19:02:04 +0200 |
parents | e706b132f580 |
children | 6b1170c32a81 |
files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java |
diffstat | 1 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Tue Apr 10 18:52:21 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Tue Apr 10 19:02:04 2012 +0200 @@ -137,25 +137,34 @@ @Override public void simplify(SimplifierTool tool) { FixedNode next = next(); - if (next instanceof LoopEndNode) { - LoopEndNode origLoopEnd = (LoopEndNode) next; - LoopBeginNode begin = origLoopEnd.loopBegin(); + if (next instanceof EndNode) { + EndNode origLoopEnd = (EndNode) next; + MergeNode merge = origLoopEnd.merge(); + if (merge instanceof LoopBeginNode && !(origLoopEnd instanceof LoopEndNode)) { + return; + } for (PhiNode phi : phis()) { for (Node usage : phi.usages().filter(isNotA(FrameState.class))) { - if (!begin.isPhiAtMerge(usage)) { + if (!merge.isPhiAtMerge(usage)) { return; } } } FixedNode evacuateAnchoredTo = new ComputeImmediateDominator(this).compute(); - Debug.log("Split %s into loop ends for %s. Evacuate to %s", this, begin, evacuateAnchoredTo); + Debug.log("Split %s into ends for %s. Evacuate to %s", this, merge, evacuateAnchoredTo); this.prepareDelete(evacuateAnchoredTo); int numEnds = this.forwardEndCount(); StructuredGraph graph = (StructuredGraph) graph(); for (int i = 0; i < numEnds - 1; i++) { EndNode end = forwardEndAt(numEnds - 1 - i); - LoopEndNode loopEnd = graph.add(new LoopEndNode(begin)); - for (PhiNode phi : begin.phis()) { + EndNode newEnd; + if (merge instanceof LoopBeginNode) { + newEnd = graph.add(new LoopEndNode((LoopBeginNode) merge)); + } else { + newEnd = graph.add(new EndNode()); + merge.addForwardEnd(newEnd); + } + for (PhiNode phi : merge.phis()) { ValueNode v = phi.valueAt(origLoopEnd); ValueNode newInput; if (isPhiAtMerge(v)) { @@ -167,9 +176,9 @@ phi.addInput(newInput); } this.removeEnd(end); - end.replaceAtPredecessors(loopEnd); + end.replaceAtPredecessors(newEnd); end.safeDelete(); - tool.addToWorkList(loopEnd.predecessor()); + tool.addToWorkList(newEnd.predecessor()); // ? } graph.reduceTrivialMerge(this); }