Merge branch 'master' into labsjdk/adopt-25+23-master

Author: jovanstevanovic

.github/workflows/micronaut.yml

@@ -41,9 +41,6 @@
 name: Weekly Micronaut Tests
 
 on:
-  push:
-    paths:
-      - '.github/workflows/micronaut.yml'
   pull_request:
     paths:
       - '.github/workflows/micronaut.yml'

.github/workflows/ni-layers.yml

@@ -41,10 +41,6 @@
 name: Weekly Native Image Layer Building Tests
 
 on:
-  push:
-    paths:
-      - '.github/workflows/ni-layers.yml'
-      - 'vm/tests/gh_workflows/NILayerTests/**'
   pull_request:
     paths:
       - '.github/workflows/ni-layers.yml'

.github/workflows/quarkus.yml

@@ -41,9 +41,6 @@
 name: Weekly Quarkus Tests
 
 on:
-  push:
-    paths:
-      - '.github/workflows/quarkus.yml'
   pull_request:
     paths:
       - '.github/workflows/quarkus.yml'

.github/workflows/reachability-metadata.yml

@@ -41,9 +41,6 @@
 name: Weekly Reachability Metadata Tests
 
 on:
-  push:
-    paths:
-      - '.github/workflows/reachability-metadata.yml'
   pull_request:
     paths:
       - '.github/workflows/reachability-metadata.yml'

.github/workflows/spring.yml

@@ -41,9 +41,6 @@
 name: Weekly Spring Tests
 
 on:
-  push:
-    paths:
-      - '.github/workflows/spring.yml'
   pull_request:
     paths:
       - '.github/workflows/spring.yml'

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -29,15 +29,16 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import jdk.graal.compiler.api.test.Graal;
-import jdk.graal.compiler.runtime.RuntimeProvider;
 import org.junit.Test;
 
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.impl.DefaultTruffleRuntime;
 import com.oracle.truffle.api.impl.TVMCI;
 
+import jdk.graal.compiler.api.test.Graal;
+import jdk.graal.compiler.runtime.RuntimeProvider;
+
 public class TruffleRuntimeTest {
 
     @Test
@@ -75,12 +76,4 @@ public void testGetCapabilityObjectClass() {
         assertNull("Expected null return value for Object.class", object);
     }
 
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testGetLayoutFactory() {
-        TruffleRuntime runtime = Truffle.getRuntime();
-        com.oracle.truffle.api.object.LayoutFactory layoutFactory = runtime.getCapability(com.oracle.truffle.api.object.LayoutFactory.class);
-        assertNotNull("LayoutFactory not found", layoutFactory);
-        // Rely on modules to only load trusted service providers
-    }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopTransformations.java

@@ -370,8 +370,6 @@ public static PreMainPostResult insertPrePostLoops(Loop loop) {
         AbstractMergeNode postMergeNode = postEndNode.merge();
         graph.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, graph, "After post loop duplication");
 
-        preLoopBegin.incrementSplits();
-        preLoopBegin.incrementSplits();
         preLoopBegin.setPreLoop();
         mainLoopBegin.setMainLoop();
         postLoopBegin.setPostLoop();
@@ -454,8 +452,18 @@ public static PreMainPostResult insertPrePostLoops(Loop loop) {
         assert mainLoopExitNode.predecessor() instanceof IfNode : Assertions.errorMessage(mainLoopExitNode);
         assert postLoopExitNode.predecessor() instanceof IfNode : Assertions.errorMessage(postLoopExitNode);
 
-        setSingleVisitedLoopFrequencySplitProbability(preLoopExitNode);
-        setSingleVisitedLoopFrequencySplitProbability(postLoopExitNode);
+        /*
+         * The bodies of pre and post loops are assumed to be executed just once. As the local loop
+         * frequency is calculated from the loop exit probabilities, it has to be taken into account
+         * how often the exit check is performed. If the loop is inverted, i.e., tail-counted, the
+         * exit will be taken at the end of the first body execution. Thus, the frequency of the
+         * exit check is 1. If the loop is head-counted, the exit check will be performed twice,
+         * which is reflected by a frequency of 2. This results in the correct relative frequency
+         * being propagated into the loop body.
+         */
+        final int prePostFrequency = loop.counted().isInverted() ? 1 : 2;
+        adaptCountedLoopExitProbability(preLoopExitNode, prePostFrequency);
+        adaptCountedLoopExitProbability(postLoopExitNode, prePostFrequency);
 
         if (graph.isAfterStage(StageFlag.VALUE_PROXY_REMOVAL)) {
             // The pre and post loops don't require safepoints at all
@@ -473,7 +481,8 @@ public static PreMainPostResult insertPrePostLoops(Loop loop) {
 
     /**
      * Inject a split probability for the (counted) loop check that will result in a loop frequency
-     * of 1 (in case this is the only loop exit).
+     * of 1 (in case this is the only loop exit). This implies that the loop body is expected to be
+     * never entered.
      */
     private static void setSingleVisitedLoopFrequencySplitProbability(AbstractBeginNode lex) {
         IfNode ifNode = ((IfNode) lex.predecessor());
@@ -482,11 +491,12 @@ private static void setSingleVisitedLoopFrequencySplitProbability(AbstractBeginN
     }
 
     /**
-     * Inject a new frequency for the condition dominating the given loop exit path. This
-     * calculation will act as if the given loop exit is the only exit of the loop.
+     * Inject a new branch probability for the condition dominating the given loop exit path. This
+     * probability is based on the local frequency of the exit check. This calculation will act as
+     * if the given loop exit is the only exit of the loop.
      */
-    public static void adaptCountedLoopExitProbability(AbstractBeginNode lex, double newFrequency) {
-        double probability = 1.0D - 1.0D / newFrequency;
+    public static void adaptCountedLoopExitProbability(AbstractBeginNode lex, double newExitCheckFrequency) {
+        double probability = 1.0D - 1.0D / newExitCheckFrequency;
         if (probability <= 0D) {
             setSingleVisitedLoopFrequencySplitProbability(lex);
             return;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopBeginNode.java

@@ -210,7 +210,6 @@ public LoopBeginNode() {
         super(TYPE);
         loopOrigFrequency = 1;
         unswitches = 0;
-        splits = 0;
         loopEndsSafepointState = SafepointState.ENABLED;
         loopExitsSafepointState = SafepointState.ENABLED;
         guestLoopEndsSafepointState = SafepointState.ENABLED;
@@ -483,10 +482,6 @@ public EndNode forwardEnd() {
         return forwardEndAt(0);
     }
 
-    public void incrementSplits() {
-        splits++;
-    }
-
     public int peelings() {
         return peelings;
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroInvokable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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,6 +26,7 @@
 
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
 
+import jdk.graal.compiler.core.common.type.ObjectStamp;
 import jdk.graal.compiler.core.common.type.StampPair;
 import jdk.graal.compiler.debug.Assertions;
 import jdk.graal.compiler.debug.DebugContext;
@@ -89,6 +90,13 @@ public interface MacroInvokable extends Invokable, Lowerable, StateSplit, Single
      */
     NodeInputList<ValueNode> getArguments();
 
+    /**
+     * Gets {@linkplain #getArguments() the arguments} for this macro node as an array.
+     */
+    default ValueNode[] toArgumentArray() {
+        return getArguments().toArray(ValueNode.EMPTY_ARRAY);
+    }
+
     /**
      * @see #getArguments()
      */
@@ -197,4 +205,21 @@ default MethodCallTargetNode createCallTarget() {
      * {@link Invoke} later.
      */
     void addMethodHandleInfo(ResolvedMethodHandleCallTargetNode methodHandle);
+
+    /**
+     * Build a new copy of the {@link MacroNode.MacroParams} stored in this node.
+     */
+    default MacroNode.MacroParams copyParams() {
+        return new MacroNode.MacroParams(getInvokeKind(), getContextMethod(), getTargetMethod(), bci(), getReturnStamp(), toArgumentArray());
+    }
+
+    /**
+     * Builds a new copy of this node's macro parameters, but with the return stamp replaced by the
+     * trusted {@code newStamp}.
+     */
+    default MacroNode.MacroParams copyParamsWithImprovedStamp(ObjectStamp newStamp) {
+        GraalError.guarantee(newStamp.join(getReturnStamp().getTrustedStamp()).equals(newStamp), "stamp should improve from %s to %s", getReturnStamp(), newStamp);
+        StampPair improvedReturnStamp = StampPair.createSingle(newStamp);
+        return new MacroNode.MacroParams(getInvokeKind(), getContextMethod(), getTargetMethod(), bci(), improvedReturnStamp, toArgumentArray());
+    }
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroNode.java

@@ -30,7 +30,6 @@
 
 import org.graalvm.word.LocationIdentity;
 
-import jdk.graal.compiler.core.common.type.ObjectStamp;
 import jdk.graal.compiler.core.common.type.StampPair;
 import jdk.graal.compiler.debug.DebugCloseable;
 import jdk.graal.compiler.debug.GraalError;
@@ -187,10 +186,6 @@ public NodeInputList<ValueNode> getArguments() {
         return arguments;
     }
 
-    public ValueNode[] toArgumentArray() {
-        return arguments.toArray(ValueNode.EMPTY_ARRAY);
-    }
-
     @Override
     public int bci() {
         return bci;
@@ -243,15 +238,6 @@ public final boolean hasSideEffect() {
         return true;
     }
 
-    /**
-     * Returns {@code true} if the lowered version of the macro, or the fallback invoke, can
-     * deoptimize in any way or throw any implicit or explicit exception. Such nodes should be
-     * represented as {@link MacroWithExceptionNode} in SVM runtime compilations.
-     */
-    public boolean canDeoptimizeOrThrow() {
-        return true;
-    }
-
     /**
      * Returns {@link LocationIdentity#any()}. This node needs to kill any location because it might
      * get {@linkplain MacroInvokable#replaceWithInvoke() replaced with an invoke} and
@@ -310,21 +296,4 @@ public void addMethodHandleInfo(ResolvedMethodHandleCallTargetNode methodHandle)
         originalTargetMethod = methodHandle.originalTargetMethod;
         originalArguments.addAll(methodHandle.originalArguments);
     }
-
-    /**
-     * Build a new copy of the {@link MacroParams} stored in this node.
-     */
-    public MacroParams copyParams() {
-        return new MacroParams(invokeKind, callerMethod, targetMethod, bci, returnStamp, toArgumentArray());
-    }
-
-    /**
-     * Builds a new copy of this node's macro parameters, but with the return stamp replaced by the
-     * trusted {@code newStamp}.
-     */
-    protected MacroParams copyParamsWithImprovedStamp(ObjectStamp newStamp) {
-        GraalError.guarantee(newStamp.join(returnStamp.getTrustedStamp()).equals(newStamp), "stamp should improve from %s to %s", returnStamp, newStamp);
-        StampPair improvedReturnStamp = StampPair.createSingle(newStamp);
-        return new MacroParams(invokeKind, callerMethod, targetMethod, bci, improvedReturnStamp, toArgumentArray());
-    }
 }