Add incremental canonicalizer around remove value proxy phase. Add co…

…unter for peeled loops.
sekmet · Oct 19, 2019 · 7e7e8ee · 7e7e8ee
1 parent 714ce2b
commit 7e7e8ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
@@ -87,7 +87,7 @@ public MidTier(OptionValues options) {
             appendPhase(new VerifyHeapAtReturnPhase());
         }
 
-        appendPhase(new RemoveValueProxyPhase());
+        appendPhase(new IncrementalCanonicalizerPhase<>(canonicalizer, new RemoveValueProxyPhase()));
 
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER));
 

diff --git a/...g.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java b/...g.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.loop.phases;
 
+import org.graalvm.compiler.debug.CounterKey;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.loop.LoopEx;
 import org.graalvm.compiler.loop.LoopPolicies;
@@ -33,6 +34,8 @@
 
 public class LoopPeelingPhase extends LoopPhase<LoopPolicies> {
 
+    public static final CounterKey PEELED = DebugContext.counter("Peeled");
+
     public LoopPeelingPhase(LoopPolicies policies) {
         super(policies);
     }
@@ -48,6 +51,7 @@ protected void run(StructuredGraph graph, CoreProviders context) {
                     if (loop.canDuplicateLoop() && loop.loopBegin().getLoopEndCount() > 0) {
                         if (LoopPolicies.Options.PeelALot.getValue(graph.getOptions()) || getPolicies().shouldPeel(loop, data.getCFG(), context.getMetaAccess())) {
                             debug.log("Peeling %s", loop);
+                            PEELED.add(debug, 1);
                             LoopTransformations.peel(loop);
                             debug.dump(DebugContext.DETAILED_LEVEL, graph, "Peeling %s", loop);
                         }