Merge remote-tracking branch 'origin/master' into labsjdk/adopt-26+12-master

Author: gilles-duboscq

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/replaycomp/test/ReplayCompilationTest.java

@@ -38,6 +38,8 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.oracle.truffle.api.Truffle;
@@ -46,6 +48,7 @@
 import jdk.graal.compiler.core.CompilationWrapper;
 import jdk.graal.compiler.core.GraalCompilerOptions;
 import jdk.graal.compiler.core.test.GraalCompilerTest;
+import jdk.graal.compiler.debug.DebugCloseable;
 import jdk.graal.compiler.debug.DebugOptions;
 import jdk.graal.compiler.debug.GlobalMetrics;
 import jdk.graal.compiler.debug.LogStream;
@@ -54,9 +57,11 @@
 import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
 import jdk.graal.compiler.hotspot.HotSpotGraalCompiler;
 import jdk.graal.compiler.hotspot.HotSpotGraalCompilerFactory;
+import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl;
 import jdk.graal.compiler.hotspot.replaycomp.CompilerInterfaceDeclarations;
 import jdk.graal.compiler.hotspot.replaycomp.ReplayCompilationRunner;
 import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import jdk.graal.compiler.runtime.RuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequestResult;
@@ -69,6 +74,25 @@
  * Tests for compilation recording and replay.
  */
 public class ReplayCompilationTest extends GraalCompilerTest {
+    /**
+     * A separate encoded snippet scope is necessary in case the global encoded snippets have cache
+     * replacements.
+     */
+    private static DebugCloseable snippetScope;
+
+    @BeforeClass
+    public static void setup() {
+        Providers providers = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getProviders();
+        HotSpotReplacementsImpl replacements = (HotSpotReplacementsImpl) providers.getReplacements();
+        snippetScope = replacements.suppressEncodedSnippets();
+        replacements.encode(getInitialOptions());
+    }
+
+    @AfterClass
+    public static void teardown() {
+        snippetScope.close();
+    }
+
     private static int[] lengthsSquared(List<String> strings) {
         return strings.stream().mapToInt(String::length).map(i -> i * i).toArray();
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/CompilationAlarm.java

@@ -71,14 +71,15 @@ public static class Options {
     private final CompilationAlarm previous;
 
     @SuppressWarnings("this-escape")
-    private CompilationAlarm(double period) {
+    private CompilationAlarm(double period, boolean skipZeros) {
         this.previous = currentAlarm.get();
         reset(period);
         JMXService.GCTimeStatistics timing = null;
         if (period != 0) {
             timing = GraalServices.getGCTimeStatistics();
         }
         this.gcTiming = timing;
+        this.skipZeros = skipZeros;
     }
 
     /**
@@ -113,7 +114,7 @@ public static double scaleExpirationPeriod(double period, OptionValues options)
      */
     private static final ThreadLocal<CompilationAlarm> currentAlarm = new ThreadLocal<>();
 
-    private static final CompilationAlarm NEVER_EXPIRES = new CompilationAlarm(0);
+    private static final CompilationAlarm NEVER_EXPIRES = new CompilationAlarm(0, false);
 
     /**
      * Gets the current compilation alarm. If there is no current alarm, a non-null value is
@@ -183,7 +184,8 @@ public boolean isEnabled() {
     public void checkExpiration() {
         if (hasExpired()) {
 
-            setCurrentNodeDuration(currentNode.name);
+            // also set all parent node times
+            setCurrentNodeDuration(currentNode.name, true);
 
             /*
              * We clone the phase tree here for the sake of the error message. We want to fix up the
@@ -194,7 +196,7 @@ public void checkExpiration() {
             StringBuilder sb = new StringBuilder();
             // also update the root time to be consistent for the error message
             cloneTree.durationNS = elapsed();
-            printTree("", sb, cloneTree, true);
+            printTree("", sb, cloneTree, true, skipZeros);
 
             // Include information about time spent in the GC if it's available.
             String gcMessage = "";
@@ -227,6 +229,11 @@ public void close() {
      */
     private final JMXService.GCTimeStatistics gcTiming;
 
+    /**
+     * On timeout skip zero entries.
+     */
+    private final boolean skipZeros;
+
     /**
      * Signal the execution of the phase identified by {@code name} starts.
      */
@@ -296,7 +303,7 @@ public void exitPhase(CharSequence name, StructuredGraph graph) {
             currentNode = currentNode.parent;
         }
         assert currentNode.name.equals(name) : Assertions.errorMessage("Must see the same phase that was opened in the close operation", name, elapsedPhaseTreeAsString());
-        setCurrentNodeDuration(name);
+        setCurrentNodeDuration(name, false);
         currentNode.closed = true;
         if (graph != null) {
             currentNode.graphSizeAfter = graph.getNodeCount();
@@ -316,9 +323,17 @@ private boolean graphMarksIntermediateRootEnd(StructuredGraph graph) {
         return currentNode instanceof PhaseTreeIntermediateRoot && currentNode.graph != null && graph != null && !currentNode.graph.equals(graph);
     }
 
-    private void setCurrentNodeDuration(CharSequence name) {
+    private void setCurrentNodeDuration(CharSequence name, boolean setParentTime) {
         assert currentNode.startTimeNS >= 0 : Assertions.errorMessage("Must have a positive start time", name, elapsedPhaseTreeAsString());
-        currentNode.durationNS = System.nanoTime() - currentNode.startTimeNS;
+        long currentTimeNano = System.nanoTime();
+        currentNode.durationNS = currentTimeNano - currentNode.startTimeNS;
+        if (setParentTime) {
+            PhaseTreeNode node = currentNode.parent;
+            while (node != null) {
+                node.durationNS = currentTimeNano - node.startTimeNS;
+                node = node.parent;
+            }
+        }
     }
 
     /**
@@ -413,6 +428,10 @@ public String toString() {
                             "->" + graphSizeAfter + "]";
         }
 
+        private boolean durationZeroInMS() {
+            return TimeUnit.NANOSECONDS.toMillis(durationNS) == 0;
+        }
+
     }
 
     private static class PhaseTreeIntermediateRoot extends PhaseTreeNode {
@@ -449,27 +468,34 @@ private PhaseTreeNode cloneTree(PhaseTreeNode clonee, PhaseTreeNode parent) {
     /**
      * Recursively print the phase tree represented by {@code node}.
      */
-    private void printTree(String indent, StringBuilder sb, PhaseTreeNode node, boolean printRoot) {
+    private void printTree(String indent, StringBuilder sb, PhaseTreeNode node, boolean printRoot, boolean skipPrintingZeroSubTree) {
         if (root == null) {
             return;
         }
-        sb.append(indent);
+        boolean skip = skipPrintingZeroSubTree && node.durationZeroInMS();
+        if (!skip) {
+            sb.append(indent);
+        }
         if (!printRoot && node == root) {
             sb.append(node.name);
         } else {
-            sb.append(node);
+            if (!skip) {
+                sb.append(node);
+            }
+        }
+        if (!skip) {
+            sb.append(System.lineSeparator());
         }
-        sb.append(System.lineSeparator());
-        if (node.children != null) {
+        if (node.children != null && !skip) {
             for (int i = 0; i < node.childIndex; i++) {
-                printTree(indent + "\t", sb, node.children[i], printRoot);
+                printTree(indent + "\t", sb, node.children[i], printRoot, skipPrintingZeroSubTree);
             }
         }
     }
 
     public StringBuilder elapsedPhaseTreeAsString() {
         StringBuilder sb = new StringBuilder();
-        printTree("", sb, root, false);
+        printTree("", sb, root, false, false);
         return sb;
     }
 
@@ -493,7 +519,7 @@ public static CompilationAlarm trackCompilationPeriod(OptionValues options) {
             }
             CompilationAlarm current = currentAlarm.get();
             if (current == null) {
-                current = new CompilationAlarm(period);
+                current = new CompilationAlarm(period, true/* skip 0 entries */);
                 currentAlarm.set(current);
                 return current;
             }
@@ -506,7 +532,7 @@ public static CompilationAlarm trackCompilationPeriod(OptionValues options) {
      * statement to restore the previous alarm state.
      */
     public static CompilationAlarm disable() {
-        CompilationAlarm current = new CompilationAlarm(0);
+        CompilationAlarm current = new CompilationAlarm(0, false);
         currentAlarm.set(current);
         return current;
     }

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

@@ -47,6 +47,7 @@
 import jdk.graal.compiler.core.common.type.StampPair;
 import jdk.graal.compiler.core.common.type.SymbolicJVMCIReference;
 import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.nodeinfo.Verbosity;
 import jdk.graal.compiler.nodes.ConstantNode;
@@ -250,12 +251,14 @@ StructuredGraph getEncodedSnippet(ResolvedJavaMethod method, ResolvedJavaMethod
             declaringClass = replacements.getProviders().getMetaAccess().lookupJavaType(Object.class);
         }
         /*
-         * If this is a recorded/replayed compilation, we must not mutate the snippet objects. This
-         * ensures we record all relevant operations during recording and no proxies are stored in
-         * the snippet objects during replay.
+         * If there is a possibility of a recorded/replayed compilation, we must not mutate the
+         * snippet objects. During recording, this ensures that we record all relevant operations
+         * and the cached objects are resolved to proxies. During replay, this ensures that no
+         * proxies are stored in the snippet objects.
          */
         boolean allowCacheReplacements = replacements.getProviders().getReplayCompilationSupport() == null &&
-                        GraalCompilerOptions.CompilationFailureAction.getValue(options) != CompilationWrapper.ExceptionAction.Diagnose;
+                        GraalCompilerOptions.CompilationFailureAction.getValue(options) != CompilationWrapper.ExceptionAction.Diagnose &&
+                        !DebugOptions.RecordForReplay.hasBeenSet(options);
         SymbolicEncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, allowCacheReplacements,
                         snippetNodeClasses, data.originalMethod, declaringClass);
         return decodeSnippetGraph(encodedGraph, method, original, replacements, args, allowAssumptions, options, true);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

@@ -790,7 +790,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
     }
 
     // @formatter:off
-    @SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L3016-L3070",
+    @SyncPort(from = "https://github.com/openjdk/jdk/blob/8e4485699235caff0074c4d25ee78539e57da63a/src/hotspot/share/opto/library_call.cpp#L3029-L3083",
               sha1 = "353e0d45b0f63ac58af86dcab5b19777950da7e2")
     // @formatter:on
     private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config, GraphBuilderContext b, ResolvedJavaMethod targetMethod, ForeignCallDescriptor descriptor,
@@ -839,7 +839,7 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
     }
 
     // @formatter:off
-    @SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L3835-L3919",
+    @SyncPort(from = "https://github.com/openjdk/jdk/blob/8e4485699235caff0074c4d25ee78539e57da63a/src/hotspot/share/opto/library_call.cpp#L3848-L3932",
               sha1 = "3e9cfba4d9554f7cd9ab392f0826a31ae6396193")
     // @formatter:on
     private static class ContinuationPinningPlugin extends InvocationPlugin {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/AssertionSnippets.java

@@ -90,7 +90,7 @@ public void lower(AssertionNode assertionNode, LoweringTool tool) {
             Arguments args = new Arguments(graph.start() instanceof StubStartNode ? stubAssertion : assertion, graph, tool.getLoweringStage());
             args.add("condition", assertionNode.condition());
             args.add("message",
-                            graph.unique(new ConstantNode(new CStringConstant("failed runtime assertion in snippet/stub: " + assertionNode.message() + " (" + graph.method() + ")"),
+                            graph.unique(new ConstantNode(new CStringConstant("failed runtime assertion in snippet/stub: " + assertionNode.message() + " (" + graph.method().format("%H.%n(%p)") + ")"),
                                             StampFactory.pointer())));
             args.add("l1", assertionNode.getL1());
             args.add("l2", assertionNode.getL2());

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java

@@ -43,7 +43,7 @@
 import jdk.graal.compiler.word.Word;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L4710-L4844",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/8e4485699235caff0074c4d25ee78539e57da63a/src/hotspot/share/opto/library_call.cpp#L4723-L4857",
           sha1 = "c212d1dbff26d02d4d749e085263d4104895f1ba")
 // @formatter:on
 public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java

@@ -64,7 +64,7 @@
  * Snippet for updating JFR thread local data on {@code Thread#setCurrentThread} events.
  */
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L3621-L3749",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/8e4485699235caff0074c4d25ee78539e57da63a/src/hotspot/share/opto/library_call.cpp#L3634-L3762",
           sha1 = "59f07096cdbe1aac79b1248db345e9616b54f4a4")
 // @formatter:on
 public class VirtualThreadUpdateJFRSnippets implements Snippets {

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

@@ -30,6 +30,7 @@
 import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESPECIAL;
 import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESTATIC;
 import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEVIRTUAL;
+import static jdk.graal.compiler.hotspot.HotSpotReplacementsImpl.isGraalClass;
 import static jdk.graal.compiler.java.StableMethodNameFormatter.isMethodHandle;
 
 import java.lang.reflect.Proxy;
@@ -48,6 +49,7 @@
 import jdk.graal.compiler.core.common.CompilerProfiler;
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider;
 import jdk.graal.compiler.hotspot.replaycomp.proxy.CompilationProxy;
 import jdk.graal.compiler.hotspot.replaycomp.proxy.CompilationProxyBase;
 import jdk.graal.compiler.hotspot.replaycomp.proxy.CompilerProfilerProxy;
@@ -66,6 +68,7 @@
 import jdk.graal.compiler.hotspot.replaycomp.proxy.SignatureProxy;
 import jdk.graal.compiler.hotspot.replaycomp.proxy.SpeculationLogProxy;
 import jdk.graal.compiler.java.LambdaUtils;
+import jdk.graal.compiler.options.ExcludeFromJacocoGeneratedReport;
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
@@ -703,6 +706,7 @@ public static CompilerInterfaceDeclarations build() {
                     }
                     return List.of();
                 })
+                .setFallbackInvocationHandler(HotSpotResolvedObjectTypeProxy.isInstanceMethod, CompilerInterfaceDeclarations::objectTypeIsInstanceFallback)
                 .register(declarations);
         // Must come after HotSpotResolvedObjectType. Needed for HotSpotResolvedPrimitiveType.
         new RegistrationBuilder<>(HotSpotResolvedJavaType.class)
@@ -921,4 +925,27 @@ private static ResolvedJavaType javaLangObjectSupplier(Object proxy, Compilation
         MetaAccessProvider metaAccess = (MetaAccessProvider) singletonObjects.get(MetaAccessProvider.class);
         return metaAccess.lookupJavaType(Object.class);
     }
+
+    /**
+     * Implements a fallback for {@link HotSpotResolvedObjectType#isInstance} calls performed by
+     * {@link HotSpotGraalConstantFieldProvider} when replaying a libgraal compilation on jargraal.
+     * <p>
+     * The provider performs checks like {@code getHotSpotVMConfigType().isInstance(receiver)},
+     * which use snippet types on libgraal and HotSpot types on jargraal. Replay on jargraal needs
+     * to answer these queries when the receiver and argument are HotSpot proxies.
+     */
+    @SuppressWarnings("unused")
+    @ExcludeFromJacocoGeneratedReport("related to replay of libgraal compilations on jargraal")
+    private static boolean objectTypeIsInstanceFallback(Object proxy, CompilationProxy.SymbolicMethod method, Object[] args, EconomicMap<Class<?>, Object> singletonObjects) {
+        HotSpotResolvedObjectType receiverType = (HotSpotResolvedObjectType) proxy;
+        if (!(args[0] instanceof HotSpotObjectConstant objectConstant)) {
+            return false;
+        }
+        HotSpotResolvedObjectType constantType = objectConstant.getType();
+        if (isGraalClass(receiverType) && !isGraalClass(constantType)) {
+            // Assumes that only a Graal class can subtype a Graal class.
+            return false;
+        }
+        return receiverType.isAssignableFrom(constantType);
+    }
 }

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

@@ -241,7 +241,7 @@ public final boolean isAssignableFrom(ResolvedJavaType other) {
         return (boolean) handle(isAssignableFromMethod, isAssignableFromInvokable, other);
     }
 
-    private static final SymbolicMethod isInstanceMethod = method("isInstance", JavaConstant.class);
+    public static final SymbolicMethod isInstanceMethod = method("isInstance", JavaConstant.class);
     private static final InvokableMethod isInstanceInvokable = (receiver, args) -> ((HotSpotResolvedJavaType) receiver).isInstance((JavaConstant) args[0]);
 
     @Override

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64EncodeArrayOp.java

@@ -51,8 +51,8 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L6422-L6535",
-          sha1 = "80e6323172af5e8a33625b4eb14629cdad500a0f")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/8e4485699235caff0074c4d25ee78539e57da63a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L6422-L6539",
+          sha1 = "7ec995886d9acb20550c9ed4a7fdbe9051043589")
 // @formatter:on
 @Opcode("AArch64_ENCODE_ARRAY")
 public final class AArch64EncodeArrayOp extends AArch64ComplexVectorOp {