[GR-66530] [GR-66529] Use 25 guest for espresso standalones and maven artefacts.

PullRequest: graal/21391

Author: gilles-duboscq

ci/ci_common/common.jsonnet

@@ -113,6 +113,10 @@ common + common.frequencies + {
   labsjdk21LLVM::        self["labsjdk-" + repo_config.graalvm_edition + "-21-llvm"],
   graalvmee21::          self["graalvm-ee-21"],
 
+  labsjdk25::            self["labsjdk-" + repo_config.graalvm_edition + "-25"],
+  labsjdk25Debug::       self["labsjdk-" + repo_config.graalvm_edition + "-25Debug"],
+  labsjdk25LLVM::        self["labsjdk-" + repo_config.graalvm_edition + "-25-llvm"],
+
   labsjdkLatest::            self["labsjdk-" + repo_config.graalvm_edition + "-latest"],
   labsjdkLatestDebug::       self["labsjdk-" + repo_config.graalvm_edition + "-latestDebug"],
   labsjdkLatestLLVM::        self["labsjdk-" + repo_config.graalvm_edition + "-latest-llvm"],

common.json

@@ -45,13 +45,13 @@
 
     "oraclejdk24":       {"name": "jpg-jdk",   "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk25":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-25":      {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-25Debug": {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-25-llvm": {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-25":      {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-25Debug": {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },
+    "oraclejdk25":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+30", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-25":      {"name": "labsjdk",   "version": "ce-25+30-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-25Debug": {"name": "labsjdk",   "version": "ce-25+30-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-25-llvm": {"name": "labsjdk",   "version": "ce-25+30-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-25":      {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-25Debug": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
 
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+6", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+6-jvmci-b01", "platformspecific": true },

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java

@@ -199,6 +199,10 @@ public boolean java23OrEarlier() {
         return version <= 23;
     }
 
+    public boolean java23OrLater() {
+        return version >= 23;
+    }
+
     public boolean java24OrEarlier() {
         return version <= 24;
     }
@@ -227,6 +231,10 @@ public int classFileVersion() {
         return version + 44;
     }
 
+    public int featureVersion() {
+        return version;
+    }
+
     @Override
     public int compareTo(JavaVersion o) {
         return Integer.compare(this.version, o.version);

espresso/ci/ci_common/common.jsonnet

@@ -65,6 +65,18 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
       "ESPRESSO_LLVM_JAVA_HOME": graal_common.labsjdk21LLVM.downloads["LLVM_JAVA_HOME"],
     },
   },
+
+  espresso_jdk_25: {
+    downloads+: {
+      "ESPRESSO_JAVA_HOME": graal_common.labsjdk25.downloads["JAVA_HOME"],
+    },
+  },
+  espresso_jdk_25_llvm: {
+    downloads+: {
+      "ESPRESSO_LLVM_JAVA_HOME": graal_common.labsjdk25LLVM.downloads["LLVM_JAVA_HOME"],
+    },
+  },
+
   espresso_jdkLatest_llvm: {
     downloads+: {
       "ESPRESSO_LLVM_JAVA_HOME": graal_common.labsjdkLatestLLVM.downloads["LLVM_JAVA_HOME"],
@@ -122,6 +134,12 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   darwin_aarch64_21: self.espresso_jdk_21 + graal_common.labsjdkLatest                             + self.darwin_aarch64,
   windows_21:        self.espresso_jdk_21 + graal_common.labsjdkLatest                             + self.windows + devkits["windows-jdk-latest"],
 
+  linux_amd64_25:    self.espresso_jdk_25 + graal_common.labsjdkLatest + self.espresso_jdk_25_llvm + self.linux_amd64,
+  darwin_amd64_25:   self.espresso_jdk_25 + graal_common.labsjdkLatest + self.espresso_jdk_25_llvm + self.darwin_amd64,
+  linux_aarch64_25:  self.espresso_jdk_25 + graal_common.labsjdkLatest                             + self.linux_aarch64,
+  darwin_aarch64_25: self.espresso_jdk_25 + graal_common.labsjdkLatest                             + self.darwin_aarch64,
+  windows_25:        self.espresso_jdk_25 + graal_common.labsjdkLatest                             + self.windows + devkits["windows-jdk-latest"],
+
   linux_amd64_latest:                       graal_common.labsjdkLatest + self.espresso_jdkLatest_llvm + self.linux_amd64,
   linux_aarch64_latest:                     graal_common.labsjdkLatest                                + self.linux_aarch64,
 
@@ -170,6 +188,18 @@ 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_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_daily_linux_amd64   : self.daily         + self.linux_amd64_latest,
   jdkLatest_weekly_linux_amd64  : self.weekly        + self.linux_amd64_latest,

espresso/docs/hacking.md

@@ -84,6 +84,34 @@ $ mx --dy /espresso,/sulong maven-deploy --tags=public --all-suites --all-distri
 
 You can now depend on the jars using a version like `24.2.1-SNAPSHOT`.
 
+For embedding, there is a jar containing all the necessary JDK resources (classes, libraries, config files, etc.).
+This jar is made available to espresso through the truffle [resource API](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.Env.html#getInternalResource(java.lang.String)).
+It is the mx distribution called `ESPRESSO_RUNTIME_RESOURCES` and is published on maven as `org.graalvm.espresso:espresso-runtime-resources-$RuntimeResourceId` where `$RuntimeResourceId` identifies the type and version of the included JDK.
+For example `org.graalvm.espresso:espresso-runtime-resources-jdk21` contain Oracle JDK 21.
+`ESPRESSO_RUNTIME_RESOURCES` contains the JDK specified through `ESPRESSO_JAVA_HOME` as well as the optional llvm bits specified in `ESPRESSO_LLVM_JAVA_HOME`.
+
+Since we might want to distribute these resources for multiple JDK version, it is possible to produce additional runtime resource jars.
+This is done by setting `EXTRA_ESPRESSO_JAVA_HOMES` and optionally `EXTRA_ESPRESSO_LLVM_JAVA_HOMES`.
+Those are lists of java homes separated by a path separator.
+If `EXTRA_ESPRESSO_LLVM_JAVA_HOMES` is specified it should contain the same number of entries and in the same order as `EXTRA_ESPRESSO_JAVA_HOMES`.
+The JDKs set in `ESPRESSO_JAVA_HOME` and `EXTRA_ESPRESSO_JAVA_HOMES` should all have different versions.
+
+For example to produce jdk21 and jk25 resource in addition to the version of `ESPRESSO_JAVA_HOME`:
+```bash
+$ export ESPRESSO_JAVA_HOME=/path/to/jdk26
+$ export ESPRESSO_LLVM_JAVA_HOME=/path/to/jdk26-llvm
+$ export EXTRA_ESPRESSO_JAVA_HOMES=/path/to/jdk21:/path/to/jdk25
+$ export EXTRA_ESPRESSO_LLVM_JAVA_HOMES=/path/to/jdk21-llvm:/path/to/jdk25-llvm
+# subsequent build and maven-deploy operation will now publish
+# * org.graalvm.espresso:espresso-runtime-resources-jdk21
+# * org.graalvm.espresso:espresso-runtime-resources-jdk25
+# * org.graalvm.espresso:espresso-runtime-resources-jdk26
+```
+
+The `org.graalvm.espresso:java` maven dependency automatically depends on the "main" runtime resource (the one from `ESPRESSO_JAVA_HOME`).
+In order to use a different version in an embedding, an explicit dependency to `org.graalvm.espresso:espresso-runtime-resources-$RuntimeResourceId` should be added.
+The context should also be created with `java.RuntimeResourceId` set to the desired version (e.g., `"jdk21"`).
+
 ## `mx espresso-embedded ...`
 
 To run Espresso on a vanilla JDK and/or not within a standalone use `mx espresso-embedded ...`, it mimics the `java` command. The launcher adds all jars and properties required to run Espresso on any vanilla JDK.

espresso/mx.espresso/mx_espresso.py

@@ -476,14 +476,14 @@ def _espresso_input_jdk():
 def get_java_home_dep():
     global _java_home_dep
     if _java_home_dep is None:
-        _java_home_dep = JavaHomeDependency(_suite, "JAVA_HOME", _espresso_input_jdk().home)
+        _java_home_dep = JavaHomeDependency(_suite, "ESPRESSO_JAVA_HOME", _espresso_input_jdk().home)
     return _java_home_dep
 
 
 def get_llvm_java_home_dep():
     global _llvm_java_home_dep
     if _llvm_java_home_dep is None and jvm_standalone_with_llvm():
-        _llvm_java_home_dep = JavaHomeDependency(_suite, "LLVM_JAVA_HOME", espresso_llvm_java_home)
+        _llvm_java_home_dep = JavaHomeDependency(_suite, "ESPRESSO_LLVM_JAVA_HOME", espresso_llvm_java_home)
     return _llvm_java_home_dep
 
 def jvm_standalone_with_llvm():
@@ -527,8 +527,8 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
         register_distribution(llvm_java_home_dep)
         register_distribution(mx.LayoutTARDistribution(_suite, 'ESPRESSO_LLVM_SUPPORT', [], {
             "lib/llvm/default/": [
-                f"dependency:LLVM_JAVA_HOME/{jdk_lib_dir}/{lib_prefix}*{lib_suffix}",
-                "dependency:LLVM_JAVA_HOME/release"
+                f"dependency:ESPRESSO_LLVM_JAVA_HOME/{jdk_lib_dir}/{lib_prefix}*{lib_suffix}",
+                "dependency:ESPRESSO_LLVM_JAVA_HOME/release"
             ],
         }, None, True, None))
         register_distribution(mx.LayoutDirDistribution(_suite, 'ESPRESSO_STANDALONE_LLVM_HOME', [], {
@@ -580,23 +580,56 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
         enterprise_dist_name=f'GRAALVM_ESPRESSO_JAVA{java_home_dep.major_version}{dist_suffix}'))
 
 
-def espresso_resources_suite():
+def espresso_resources_suite(java_home_dep=None):
     # Espresso resources are in the CE/EE suite depending on espresso java home type
     # or in espresso if there is no EE suite
-    java_home_dep = get_java_home_dep()
+    java_home_dep = java_home_dep or get_java_home_dep()
     if java_home_dep.is_ee_implementor and mx.suite('espresso-tests', fatalIfMissing=False):
         return 'espresso-tests'
     else:
         return 'espresso'
 
 
 def register_espresso_runtime_resources(register_project, register_distribution, suite):
-    java_home_dep = get_java_home_dep()
-    llvm_java_home_dep = get_llvm_java_home_dep()
-    is_ee_suite = suite != _suite
     if espresso_resources_suite() != suite.name:
         return
+    register_espresso_runtime_resource(get_java_home_dep(), get_llvm_java_home_dep(), register_project, register_distribution, suite, True)
+    extra_java_homes = mx.get_env('EXTRA_ESPRESSO_JAVA_HOMES')
+    if extra_java_homes:
+        extra_java_homes = extra_java_homes.split(os.pathsep)
+    else:
+        extra_java_homes = []
+    extra_llvm_java_homes = mx.get_env('EXTRA_ESPRESSO_LLVM_JAVA_HOMES')
+    if extra_llvm_java_homes:
+        extra_llvm_java_homes = extra_llvm_java_homes.split(os.pathsep)
+    else:
+        extra_llvm_java_homes = []
+    if extra_llvm_java_homes:
+        if len(extra_llvm_java_homes) != len(extra_java_homes):
+            raise mx.abort("EXTRA_ESPRESSO_LLVM_JAVA_HOMES must either be empty or contain as many elements as EXTRA_ESPRESSO_JAVA_HOMES")
+    else:
+        extra_llvm_java_homes = [None] * len(extra_java_homes)
+
+    versions = {get_java_home_dep().major_version}
+    for extra_java_home, extra_llvm_java_home in zip(extra_java_homes, extra_llvm_java_homes):
+        extra_java_home_dep = JavaHomeDependency(suite, "ESPRESSO_JAVA_HOME_<version>", extra_java_home)
+        if extra_java_home_dep.major_version in versions:
+            raise mx.abort("Each entry in EXTRA_ESPRESSO_JAVA_HOMES should have a different java version, and they should all be different from ESPRESSO_JAVA_HOME's version")
+        versions.add(extra_java_home_dep.major_version)
+        if extra_llvm_java_home:
+            extra_llvm_java_home_dep = JavaHomeDependency(suite, "ESPRESSO_LLVM_JAVA_HOME_<version>", extra_llvm_java_home)
+        else:
+            extra_llvm_java_home_dep = None
+        if espresso_resources_suite(extra_java_home_dep) != suite.name:
+            continue
+        register_distribution(extra_java_home_dep)
+        if extra_llvm_java_home_dep:
+            register_distribution(extra_llvm_java_home_dep)
+        register_espresso_runtime_resource(extra_java_home_dep, extra_llvm_java_home_dep, register_project, register_distribution, suite, False)
+
 
+def register_espresso_runtime_resource(java_home_dep, llvm_java_home_dep, register_project, register_distribution, suite, is_main):
+    is_ee_suite = suite != _suite
     if llvm_java_home_dep:
         lib_prefix = mx.add_lib_prefix('')
         lib_suffix = mx.add_lib_suffix('')
@@ -624,7 +657,7 @@ def register_espresso_runtime_resources(register_project, register_distribution,
                 raise mx.abort("The implementors for ESPRESSO's JAVA_HOME and LLVM JAVA_HOME don't match")
         llvm_runtime_dir = {
             "source_type": "dependency",
-            "dependency": "espresso:LLVM_JAVA_HOME",
+            "dependency": llvm_java_home_dep.qualifiedName(),
             "path": f"{jdk_lib_dir}/<lib:*>",
         }
     else:
@@ -643,16 +676,17 @@ def register_espresso_runtime_resources(register_project, register_distribution,
             "man",
         ]
     if java_home_dep.is_ee_implementor:
-        espresso_runtime_resource_name = "jdk" + str(java_home_dep.major_version)
+        espresso_runtime_resource_name = f"jdk{java_home_dep.major_version}"
     else:
-        espresso_runtime_resource_name = "openjdk" + str(java_home_dep.major_version)
+        espresso_runtime_resource_name = f"openjdk{java_home_dep.major_version}"
+    runtime_dir_dist_name = f"ESPRESSO_RUNTIME_DIR_{java_home_dep.major_version}"
     register_distribution(mx.LayoutDirDistribution(
-        suite, "ESPRESSO_RUNTIME_DIR",
+        suite, runtime_dir_dist_name,
         deps=[],
         layout={
             f"META-INF/resources/java/espresso-runtime-{espresso_runtime_resource_name}/<os>/<arch>/": {
                 "source_type": "dependency",
-                "dependency": "espresso:JAVA_HOME",
+                "dependency": java_home_dep.qualifiedName(),
                 "path": "*",
                 "exclude": [
                     "include",
@@ -679,18 +713,23 @@ def register_espresso_runtime_resources(register_project, register_distribution,
         hashEntry=f"META-INF/resources/java/espresso-runtime-{espresso_runtime_resource_name}/<os>/<arch>/sha256",
         fileListEntry=f"META-INF/resources/java/espresso-runtime-{espresso_runtime_resource_name}/<os>/<arch>/files",
         maven=False))
+    runtime_resources_project_name = f'com.oracle.truffle.espresso.resources.runtime.{espresso_runtime_resource_name}'
     if register_project:
         # com.oracle.truffle.espresso.resources.runtime
-        register_project(EspressoRuntimeResourceProject(suite, 'src', espresso_runtime_resource_name, suite.defaultLicense))
+        register_project(EspressoRuntimeResourceProject(suite, runtime_resources_project_name, 'src', espresso_runtime_resource_name, suite.defaultLicense))
 
+    if is_main:
+        runtime_resources_dist_name = "ESPRESSO_RUNTIME_RESOURCES"
+    else:
+        runtime_resources_dist_name = f"ESPRESSO_RUNTIME_RESOURCES_{java_home_dep.major_version}"
     register_distribution(mx_jardistribution.JARDistribution(
-        suite, "ESPRESSO_RUNTIME_RESOURCES", None, None, None,
+        suite, runtime_resources_dist_name, None, None, None,
         moduleInfo={
-            "name": "org.graalvm.espresso.resources.runtime",
+            "name": f"org.graalvm.espresso.resources.runtime.{espresso_runtime_resource_name}",
         },
         deps=[
-            "com.oracle.truffle.espresso.resources.runtime",
-            "ESPRESSO_RUNTIME_DIR",
+            runtime_resources_project_name,
+            runtime_dir_dist_name,
         ],
         mainClass=None,
         excludedLibs=[],
@@ -709,8 +748,7 @@ def register_espresso_runtime_resources(register_project, register_distribution,
 
 
 class EspressoRuntimeResourceProject(mx.JavaProject):
-    def __init__(self, suite, subDir, runtime_name, theLicense):
-        name = f'com.oracle.truffle.espresso.resources.runtime'
+    def __init__(self, suite, name, subDir, runtime_name, theLicense):
         project_dir = join(suite.dir, subDir, name)
         deps = ['truffle:TRUFFLE_API']
         super().__init__(suite, name, subDir=subDir, srcDirs=[], deps=deps,

espresso/mx.espresso/suite.py

@@ -548,7 +548,7 @@
             "layout": {
                 "./": [{
                         "source_type": "dependency",
-                        "dependency": "espresso:JAVA_HOME",
+                        "dependency": "espresso:ESPRESSO_JAVA_HOME",
                         "path": "*",
                         "exclude": [
                             "lib/jfr",
@@ -610,7 +610,7 @@
                 ],
                 "./": [{
                         "source_type": "dependency",
-                        "dependency": "espresso:JAVA_HOME",
+                        "dependency": "espresso:ESPRESSO_JAVA_HOME",
                         "path": "*",
                         "exclude": [
                             "bin",  # those can't run without <jdk_lib_dir>/server

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/Ids.java

@@ -38,6 +38,8 @@
  * JDWP. Each entity will be assigned a unique ID. Only weak references are kept for entities.
  */
 public final class Ids<T> {
+    public static final int ID_SIZE = 8;
+    private static final Pattern ANON_INNER_CLASS_PATTERN = Pattern.compile(".*\\$\\d+.*");
 
     private volatile long uniqueID = 1;
 
@@ -53,8 +55,6 @@ public final class Ids<T> {
      */
     private final T nullObject;
 
-    public static final Pattern ANON_INNER_CLASS_PATTERN = Pattern.compile(".*\\$\\d+.*");
-
     private HashMap<String, Long> innerClassIDMap = new HashMap<>(16);
 
     private List<Object> pinnedObjects = new ArrayList<>();

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java

@@ -506,4 +506,8 @@ public interface JDWPContext {
     boolean isSteppingInProgress(Thread t);
 
     void replaceController(DebuggerController newController);
+
+    int getJavaFeatureVersion();
+
+    String getSystemProperty(String name);
 }