Merge with master.

Author: christianhaeubl

ci/common.jsonnet

@@ -121,7 +121,7 @@ local common_json = import "../common.json";
 
     graalnodejs:: {
       packages+: if self.os == "linux" then {
-        "00:devtoolset": "==7",
+        "00:devtoolset": "==11",
         cmake: "==3.22.2",
       } else {},
     },
@@ -141,11 +141,8 @@ local common_json = import "../common.json";
         "*.log",
       ],
 
-      packages+: if self.os == "linux" && self.arch == "amd64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
-        "00:devtoolset": "==7",
-        "01:binutils": ">=2.34",
-      } else if self.os == "linux" && self.arch == "aarch64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
-        "00:devtoolset": "==7",
+      packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
+        "00:devtoolset": "==11",
       } else {},
     },
   },

compiler/ci/ci.jsonnet

@@ -1,12 +1,10 @@
 {
   local utils = (import '../../ci/ci_common/common-utils.libsonnet'),
-  local graal = (import 'ci_includes/gate.jsonnet'),
   local graal_common = (import 'ci_common/gate.jsonnet'),
   local graal_benchmarks = (import 'ci_common/benchmark-builders.jsonnet'),
   local baseline_benchmarks = (import 'ci_includes/baseline-benchmarks.jsonnet'),
 
   builds: [utils.add_gate_predicate(b, ["sdk", "truffle", "compiler"]) for b in
-    graal.builds +
     graal_common.builds +
     graal_benchmarks.builds +
     baseline_benchmarks.builds

compiler/ci/ci_common/gate.jsonnet

@@ -185,18 +185,23 @@
 
   manifest_match(manifest, name):: [key for key in std.objectFields(manifest) if key_matches_value(key, name)] != [],
 
+  # Request nodes with at least 16GB of RAM
+  ram16gb:: {
+    capabilities+: ["ram16gb"],
+  },
+
   # This map defines the builders that run as gates. Each key in this map
   # must correspond to the name of a build created by `make_build`.
   # Each value in this map is an object that overrides or extends the
   # fields of the denoted build.
   local gates = {
     "gate-compiler-test-labsjdk-21-linux-amd64": t("1:00:00") + c.mach5_target,
     "gate-compiler-test-labsjdk-21-linux-aarch64": t("1:50:00"),
-    "gate-compiler-test-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target,
+    "gate-compiler-test-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
     "gate-compiler-test-labsjdk-21-darwin-aarch64": t("1:00:00"),
     "gate-compiler-test_zgc-labsjdk-21-linux-amd64": t("1:00:00") + c.mach5_target,
     "gate-compiler-test_zgc-labsjdk-21-linux-aarch64": t("1:50:00"),
-    "gate-compiler-test_zgc-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target,
+    "gate-compiler-test_zgc-labsjdk-21-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
     "gate-compiler-test_zgc-labsjdk-21-darwin-aarch64": t("1:00:00"),
 
     "gate-compiler-style-labsjdk-20-linux-amd64": t("45:00"),

compiler/ci/ci_includes/gate.jsonnet

@@ -1,7 +1,7 @@
 org.graalvm.compiler.replacements.processor.ReplacementsAnnotationProcessor
 org.graalvm.compiler.nodeinfo.processor.GraphNodeProcessor
 org.graalvm.compiler.lir.processor.IntrinsicStubProcessor
-org.graalvm.compiler.lir.processor.StubPortProcessor
+org.graalvm.compiler.lir.processor.SyncPortProcessor
 org.graalvm.compiler.core.match.processor.MatchProcessor
 org.graalvm.compiler.options.processor.OptionProcessor
 org.graalvm.compiler.serviceprovider.processor.ServiceProviderProcessor

compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor

@@ -85,7 +85,7 @@
 import org.graalvm.compiler.hotspot.replacements.UnsafeCopyMemoryNode;
 import org.graalvm.compiler.hotspot.word.HotSpotWordTypes;
 import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.lir.StubPort;
+import org.graalvm.compiler.lir.SyncPort;
 import org.graalvm.compiler.nodes.BeginNode;
 import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -659,11 +659,8 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
     }
 
     // @formatter:off
-    @StubPort(path      = "src/hotspot/share/opto/library_call.cpp",
-              lineStart = 2861,
-              lineEnd   = 2922,
-              commit    = "1fc726a8b34fcd41dae12a6d7c63232f9ccef3f4",
-              sha1      = "c2d981ab918e2ca607835df010221ba0503a0cb2")
+    @SyncPort(from = "https://github.com/openjdk/jdk/blob/1fc726a8b34fcd41dae12a6d7c63232f9ccef3f4/src/hotspot/share/opto/library_call.cpp#L2861-L2922",
+              sha1 = "c2d981ab918e2ca607835df010221ba0503a0cb2")
     // @formatter:on
     private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config, GraphBuilderContext b, ResolvedJavaMethod targetMethod, ForeignCallDescriptor descriptor,
                     ValueNode virtualThread, ValueNode hide) {

compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/StubPortProcessor.java renamed to compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/SyncPortProcessor.java

@@ -36,17 +36,14 @@
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
 
-import org.graalvm.compiler.lir.StubPort;
+import org.graalvm.compiler.lir.SyncPort;
 import org.graalvm.compiler.replacements.IdentityHashCodeSnippets;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.word.WordFactory;
 
 // @formatter:off
-@StubPort(path      = "src/hotspot/share/opto/library_call.cpp",
-          lineStart = 4455,
-          lineEnd   = 4579,
-          commit    = "1fc726a8b34fcd41dae12a6d7c63232f9ccef3f4",
-          sha1      = "34281fb78c4f0657a704dbda3e3cc85ed56dd2ad")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/1fc726a8b34fcd41dae12a6d7c63232f9ccef3f4/src/hotspot/share/opto/library_call.cpp#L4455-L4579",
+          sha1 = "34281fb78c4f0657a704dbda3e3cc85ed56dd2ad")
 // @formatter:on
 public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {
 

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

@@ -111,7 +111,7 @@
 import org.graalvm.compiler.hotspot.nodes.FastAcquireBiasedLockNode;
 import org.graalvm.compiler.hotspot.nodes.MonitorCounterNode;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.lir.StubPort;
+import org.graalvm.compiler.lir.SyncPort;
 import org.graalvm.compiler.nodes.BreakpointNode;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -234,12 +234,9 @@
  */
 
 // @formatter:off
-@StubPort(path      = "src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp",
-          lineStart = 474,
-          lineEnd   = 932,
-          ignore    = "GR-46070",
-          commit    = "12358e6c94bc96e618efc3ec5299a2cfe1b4669d",
-          sha1      = "156f7ed664c43a213c5eb3c417c8c5c29432cd2e")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/12358e6c94bc96e618efc3ec5299a2cfe1b4669d/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L474-L932",
+          ignore = "GR-46070",
+          sha1 = "156f7ed664c43a213c5eb3c417c8c5c29432cd2e")
 // @formatter:on
 public class MonitorSnippets implements Snippets {
 

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java

@@ -46,7 +46,7 @@
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
 import org.graalvm.compiler.hotspot.nodes.VirtualThreadUpdateJFRNode;
-import org.graalvm.compiler.lir.StubPort;
+import org.graalvm.compiler.lir.SyncPort;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
 import org.graalvm.compiler.nodes.extended.MembarNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
@@ -64,11 +64,8 @@
  * Snippet for updating JFR thread local data on {@code Thread#setCurrentThread} events.
  */
 // @formatter:off
-@StubPort(path      = "src/hotspot/share/opto/library_call.cpp",
-          lineStart = 3429,
-          lineEnd   = 3555,
-          commit    = "1fc726a8b34fcd41dae12a6d7c63232f9ccef3f4",
-          sha1      = "1f980401f5d7d9a363577635fd57fc1e24505d91")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/1fc726a8b34fcd41dae12a6d7c63232f9ccef3f4/src/hotspot/share/opto/library_call.cpp#L3429-L3555",
+          sha1 = "1f980401f5d7d9a363577635fd57fc1e24505d91")
 // @formatter:on
 public class VirtualThreadUpdateJFRSnippets implements Snippets {