Mercurial > hg > graal-compiler

changeset 22028:9015ec60f729

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make names of printed IGV graphs shorter.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 19 Jun 2015 15:04:01 +0200
parents 187b34bd0151
children 0eedd37f45ba
files graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopFullUnrollPhase.java graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopPeelingPhase.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/BasePhase.java graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java
diffstat 6 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java	Fri Jun 19 12:48:12 2015 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParser.java	Fri Jun 19 15:04:01 2015 +0200
@@ -491,7 +491,6 @@
         }
 
         // Remove redundant begin nodes.
-        Debug.dump(graph, "Before removing redundant begins");
         for (BeginNode beginNode : graph.getNodes(BeginNode.TYPE)) {
             Node predecessor = beginNode.predecessor();
             if (predecessor instanceof ControlSplitNode) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java	Fri Jun 19 12:48:12 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java	Fri Jun 19 15:04:01 2015 +0200
@@ -121,7 +121,7 @@
             try (DebugCloseable a = timer.start(); DebugCloseable c = memUseTracker.start()) {
                 run(target, lirGenRes, codeEmittingOrder, linearScanOrder, context);
                 if (dumpLIR && Debug.isDumpEnabled(PHASE_DUMP_LEVEL)) {
-                    Debug.dump(PHASE_DUMP_LEVEL, lirGenRes.getLIR(), "After phase %s", getName());
+                    Debug.dump(PHASE_DUMP_LEVEL, lirGenRes.getLIR(), "%s", getName());
                 }
             }
         } catch (Throwable e) {
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopFullUnrollPhase.java	Fri Jun 19 12:48:12 2015 +0200
+++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopFullUnrollPhase.java	Fri Jun 19 15:04:01 2015 +0200
@@ -51,7 +51,7 @@
                         Debug.log("FullUnroll %s", loop);
                         LoopTransformations.fullUnroll(loop, context, canonicalizer);
                         FULLY_UNROLLED_LOOPS.increment();
-                        Debug.dump(graph, "After fullUnroll %s", loop);
+                        Debug.dump(graph, "FullUnroll %s", loop);
                         peeled = true;
                         break;
                     }
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopPeelingPhase.java	Fri Jun 19 12:48:12 2015 +0200
+++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/phases/LoopPeelingPhase.java	Fri Jun 19 15:04:01 2015 +0200
@@ -37,7 +37,7 @@
                 if (LoopPolicies.shouldPeel(loop, data.getCFG())) {
                     Debug.log("Peeling %s", loop);
                     LoopTransformations.peel(loop);
-                    Debug.dump(graph, "After peeling %s", loop);
+                    Debug.dump(graph, "Peeling %s", loop);
                 }
             }
             data.deleteUnusedNodes();
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/BasePhase.java	Fri Jun 19 12:48:12 2015 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/BasePhase.java	Fri Jun 19 15:04:01 2015 +0200
@@ -135,7 +135,7 @@
         apply(graph, context, true);
     }
 
-    public final void apply(final StructuredGraph graph, final C context, final boolean dumpGraph) {
+    protected final void apply(final StructuredGraph graph, final C context, final boolean dumpGraph) {
         try (DebugCloseable a = timer.start(); Scope s = Debug.scope(getClass(), this); DebugCloseable c = memUseTracker.start()) {
             if (dumpGraph && Debug.isDumpEnabled(BEFORE_PHASE_DUMP_LEVEL)) {
                 Debug.dump(BEFORE_PHASE_DUMP_LEVEL, graph, "Before phase %s", getName());
@@ -144,14 +144,14 @@
             executionCount.increment();
             inputNodesCount.add(graph.getNodeCount());
             if (dumpGraph && Debug.isDumpEnabled(PHASE_DUMP_LEVEL)) {
-                Debug.dump(PHASE_DUMP_LEVEL, graph, "After phase %s", getName());
+                Debug.dump(PHASE_DUMP_LEVEL, graph, "%s", getName());
             }
             if (Fingerprint.ENABLED) {
                 String graphDesc = graph.method() == null ? graph.name : graph.method().format("%H.%n(%p)");
                 Fingerprint.submit("After phase %s nodes in %s are %s", getName(), graphDesc, graph.getNodes().snapshot());
             }
             if (Debug.isVerifyEnabled()) {
-                Debug.verify(graph, "After phase %s", getName());
+                Debug.verify(graph, "%s", getName());
             }
             assert graph.verify();
         } catch (Throwable t) {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java	Fri Jun 19 12:48:12 2015 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/EffectsPhase.java	Fri Jun 19 15:04:01 2015 +0200
@@ -98,7 +98,7 @@
                     }
 
                     if (Debug.isDumpEnabled()) {
-                        Debug.dump(graph, "after " + getName() + " iteration");
+                        Debug.dump(graph, getName() + " iteration");
                     }
 
                     new DeadCodeEliminationPhase(Required).apply(graph);