[GR-66463] Remove scoped metrics

PullRequest: graal/21234

Author: Alina Weber-Hohengrund

compiler/docs/Debugging.md

@@ -189,8 +189,8 @@ to obtain per-method metric values.
 
 ## Method filtering
 
-Specifying one of the debug scope options (i.e., `-Djdk.graal.Log`, `-Djdk.graal.Dump`, `-Djdk.graal.Count`,
-`-Djdk.graal.Time`, or `-Djdk.graal.TrackMemUse`) can generate a lot of output. Typically, you are only
+Specifying one of the debug scope options (i.e., `-Djdk.graal.Log`, `-Djdk.graal.Dump`, `-Djdk.graal.Counter`,
+`-Djdk.graal.Timer`, or `-Djdk.graal.MemUseTracker`) can generate a lot of output. Typically, you are only
 interesting in compiler output related to a single or few methods. In this case, use the
 `-Djdk.graal.MethodFilter` option to specify a method filter. The matching logic for this option is
 described in
@@ -201,7 +201,7 @@ and documented in the
 ## Metric filtering
 
 Alternatively, you may only want to see certain metrics. The `-Djdk.graal.Timers`, `-Djdk.graal.Counters`
-and `-Djdk.graal.MemUseTrackers` exist for this purpose.  These options take a comma separated list of
+and `-Djdk.graal.MemUseTrackers` track everything if nothing is specified. Else, these options take a comma separated list of
 metrics names. Only the named metrics will be activated and reported. To see the available metric
 names, specify `-Djdk.graal.ListMetrics=true`. At VM shutdown this option lists all the metrics that
 were encountered during the VM execution. It does not list metrics registered on non-executed paths

compiler/mx.compiler/suite.py

@@ -523,7 +523,7 @@
           "jdk.graal.compiler.code.DisassemblerProvider",
           "jdk.graal.compiler.core.match.MatchStatementSet",
           "jdk.graal.compiler.core.common.LibGraalSupport",
-          "jdk.graal.compiler.debug.DebugHandlersFactory",
+          "jdk.graal.compiler.debug.DebugDumpHandlersFactory",
           "jdk.graal.compiler.debug.TTYStreamProvider",
           "jdk.graal.compiler.debug.PathUtilitiesProvider",
           "jdk.graal.compiler.hotspot.HotSpotBackendFactory",

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerTest.java

@@ -81,7 +81,7 @@
 import jdk.graal.compiler.core.target.Backend;
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.debug.DebugDumpHandler;
-import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugDumpHandlersFactory;
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.debug.TTY;
 import jdk.graal.compiler.graph.Node;
@@ -490,7 +490,7 @@ protected DebugContext getDebugContext() {
     }
 
     @Override
-    protected Collection<DebugHandlersFactory> getDebugHandlersFactories() {
+    protected Collection<DebugDumpHandlersFactory> getDebugHandlersFactories() {
         return Collections.singletonList(new GraalDebugHandlersFactory(getSnippetReflection()));
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsageTest.java

@@ -106,15 +106,6 @@ int getLevel() {
         }
     }
 
-    private static final class InvalidVerifyUsagePhase extends TestPhase {
-        @Override
-        protected void run(StructuredGraph graph) {
-            DebugContext debug = graph.getDebug();
-            debug.verify(graph, "%s", graph.toString());
-        }
-
-    }
-
     private static final class InvalidConcatLogUsagePhase extends TestPhase {
         @Override
         protected void run(StructuredGraph graph) {
@@ -148,15 +139,6 @@ protected void run(StructuredGraph graph) {
 
     }
 
-    static class InvalidConcatVerifyUsagePhase extends TestPhase {
-        @Override
-        protected void run(StructuredGraph graph) {
-            DebugContext debug = graph.getDebug();
-            debug.verify(graph, "error " + graph);
-        }
-
-    }
-
     static class ValidLogUsagePhase extends TestPhase {
         @Override
         protected void run(StructuredGraph graph) {
@@ -190,15 +172,6 @@ protected void run(StructuredGraph graph) {
 
     }
 
-    static class ValidVerifyUsagePhase extends TestPhase {
-        @Override
-        protected void run(StructuredGraph graph) {
-            DebugContext debug = graph.getDebug();
-            debug.verify(graph, "%s", graph);
-        }
-
-    }
-
     static class InvalidGraalErrorGuaranteePhase extends TestPhase {
         @Override
         protected void run(StructuredGraph graph) {
@@ -239,11 +212,6 @@ public void testLogAndIndentInvalid() {
         testDebugUsageClass(InvalidLogAndIndentUsagePhase.class);
     }
 
-    @Test(expected = VerificationError.class)
-    public void testVerifyInvalid() {
-        testDebugUsageClass(InvalidVerifyUsagePhase.class);
-    }
-
     @Test(expected = VerificationError.class)
     public void testDumpInvalid() {
         testDebugUsageClass(InvalidDumpUsagePhase.class);
@@ -269,11 +237,6 @@ public void testLogAndIndentInvalidConcat() {
         testDebugUsageClass(InvalidConcatLogAndIndentUsagePhase.class);
     }
 
-    @Test(expected = VerificationError.class)
-    public void testVerifyInvalidConcat() {
-        testDebugUsageClass(InvalidConcatVerifyUsagePhase.class);
-    }
-
     @Test(expected = VerificationError.class)
     public void testDumpInvalidConcat() {
         testDebugUsageClass(InvalidConcatDumpUsagePhase.class);
@@ -289,11 +252,6 @@ public void testLogAndIndentValid() {
         testDebugUsageClass(ValidLogAndIndentUsagePhase.class);
     }
 
-    @Test
-    public void testVerifyValid() {
-        testDebugUsageClass(ValidVerifyUsagePhase.class);
-    }
-
     @Test
     public void testDumpValid() {
         testDebugUsageClass(ValidDumpUsagePhase.class);

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/DebugContextTest.java

@@ -50,10 +50,8 @@
 import jdk.graal.compiler.debug.DebugContext.Builder;
 import jdk.graal.compiler.debug.DebugContext.Scope;
 import jdk.graal.compiler.debug.DebugDumpHandler;
-import jdk.graal.compiler.debug.DebugHandler;
-import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugDumpHandlersFactory;
 import jdk.graal.compiler.debug.DebugOptions;
-import jdk.graal.compiler.debug.DebugVerifyHandler;
 import jdk.graal.compiler.options.OptionKey;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.serviceprovider.GraalServices;
@@ -64,19 +62,14 @@ static class DebugContextSetup {
         final Formatter dumpOutput = new Formatter();
         final Formatter verifyOutput = new Formatter();
         final ByteArrayOutputStream logOutput = new ByteArrayOutputStream();
-        DebugHandlersFactory handlers = new DebugHandlersFactory() {
+        DebugDumpHandlersFactory handlers = new DebugDumpHandlersFactory() {
             @Override
-            public List<DebugHandler> createHandlers(OptionValues options) {
+            public List<DebugDumpHandler> createHandlers(OptionValues options) {
                 return Arrays.asList(new DebugDumpHandler() {
                     @Override
                     public void dump(Object object, DebugContext ignore, boolean forced, String format, Object... arguments) {
                         dumpOutput.format("Dumping %s with label \"%s\"%n", object, String.format(format, arguments));
                     }
-                }, new DebugVerifyHandler() {
-                    @Override
-                    public void verify(DebugContext ignore, Object object, String format, Object... args) {
-                        verifyOutput.format("Verifying %s with label \"%s\"%n", object, String.format(format, args));
-                    }
                 });
             }
         };
@@ -95,7 +88,6 @@ public void testDisabledScopes() {
                         DebugContext.Scope _ = debug.scope("TestDisabledScoping")) {
             for (int level = DebugContext.BASIC_LEVEL; level <= DebugContext.VERY_DETAILED_LEVEL; level++) {
                 debug.dump(level, "an object", "at level %d", level);
-                debug.verify("an object", "at level %d", level);
                 debug.log(level, "log statement at level %d", level);
             }
         }
@@ -341,11 +333,11 @@ public void testDebugConfig() {
     @Test
     public void testIsCountEnabled1() {
         EconomicMap<OptionKey<?>, Object> map = EconomicMap.create();
-        map.put(DebugOptions.Count, "");
+        map.put(DebugOptions.Counters, "");
         OptionValues options = new OptionValues(map);
         DebugContext debug = new Builder(options).build();
         try (Scope _ = debug.scope("Scope")) {
-            Assert.assertTrue(debug.isCountEnabled());
+            Assert.assertTrue(debug.areCountersEnabled());
         }
     }
 
@@ -356,7 +348,7 @@ public void testIsCountEnabled2() {
         OptionValues options = new OptionValues(map);
         DebugContext debug = new Builder(options).build();
         try (Scope _ = debug.scope("Scope")) {
-            Assert.assertTrue(debug.isCountEnabled());
+            Assert.assertTrue(debug.areCountersEnabled());
         }
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/TimerKeyTest.java

@@ -83,7 +83,7 @@ private static long spin(long ms) {
     @Test
     public void test2() {
         EconomicMap<OptionKey<?>, Object> map = EconomicMap.create();
-        map.put(DebugOptions.Time, "");
+        map.put(DebugOptions.Timers, "");
         OptionValues options = new OptionValues(map);
         DebugContext debug = new Builder(options, NO_CONFIG_CUSTOMIZERS).build();
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/GraalTest.java

@@ -58,7 +58,7 @@
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.debug.DebugContext.Builder;
 import jdk.graal.compiler.debug.DebugDumpHandler;
-import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugDumpHandlersFactory;
 import jdk.graal.compiler.debug.GlobalMetrics;
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.nodes.StructuredGraph;
@@ -487,9 +487,9 @@ public static void assertFalse(boolean condition, String message, Object... obje
     }
 
     /**
-     * Gets the {@link DebugHandlersFactory}s available for a {@link DebugContext}.
+     * Gets the {@link DebugDumpHandlersFactory}s available for a {@link DebugContext}.
      */
-    protected Collection<DebugHandlersFactory> getDebugHandlersFactories() {
+    protected Collection<DebugDumpHandlersFactory> getDebugHandlersFactories() {
         return Collections.emptyList();
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java

@@ -644,7 +644,7 @@ public void manyIfsProgram() {
 
     @Override
     protected OptionValues getGraalOptions() {
-        return new OptionValues(super.getGraalOptions(), DebugOptions.Count, "", DebugOptions.Time, "");
+        return new OptionValues(super.getGraalOptions(), DebugOptions.Counters, "", DebugOptions.Timers, "");
     }
 
     public abstract static class Inst {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationWrapper.java

@@ -26,12 +26,12 @@
 
 import static jdk.graal.compiler.core.CompilationWrapper.ExceptionAction.ExitVM;
 import static jdk.graal.compiler.core.common.GraalOptions.TrackNodeSourcePosition;
-import static jdk.graal.compiler.debug.DebugOptions.Count;
 import static jdk.graal.compiler.debug.DebugOptions.Dump;
 import static jdk.graal.compiler.debug.DebugOptions.DumpPath;
 import static jdk.graal.compiler.debug.DebugOptions.MethodFilter;
 import static jdk.graal.compiler.debug.DebugOptions.PrintBackendCFG;
-import static jdk.graal.compiler.debug.DebugOptions.Time;
+import static jdk.graal.compiler.debug.DebugOptions.Counters;
+import static jdk.graal.compiler.debug.DebugOptions.Timers;
 import static jdk.graal.compiler.debug.PathUtilities.getPath;
 import static jdk.graal.compiler.debug.DebugOptions.RecordForReplay;
 
@@ -393,8 +393,8 @@ private OptionValues getRetryOptions(OptionValues initialOptions, String dumpPat
          * turn if explicitly set in DiagnoseOptions.
          */
         values.put(MethodFilter, null);
-        values.put(Count, "");
-        values.put(Time, "");
+        values.put(Counters, "");
+        values.put(Timers, "");
         values.put(DumpPath, dumpPath);
         values.put(PrintBackendCFG, true);
         values.put(TrackNodeSourcePosition, true);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/LIRCompilerBackend.java

@@ -235,7 +235,7 @@ public static void emitCode(Backend backend,
                 compilationResult.setSpeculationLog(speculationLog);
             }
             crb.finish();
-            if (debug.isCountEnabled()) {
+            if (debug.areCountersEnabled()) {
                 List<DataPatch> ldp = compilationResult.getDataPatches();
                 JavaKind[] kindValues = JavaKind.values();
                 CounterKey[] dms = new CounterKey[kindValues.length];