[GR-69439] Cache compiler phase name.

PullRequest: graal/22054

Author: woess

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationListenerProfiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 
 import jdk.graal.compiler.debug.CompilationListener;
 import jdk.graal.compiler.debug.DebugContext;
-
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
@@ -47,7 +46,7 @@ public CompilationListenerProfiler(CompilerProfiler profiler, int compileId) {
 
     @Override
     public void notifyInlining(ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, CharSequence message, int bci) {
-        profiler.notifyCompilerInlingEvent(compileId, caller, callee, succeeded, message.toString(), bci);
+        profiler.notifyCompilerInliningEvent(compileId, caller, callee, succeeded, message.toString(), bci);
     }
 
     @Override

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilerProfiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,5 +61,5 @@ public interface CompilerProfiler {
      * @param message extra information about inlining decision
      * @param bci byte code index of call site
      */
-    void notifyCompilerInlingEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, String message, int bci);
+    void notifyCompilerInliningEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, String message, int bci);
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JFRCompilerProfiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 
 import jdk.graal.compiler.core.common.CompilerProfiler;
 import jdk.graal.compiler.serviceprovider.ServiceProvider;
-
 import jdk.vm.ci.hotspot.JFR;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
@@ -47,7 +46,7 @@ public void notifyCompilerPhaseEvent(int compileId, long startTime, String name,
     }
 
     @Override
-    public void notifyCompilerInlingEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee,
+    public void notifyCompilerInliningEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee,
                     boolean succeeded, String message, int bci) {
         JFR.CompilerInliningEvent.write(compileId, caller, callee, succeeded, message, bci);
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replaycomp/CompilerInterfaceDeclarations.java

@@ -672,7 +672,7 @@ public static CompilerInterfaceDeclarations build() {
         new RegistrationBuilder<>(CompilerProfiler.class).setSingleton(true)
                 .setStrategy(CompilerProfilerProxy.getTicksMethod, MethodStrategy.Passthrough)
                 .setStrategy(CompilerProfilerProxy.notifyCompilerPhaseEventMethod, MethodStrategy.Passthrough)
-                .setDefaultValueStrategy(CompilerProfilerProxy.notifyCompilerInlingEventMethod, null)
+                .setDefaultValueStrategy(CompilerProfilerProxy.notifyCompilerInliningEventMethod, null)
                 .register(declarations);
         new RegistrationBuilder<>(HotSpotResolvedObjectType.class, HotSpotResolvedJavaType.class)
                 .ensureRecorded(HotSpotResolvedObjectTypeProxy.getNameMethod, HotSpotResolvedObjectTypeProxy.getNameInvokable)

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replaycomp/proxy/CompilerProfilerProxy.java

@@ -57,15 +57,15 @@ public void notifyCompilerPhaseEvent(int compileId, long startTime, String name,
         handle(notifyCompilerPhaseEventMethod, notifyCompilerPhaseEventInvokable, compileId, startTime, name, nestingLevel);
     }
 
-    public static final SymbolicMethod notifyCompilerInlingEventMethod = method("notifyCompilerInlingEvent", int.class, ResolvedJavaMethod.class, ResolvedJavaMethod.class, boolean.class,
+    public static final SymbolicMethod notifyCompilerInliningEventMethod = method("notifyCompilerInliningEvent", int.class, ResolvedJavaMethod.class, ResolvedJavaMethod.class, boolean.class,
                     String.class, int.class);
-    private static final InvokableMethod notifyCompilerInlingEventInvokable = (receiver, args) -> {
-        ((CompilerProfiler) receiver).notifyCompilerInlingEvent((int) args[0], (ResolvedJavaMethod) args[1], (ResolvedJavaMethod) args[2], (boolean) args[3], (String) args[4], (int) args[5]);
+    private static final InvokableMethod notifyCompilerInliningEventInvokable = (receiver, args) -> {
+        ((CompilerProfiler) receiver).notifyCompilerInliningEvent((int) args[0], (ResolvedJavaMethod) args[1], (ResolvedJavaMethod) args[2], (boolean) args[3], (String) args[4], (int) args[5]);
         return null;
     };
 
     @Override
-    public void notifyCompilerInlingEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, String message, int bci) {
-        handle(notifyCompilerInlingEventMethod, notifyCompilerInlingEventInvokable, compileId, caller, callee, succeeded, message, bci);
+    public void notifyCompilerInliningEvent(int compileId, ResolvedJavaMethod caller, ResolvedJavaMethod callee, boolean succeeded, String message, int bci) {
+        handle(notifyCompilerInliningEventMethod, notifyCompilerInliningEventInvokable, compileId, caller, callee, succeeded, message, bci);
     }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRPhase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,15 +52,7 @@ public static class Options {
         // @formatter:on
     }
 
-    /**
-     * Records time spent within {@link #apply}.
-     */
-    private final TimerKey timer;
-
-    /**
-     * Records memory usage within {@link #apply}.
-     */
-    private final MemUseTrackerKey memUseTracker;
+    private final LIRPhaseStatistics statistics;
 
     public static final class LIRPhaseStatistics {
         /**
@@ -73,6 +65,13 @@ public static final class LIRPhaseStatistics {
          */
         public final MemUseTrackerKey memUseTracker;
 
+        /**
+         * Cached phase name.
+         *
+         * @see LIRPhase#getName()
+         */
+        CharSequence phaseName;
+
         public LIRPhaseStatistics(Class<?> clazz) {
             timer = DebugContext.timer("LIRPhaseTime_%s", clazz);
             memUseTracker = DebugContext.memUseTracker("LIRPhaseMemUse_%s", clazz);
@@ -101,9 +100,7 @@ private static boolean checkName(CharSequence name) {
     }
 
     public LIRPhase() {
-        LIRPhaseStatistics statistics = getLIRPhaseStatistics(getClass());
-        timer = statistics.timer;
-        memUseTracker = statistics.memUseTracker;
+        this.statistics = getLIRPhaseStatistics(getClass());
     }
 
     /**
@@ -129,8 +126,8 @@ public final void apply(TargetDescription target, LIRGenerationResult lirGenRes,
         CharSequence name = getName();
         try (DebugContext.Scope s = debug.scope(name, this)) {
             try (CompilerPhaseScope cps = debug.enterCompilerPhase(name, null);
-                            DebugCloseable a = timer.start(debug);
-                            DebugCloseable c = memUseTracker.start(debug);
+                            DebugCloseable a = statistics.timer.start(debug);
+                            DebugCloseable c = statistics.memUseTracker.start(debug);
                             DebugCloseable d = gcStatistics(debug)) {
                 run(target, lirGenRes, context);
                 if (dumpLIR && debug.areScopesEnabled()) {
@@ -173,8 +170,13 @@ protected CharSequence createName() {
     }
 
     public final CharSequence getName() {
-        CharSequence name = createName();
+        CharSequence name = statistics.phaseName;
+        if (name != null) {
+            return name;
+        }
+        name = createName();
         assert checkName(name);
+        statistics.phaseName = name;
         return name;
     }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/BasePhase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -246,6 +246,13 @@ public static class BasePhaseStatistics {
          */
         private final MemUseTrackerKey memUseTracker;
 
+        /**
+         * Cached phase name.
+         *
+         * @see BasePhase#getName()
+         */
+        CharSequence phaseName;
+
         public BasePhaseStatistics(Class<?> clazz) {
             timer = DebugContext.timer("PhaseTime_%s", clazz).doc("Time spent in phase.");
             executionCount = DebugContext.counter("PhaseCount_%s", clazz).doc("Number of phase executions.");
@@ -604,10 +611,20 @@ public void changed(NodeEvent e, Node node) {
         }
     }
 
-    public CharSequence getName() {
+    private CharSequence createName() {
         return new ClassTypeSequence(this.getClass());
     }
 
+    public CharSequence getName() {
+        CharSequence name = statistics.phaseName;
+        if (name != null) {
+            return name;
+        }
+        name = createName();
+        statistics.phaseName = name;
+        return name;
+    }
+
     protected abstract void run(StructuredGraph graph, C context);
 
     @Override

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/ClassTypeSequence.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,13 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
- * A printable representation of the name of class that can serialized as a fully qualified type for
- * dumping. This is to support deobfuscation of dump output. The {@link #toString()} is the
+ * A printable representation of the name of class that can be serialized as a fully qualified type
+ * for dumping. This is to support deobfuscation of dump output. The {@link #toString()} is the
  * unqualified name of the Class.
  */
 public final class ClassTypeSequence implements JavaType, CharSequence {
     private final Class<?> clazz;
+    private String simpleName;
 
     public ClassTypeSequence(Class<?> clazz) {
         this.clazz = clazz;
@@ -56,8 +57,14 @@ public String toJavaName(boolean qualified) {
         if (qualified) {
             return clazz.getName();
         } else {
+            String name = this.simpleName;
+            if (name != null) {
+                return name;
+            }
             int lastDot = clazz.getName().lastIndexOf('.');
-            return clazz.getName().substring(lastDot + 1);
+            name = clazz.getName().substring(lastDot + 1);
+            this.simpleName = name;
+            return name;
         }
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -379,6 +379,7 @@ static JNIObjectHandle FindClass(JNIEnvironment env, CCharPointer cname) {
     static int RegisterNatives(JNIEnvironment env, JNIObjectHandle hclazz, JNINativeMethod methods, int nmethods) {
         Class<?> clazz = JNIObjectHandles.getObject(hclazz);
         Pointer p = (Pointer) methods;
+        String declaringClass = MetaUtil.toInternalName(clazz.getName());
         for (int i = 0; i < nmethods; i++) {
             JNINativeMethod entry = (JNINativeMethod) p;
             CharSequence name = Utf8.wrapUtf8CString(entry.name());
@@ -393,7 +394,6 @@ static int RegisterNatives(JNIEnvironment env, JNIObjectHandle hclazz, JNINative
 
             CFunctionPointer fnPtr = entry.fnPtr();
 
-            String declaringClass = MetaUtil.toInternalName(clazz.getName());
             JNINativeLinkage linkage = JNIReflectionDictionary.getLinkage(declaringClass, name, signature);
             if (linkage != null) {
                 linkage.setEntryPoint(fnPtr);