Automatic merge of master into galahad

OracleLabsAutomation · OracleLabsAutomation · commit 251acc5a9f19 · 2025-07-31T01:48:31.000Z
diff --git a/espresso-compiler-stub/mx.espresso-compiler-stub/suite.py b/espresso-compiler-stub/mx.espresso-compiler-stub/suite.py
@@ -22,7 +22,7 @@
 #
 
 suite = {
-    "mxversion": "7.33.0",
+    "mxversion": "7.58.0",
     "name": "espresso-compiler-stub",
     "version": "24.2.0",
     "release": False,
diff --git a/espresso-shared/mx.espresso-shared/suite.py b/espresso-shared/mx.espresso-shared/suite.py
@@ -23,7 +23,7 @@
 # questions.
 #
 suite = {
-    "mxversion": "7.55.2",
+    "mxversion": "7.58.0",
     "name": "espresso-shared",
     "version" : "26.0.0",
     "release" : False,
diff --git a/espresso/ci/ci.jsonnet b/espresso/ci/ci.jsonnet
@@ -9,7 +9,7 @@
   vm_guard_includes: [],
 
   local espresso_compiler_stub_gate = common.eclipse + common.jdt + common.predicates(true, true, false) +
-   common.espresso_gate(allow_warnings=false, tags='style,fullbuild', timelimit='35:00', name='gate-espresso-compiler-stub-style-jdkLatest-linux-amd64', imports='/substratevm') + {
+   common.espresso_gate(allow_warnings=false, tags='style,fullbuild', timelimit='35:00', name='gate-espresso-compiler-stub-style-jdkLatest-linux-amd64', imports='/substratevm', mx_args=['--native-images=false']) + {
     setup+: [
       ['cd', "../espresso-compiler-stub"],
     ],
@@ -28,8 +28,8 @@
   },
 
   local _builds = common.builds + [
-    common.jdkLatest_gate_linux_amd64 + espresso_compiler_stub_gate,
-    common.jdkLatest_gate_linux_amd64 + espresso_shared_gate,
+    common.jdkLatest_tier1_linux_amd64 + espresso_compiler_stub_gate,
+    common.jdkLatest_tier1_linux_amd64 + espresso_shared_gate,
     // Benchmarks
     // AWFY peak perf. benchmarks
     common.jdk21_weekly_bench_linux    + common.espresso_benchmark('jvm-ce-llvm', 'awfy:*'                                        , extra_args=['--vm.Xmx1g', '--vm.Xms1g'])         + {name: 'weekly-bench-espresso-jvm-ce-awfy-jdk21onLatest-linux-amd64'},
diff --git a/espresso/ci/ci_common/common.jsonnet b/espresso/ci/ci_common/common.jsonnet
@@ -117,7 +117,10 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   },
 
   // generic targets
-  gate:            {targets+: ['gate'], timelimit: "1:00:00"},
+  tier1:           {targets+: ['tier1'],               notify_groups:: ['espresso']},
+  tier2:           {targets+: ['tier2'],               notify_groups:: ['espresso']},
+  tier3:           {targets+: ['tier3'],               notify_groups:: ['espresso']},
+  tier4:           {targets+: ['tier4'],               notify_groups:: ['espresso']},
   postMerge:       {targets+: ['post-merge'],          notify_groups:: ['espresso']},
   dailyBench:      {targets+: ['bench', 'daily'],      notify_groups:: ['espresso']},
   daily:           {targets+: ['daily'],               notify_groups:: ['espresso']},
@@ -148,11 +151,12 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
 
 
   // precise targets and capabilities
-  jdk21_gate_linux_amd64        : self.gate          + self.linux_amd64_21,
-  jdk21_gate_linux_aarch64      : self.gate          + self.linux_aarch64_21,
-  jdk21_gate_darwin_amd64       : self.gate          + self.darwin_amd64_21,
-  jdk21_gate_darwin_aarch64     : self.gate          + self.darwin_aarch64_21,
-  jdk21_gate_windows_amd64      : self.gate          + self.windows_21,
+  jdk21_tier1_linux_amd64       : self.tier1         + self.linux_amd64_21,
+  jdk21_tier2_linux_amd64       : self.tier2         + self.linux_amd64_21,
+  jdk21_tier3_linux_amd64       : self.tier3         + self.linux_amd64_21,
+  jdk21_tier3_linux_aarch64     : self.tier3         + self.linux_aarch64_21,
+  jdk21_tier3_darwin_aarch64    : self.tier3         + self.darwin_aarch64_21,
+  jdk21_tier4_linux_amd64       : self.tier4         + self.linux_amd64_21,
   jdk21_bench_linux             : self.bench         + self.linux_amd64_21 + self.x52,
   jdk21_bench_darwin            : self.bench         + self.darwin_amd64_21,
   jdk21_bench_windows           : self.bench         + self.windows_21,
@@ -188,20 +192,25 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   jdk21_on_demand_bench_darwin  : self.onDemandBench + self.darwin_amd64_21,
   jdk21_on_demand_bench_windows : self.onDemandBench + self.windows_21,
 
-  jdk25_gate_linux_amd64        : self.gate          + self.linux_amd64_25,
-  jdk25_gate_linux_aarch64      : self.gate          + self.linux_aarch64_25,
-  jdk25_gate_darwin_amd64       : self.gate          + self.darwin_amd64_25,
-  jdk25_gate_darwin_aarch64     : self.gate          + self.darwin_aarch64_25,
-  jdk25_gate_windows_amd64      : self.gate          + self.windows_25,
+  jdk25_tier1_linux_amd64       : self.tier1          + self.linux_amd64_25,
+  jdk25_tier2_linux_amd64       : self.tier2          + self.linux_amd64_25,
+  jdk25_tier3_linux_amd64       : self.tier3         + self.linux_amd64_25,
+  jdk25_tier3_linux_aarch64     : self.tier3         + self.linux_aarch64_25,
+  jdk25_tier3_darwin_aarch64    : self.tier3         + self.darwin_aarch64_25,
+  jdk25_tier4_linux_amd64       : self.tier4         + self.linux_amd64_25,
+  jdk25_tier4_linux_aarch64     : self.tier4         + self.linux_aarch64_25,
   jdk25_daily_linux_amd64       : self.daily         + self.linux_amd64_25,
   jdk25_daily_linux_aarch64     : self.daily         + self.linux_aarch64_25,
   jdk25_daily_darwin_amd64      : self.daily         + self.darwin_amd64_25,
   jdk25_daily_darwin_aarch64    : self.daily         + self.darwin_aarch64_25,
   jdk25_daily_windows_amd64     : self.daily         + self.windows_25,
   jdk25_weekly_linux_amd64      : self.weekly        + self.linux_amd64_25,
 
-  jdkLatest_gate_linux_amd64    : self.gate          + self.linux_amd64_latest,
+  jdkLatest_tier1_linux_amd64   : self.tier1         + self.linux_amd64_latest,
+  jdkLatest_tier2_linux_amd64   : self.tier2         + self.linux_amd64_latest,
+  jdkLatest_tier3_linux_amd64   : self.tier3         + self.linux_amd64_latest,
   jdkLatest_daily_linux_amd64   : self.daily         + self.linux_amd64_latest,
+  jdkLatest_daily_linux_aarch64 : self.daily         + self.linux_aarch64_latest,
   jdkLatest_weekly_linux_amd64  : self.weekly        + self.linux_amd64_latest,
   jdkLatest_weekly_linux_aarch64: self.weekly        + self.linux_aarch64_latest,
 
@@ -341,7 +350,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
 
   local _builds = [
     // Gates
-    that.jdk21_gate_linux_amd64 + that.eclipse + that.jdt + that.predicates(false, false, false) + that.espresso_gate(allow_warnings=false, tags='style,fullbuild,imports', timelimit='35:00', name='gate-espresso-style-jdk21onLatest-linux-amd64'),
+    that.jdk21_tier1_linux_amd64 + that.eclipse + that.jdt + that.predicates(false, false, false) + that.espresso_gate(allow_warnings=false, tags='style,fullbuild,imports', timelimit='35:00', name='gate-espresso-style-jdk21onLatest-linux-amd64'),
   ],
 
   builds: utils.add_defined_in(_builds, std.thisFile),
diff --git a/espresso/mx.espresso/suite.py b/espresso/mx.espresso/suite.py
@@ -22,7 +22,7 @@
 #
 
 suite = {
-    "mxversion": "7.55.2",
+    "mxversion": "7.58.0",
     "name": "espresso",
     "version" : "26.0.0",
     "release" : False,
diff --git a/substratevm/src/com.oracle.svm.jdwp.resident/src/com/oracle/svm/jdwp/resident/impl/ResidentJDWP.java b/substratevm/src/com.oracle.svm.jdwp.resident/src/com/oracle/svm/jdwp/resident/impl/ResidentJDWP.java
@@ -45,7 +45,6 @@
 import com.oracle.svm.core.interpreter.InterpreterFrameSourceInfo;
 import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
 import com.oracle.svm.core.locks.VMMutex;
-import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.thread.VMThreads;
 import com.oracle.svm.core.util.VMError;
@@ -398,7 +397,9 @@ private static long[] getAllThreadIds() {
             mutex.unlock();
         }
         ids = Arrays.copyOf(ids, i);
-        Log.log().string("getAllThreadIds(): " + Arrays.toString(ids)).newline();
+        if (LOGGER.isLoggable()) {
+            LOGGER.log("getAllThreadIds(): " + Arrays.toString(ids));
+        }
         return ids;
     }
 
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedCallTarget.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedCallTarget.java
@@ -369,7 +369,14 @@ public Class<?> getType() {
     protected OptimizedCallTarget(OptimizedCallTarget sourceCallTarget, RootNode rootNode) {
         assert sourceCallTarget == null || sourceCallTarget.sourceCallTarget == null : "Cannot create a clone of a cloned CallTarget";
         this.sourceCallTarget = sourceCallTarget;
-        this.speculationLog = sourceCallTarget != null ? sourceCallTarget.getSpeculationLog() : null;
+        /*
+         * Don't share the source's speculation log. Different splits of the same call target can be
+         * very different. Moreover, the signatures used for speculations of the deopt cycle
+         * detection algorithm don't include call target ids, so two same compilations of two
+         * different splits of the same call target would produce a false positive if the
+         * speculation log was shared.
+         */
+        this.speculationLog = null;
         this.rootNode = rootNode;
         this.engine = OptimizedTVMCI.getEngineData(rootNode);
         this.resetCompilationProfile();

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`#`
`23`	`23`
`24`	`24`	`suite = {`
`25`		`- "mxversion": "7.33.0",`
	`25`	`+ "mxversion": "7.58.0",`
`26`	`26`	`"name": "espresso-compiler-stub",`
`27`	`27`	`"version": "24.2.0",`
`28`	`28`	`"release": False,`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`# questions.`
`24`	`24`	`#`
`25`	`25`	`suite = {`
`26`		`- "mxversion": "7.55.2",`
	`26`	`+ "mxversion": "7.58.0",`
`27`	`27`	`"name": "espresso-shared",`
`28`	`28`	`"version" : "26.0.0",`
`29`	`29`	`"release" : False,`