[GR-48937] Fix reasons for triggered CompilationAlarms due to no prog…

…ress. PullRequest: graal/15689
oracle · Oct 9, 2023 · 15e7e23 · 15e7e23
2 parents e23b390 + a4d96e5
commit 15e7e23
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/.../jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java b/.../jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java
@@ -188,10 +188,10 @@ private static void assertProgress(OptionValues opt, EventCounter counter) {
                 assertProgressNoTracking(opt, counter);
                 return;
             } else {
-                final double noProgressStartDetectionPriod = noProgressStartPeriod.get() * 1000;
+                final double noProgressStartDetectionPeriod = noProgressStartPeriod.get() * 1000;
                 final long currentTimeStamp = System.currentTimeMillis();
                 final long timeDiff = currentTimeStamp - lastUniqueStackTraceTimeStamp;
-                final boolean noProgressForPeriodStartDetection = timeDiff > noProgressStartDetectionPriod;
+                final boolean noProgressForPeriodStartDetection = timeDiff > noProgressStartDetectionPeriod;
                 if (!noProgressForPeriodStartDetection) {
                     /*
                      * Still not enough no-progress before we start doing something.

diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/BasePhase.java b/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/BasePhase.java
@@ -33,6 +33,7 @@
 import java.util.regex.Pattern;
 
 import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.core.common.util.CompilationAlarm;
 import org.graalvm.compiler.debug.CounterKey;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
@@ -458,6 +459,13 @@ public final void apply(final StructuredGraph graph, final C context, final bool
                 debug.verify(graph, "%s", getName());
             }
             assert graph.verify();
+            /*
+             * Reset the progress-based compilation alarm to ensure that progress tracking happens
+             * for each phase in isolation. This prevents false alarms where the same progress state
+             * is seen in subsequent phases, e.g., during graph verification a the end of each
+             * phase.
+             */
+            CompilationAlarm.resetProgressDetection();
         } catch (Throwable t) {
             throw debug.handle(t);
         }

diff --git a/...piler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java b/...piler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java
@@ -27,6 +27,7 @@
 import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getGraph;
 import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec;
 
+import org.graalvm.compiler.core.common.util.CompilationAlarm;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.openjdk.jmh.annotations.Level;
@@ -76,6 +77,11 @@ protected StructuredGraph preprocessOriginal(StructuredGraph structuredGraph) {
 
     @Setup(Level.Invocation)
     public void beforeInvocation() {
+        /*
+         * [GR-48937] Reset the progress-based compilation alarm for the jmh thread, because it can
+         * falsely assume that this thread is stuck during graph copying.
+         */
+        CompilationAlarm.resetProgressDetection();
         graph = (StructuredGraph) originalGraph.copy(originalGraph.getDebug());
     }
 }
diff --git a/...piler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java b/...piler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java
@@ -32,9 +32,10 @@
 
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
-
+import org.graalvm.compiler.core.common.util.CompilationAlarm;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -107,4 +108,14 @@ public void afterInvocation() {
             }
         }
     }
+
+    @Setup(Level.Invocation)
+    public void beforeInvocation() {
+        /*
+         * [GR-48937] Reset the progress-based compilation alarm, because repeated invocations of
+         * methods which include progress detection (i.e. node.inputs()) on the same graph
+         * throughout many benchmark invocations can falsely detect endless loops.
+         */
+        CompilationAlarm.resetProgressDetection();
+    }
 }