Mercurial > hg > truffle
changeset 5227:6b1170c32a81
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 11 Apr 2012 10:37:25 +0200 |
parents | 51d2cac7db70 (current diff) a693408f737c (diff) |
children | e0f17fb3e7d2 |
files | |
diffstat | 2 files changed, 24 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopTransformUtil.java Wed Apr 11 10:37:19 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/loop/LoopTransformUtil.java Wed Apr 11 10:37:25 2012 +0200 @@ -26,20 +26,21 @@ import com.oracle.graal.lir.cfg.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.util.*; public class LoopTransformUtil { public static void peel(Loop loop) { - GraphUtil.normalizeLoopBegin(loop.loopBegin()); - SuperBlock block = wholeLoop(loop); - SuperBlock peel = block.duplicate(); // duplicates the nodes, merges early exits + peel(loop, wholeLoop(loop)); + } + + public static void peel(Loop loop, SuperBlock wholeLoop) { + SuperBlock peel = wholeLoop.duplicate(); // duplicates the nodes, merges early exits peel.insertBefore(loop.loopBegin().forwardEnd()); // connects peeled part's CFG LoopTransformDataResolver resolver = new LoopTransformDataResolver(); - resolver.wholeLoop(block).peeled(peel); // block (comming from the loop) was peeled into peel + resolver.wholeLoop(wholeLoop).peeled(peel); // block (comming from the loop) was peeled into peel resolver.resolve(); peel.finish();
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Wed Apr 11 10:37:19 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Wed Apr 11 10:37:25 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); }