[GR-55515] Disable JDK 21 support in Graal Compiler

PullRequest: graal/20406

Author: zapster

compiler/ci/ci_common/gate.jsonnet

@@ -235,7 +235,6 @@
     # Style jobs need to stay on a JDK compatible with all the style
     # checking tools (SpotBugs, Checkstyle, Eclipse formatter etc).
     "gate-compiler-style-labsjdk-latest-linux-amd64": t("45:00"),
-    "gate-compiler-build-labsjdk-21-linux-amd64": t("25:00"),
 
     "gate-compiler-ctw-labsjdk-latest-linux-amd64": {},
     "gate-compiler-ctw-labsjdk-latest-windows-amd64": t("1:50:00"),
@@ -495,12 +494,6 @@
         JVMCI_VERSION_CHECK: "strict",
       },
   }],
-  local jdk_21_version_check_builds = [self.make_build("21", "linux-amd64", "build", extra_tasks={build:: s.base("build"),}).build + galahad.exclude {
-      environment+: {
-        # Run the strict JVMCI version check, i.e., that JVMCIVersionCheck.JVMCI_MIN_VERSION matches the versions in common.json.
-        JVMCI_VERSION_CHECK: "strict",
-      },
-  }],
 
   # Builds run on only on linux-amd64-jdk-latestDebug
   local jdk_latestDebug_builds = [self.make_build("LatestDebug", os_arch, task).build
@@ -520,7 +513,6 @@
     all_zgc_builds +
     all_serialgc_builds +
     style_builds +
-    jdk_21_version_check_builds +
     linux_amd64_jdk_latest_builds +
     jdk_latestDebug_builds,
 

compiler/mx.compiler/mx_compiler.py

@@ -168,8 +168,8 @@ def __str__(self):
 _jdk_jvmci_version = None
 _jdk_min_jvmci_version = None
 
-if os.environ.get('JDK_VERSION_CHECK', None) != 'ignore' and jdk.javaCompliance < '21':
-    mx.abort('Graal requires JDK21 or later, got ' + str(jdk) +
+if os.environ.get('JDK_VERSION_CHECK', None) != 'ignore' and jdk.javaCompliance < '25':
+    mx.abort('Graal requires JDK 25 or later, got ' + str(jdk) +
              '. This check can be bypassed by setting env var JDK_VERSION_CHECK=ignore')
 
 def _check_jvmci_version(jdk):

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckTest.java

@@ -48,10 +48,10 @@ public class JVMCIVersionCheckTest extends GraalCompilerTest {
 
     private static final String[] JDK_VERSIONS = {
                     null,
-                    "21",
-                    "21+3",
-                    "21.0.1+3",
-                    "21-ea+11-790"
+                    "99",
+                    "99+3",
+                    "99.0.1+3",
+                    "99-ea+11-790"
     };
 
     static final Map<String, String> PROPS;
@@ -124,7 +124,7 @@ private static Version getVersion(String jdkVersion, int major, int minor, int b
     public void test01() {
         String legacyPrefix = version.toString().startsWith("jvmci") ? "prefix-" : "";
         String javaVmVersion = legacyPrefix + version.toString() + "Suffix";
-        String javaSpecVersion = "21";
+        String javaSpecVersion = "99";
         var props = createTestProperties(javaSpecVersion, javaVmVersion, null);
         var jvmciMinVersions = Map.of(
                         javaSpecVersion, Map.of(JVMCIVersionCheck.DEFAULT_VENDOR_ENTRY, minVersion));

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

@@ -54,15 +54,14 @@ public final class JVMCIVersionCheck {
      * default/fallback entry.
      */
     private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
-                    "21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)),
                     "25", Map.of(
                                     "Oracle Corporation", createLabsJDKVersion("25+21", 1),
                                     DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+21", 1)));
     private static final int NA = 0;
     /**
      * Minimum Java release supported by Graal.
      */
-    private static final int JAVA_MIN_RELEASE = 21;
+    private static final int JAVA_MIN_RELEASE = 25;
 
     /**
      * Convenience factory for the current version scheme that only uses the JDK version and the

espresso/ci/ci.jsonnet

@@ -9,7 +9,9 @@
   vm_guard_includes: [],
 
   local espresso_compiler_stub_gate = common.eclipse + common.jdt + common.predicates(true, false, false) +
-   common.espresso_gate(allow_warnings=false, tags='style,fullbuild', timelimit='35:00', name='gate-espresso-compiler-stub-style-jdk21-linux-amd64') + {
+   # [GR-64739] move espresso JDK 21 gates to on demand
+   # common.espresso_gate(allow_warnings=false, tags='style,fullbuild', timelimit='35:00', name='gate-espresso-compiler-stub-style-jdk21-linux-amd64') + {
+   common.espresso_gate(allow_warnings=false, tags='style,fullbuild', timelimit='35:00', name='ondemand-espresso-compiler-stub-style-jdk21-linux-amd64') + {
     setup+: [
       ['cd', "../espresso-compiler-stub"],
     ],
@@ -21,7 +23,9 @@
   },
 
   local _builds = common.builds + [
-    common.jdk21_gate_linux_amd64 + espresso_compiler_stub_gate,
+    # [GR-64739] move espresso JDK 21 gates to on demand
+    # common.jdk21_gate_linux_amd64 + espresso_compiler_stub_gate,
+    common.jdk21_on_demand_linux + espresso_compiler_stub_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-jdk21-linux-amd64'},