Mercurial > hg > truffle

changeset 15679:33d9741ccfe3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[inlining] extracted loop-body, for now as InliningPhase.moveForward()
author Miguel Garcia <miguel.m.garcia@oracle.com>
date Thu, 15 May 2014 14:53:50 +0200
parents d8a79b70778c
children 1efd95f6e1ba
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java
diffstat 1 files changed, 33 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java	Thu May 15 14:51:11 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java	Thu May 15 14:53:50 2014 +0200
@@ -153,40 +153,44 @@
         ToDoubleFunction<FixedNode> probabilities = new FixedNodeProbabilityCache();
 
         while (data.hasUnprocessedGraphs()) {
-            final MethodInvocation currentInvocation = data.currentInvocation();
-            if (!currentInvocation.isRoot() &&
-                            !inliningPolicy.isWorthInlining(probabilities, context.getReplacements(), currentInvocation.callee(), data.inliningDepth(), currentInvocation.probability(),
-                                            currentInvocation.relevance(), false)) {
-                int remainingGraphs = currentInvocation.totalGraphs() - currentInvocation.processedGraphs();
-                assert remainingGraphs > 0;
-                data.popGraphs(remainingGraphs);
-                data.popInvocation();
-            } else if (data.currentGraph().hasRemainingInvokes() && inliningPolicy.continueInlining(data.currentGraph().graph())) {
-                data.processNextInvoke(context);
-            } else {
-                data.popGraph();
-                if (!currentInvocation.isRoot()) {
-                    assert currentInvocation.callee().invoke().asNode().isAlive();
-                    currentInvocation.incrementProcessedGraphs();
-                    if (currentInvocation.processedGraphs() == currentInvocation.totalGraphs()) {
-                        data.popInvocation();
-                        final MethodInvocation parentInvoke = data.currentInvocation();
-                        try (Scope s = Debug.scope("Inlining", data.inliningContext())) {
-                            boolean wasInlined = InliningData.tryToInline(probabilities, data.currentGraph(), currentInvocation, parentInvoke, data.inliningDepth() + 1, context, inliningPolicy,
-                                            canonicalizer);
-                            if (wasInlined) {
-                                inliningCount++;
-                            }
-                        } catch (Throwable e) {
-                            throw Debug.handle(e);
+            moveForward(context, data, probabilities);
+        }
+
+        assert data.inliningDepth() == 0;
+        assert data.graphCount() == 0;
+    }
+
+    private void moveForward(HighTierContext context, InliningData data, ToDoubleFunction<FixedNode> probabilities) {
+        final MethodInvocation currentInvocation = data.currentInvocation();
+        if (!currentInvocation.isRoot() &&
+                        !inliningPolicy.isWorthInlining(probabilities, context.getReplacements(), currentInvocation.callee(), data.inliningDepth(), currentInvocation.probability(),
+                                        currentInvocation.relevance(), false)) {
+            int remainingGraphs = currentInvocation.totalGraphs() - currentInvocation.processedGraphs();
+            assert remainingGraphs > 0;
+            data.popGraphs(remainingGraphs);
+            data.popInvocation();
+        } else if (data.currentGraph().hasRemainingInvokes() && inliningPolicy.continueInlining(data.currentGraph().graph())) {
+            data.processNextInvoke(context);
+        } else {
+            data.popGraph();
+            if (!currentInvocation.isRoot()) {
+                assert currentInvocation.callee().invoke().asNode().isAlive();
+                currentInvocation.incrementProcessedGraphs();
+                if (currentInvocation.processedGraphs() == currentInvocation.totalGraphs()) {
+                    data.popInvocation();
+                    final MethodInvocation parentInvoke = data.currentInvocation();
+                    try (Scope s = Debug.scope("Inlining", data.inliningContext())) {
+                        boolean wasInlined = InliningData.tryToInline(probabilities, data.currentGraph(), currentInvocation, parentInvoke, data.inliningDepth() + 1, context, inliningPolicy,
+                                        canonicalizer);
+                        if (wasInlined) {
+                            inliningCount++;
                         }
+                    } catch (Throwable e) {
+                        throw Debug.handle(e);
                     }
                 }
             }
         }
-
-        assert data.inliningDepth() == 0;
-        assert data.graphCount() == 0;
     }
 
     /**