Automatic merge of master into galahad

OracleLabsAutomation · OracleLabsAutomation · commit 2496710f7302 · 2025-06-19T00:37:49.000Z
diff --git a/common.json b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.55.5",
+  "mx_version": "7.55.6",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
diff --git a/sdk/mx.sdk/mx_sdk_benchmark.py b/sdk/mx.sdk/mx_sdk_benchmark.py
@@ -3029,11 +3029,29 @@ def validateStdoutWithDimensions(self, out, benchmarks, bmSuiteArgs, retcode=Non
     def computeDerivedDatapoints(self, datapoints: DataPoints) -> DataPoints:
         """Adds derived datapoints to the list of datapoints captured from the benchmark stdout or generated files.
         Adds datapoints such as:
+        * rss-distribution: copies of rss datapoints, naming more clearly indicates that the metric comprises the
+          distribution represented by percentile values
+        * latency-distribution: copies of latency datapoints, naming more clearly indicates that the metric comprises
+          the distribution represented by percentile values
         * max-rss: copied from specific rss percentile values
         * time-to-first-response: copied from response_time with iteration 0
         * max-time: copied from response_time with the highest value
         * ops-per-GB-second: computed as throughput divided by max-rss
         """
+        # rss-distribution
+        rss_dps = filter(lambda dp: dp["metric.name"] == "rss", datapoints)
+        for rss_dp in rss_dps:
+            rss_dp_copy = rss_dp.copy()
+            rss_dp_copy["metric.name"] = "rss-distribution"
+            datapoints.append(rss_dp_copy)
+
+        # latency-distribution
+        latency_dps = filter(lambda dp: dp["metric.name"] == "latency", datapoints)
+        for latency_dp in latency_dps:
+            latency_dp_copy = latency_dp.copy()
+            latency_dp_copy["metric.name"] = "latency-distribution"
+            datapoints.append(latency_dp_copy)
+
         # max-rss
         percentile_to_copy_into_max_rss = float(mx_benchmark.RssPercentilesTracker.MaxRssCopyRule.percentile_to_copy_into_max_rss)
         rss_dp_to_copy_from = next(filter(lambda dp: dp["metric.name"] == "rss" and dp["metric.percentile"] == percentile_to_copy_into_max_rss, datapoints), None)
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "7.55.2",
+  "mxversion": "7.55.6",
   "name" : "sdk",
   "version" : "26.0.0",
   "release" : False,
diff --git a/sulong/mx.sulong/suite.py b/sulong/mx.sulong/suite.py
@@ -1765,20 +1765,6 @@
       "description": "Graal native LLVM engine.",
       "license": "BSD-new",
     },
-    # GR-64088: Remove when changes in language repositories are merged
-    "LLVM_NATIVE_COMMUNITY": {
-      "type": "pom",
-      "runtimeDependencies": [
-        "LLVM_NATIVE_POM",
-      ],
-      "maven": {
-        "artifactId": "llvm-native-transient",
-        "tag": ["default", "public"],
-      },
-      "description": "Temporary module to overcome cross-repository merge.",
-      "license": "BSD-new",
-    },
-
     "LLVM_POM": {
       "type": "pom",
       "runtimeDependencies": [
diff --git a/vm/ce-release-artifacts.json b/vm/ce-release-artifacts.json
@@ -1,8 +1,8 @@
 [
     {
-        "name": "graalvm-community-java25",
+        "name": "graalvm-community-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "artifacts": [
             {
                 "os": "linux",
@@ -29,7 +29,7 @@
     {
         "name": "maven-bundle-ce",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"maven-resource-bundle",
         "artifacts": [
             {
@@ -40,9 +40,9 @@
         ]
     },
     {
-        "name": "js-native-standalone-svm-java25",
+        "name": "js-native-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"graaljs",
         "artifacts": [
             {
@@ -73,9 +73,9 @@
         ]
     },
     {
-        "name": "js-java-standalone-svm-java25",
+        "name": "js-java-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"graaljs",
         "artifacts": [
             {
@@ -106,9 +106,9 @@
         ]
     },
     {
-        "name": "nodejs-native-standalone-svm-java25",
+        "name": "nodejs-native-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"graalnodejs",
         "artifacts": [
             {
@@ -139,9 +139,9 @@
         ]
     },
     {
-        "name": "nodejs-java-standalone-svm-java25",
+        "name": "nodejs-java-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"graalnodejs",
         "artifacts": [
             {
@@ -172,9 +172,9 @@
         ]
     },
     {
-        "name": "ruby-native-standalone-svm-java25",
+        "name": "ruby-native-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"truffleruby",
         "artifacts": [
             {
@@ -200,9 +200,9 @@
         ]
     },
     {
-        "name": "ruby-java-standalone-svm-java25",
+        "name": "ruby-java-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"truffleruby",
         "artifacts": [
             {
@@ -228,9 +228,9 @@
         ]
     },
     {
-        "name": "python-native-standalone-svm-java25",
+        "name": "python-native-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"graalpy",
         "artifacts": [
             {
@@ -261,9 +261,9 @@
         ]
     },
     {
-        "name": "python-java-standalone-svm-java25",
+        "name": "python-java-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name":"graalpy",
         "artifacts": [
             {
@@ -294,9 +294,9 @@
         ]
     },
     {
-        "name": "wasm-native-standalone-svm-java25",
+        "name": "wasm-native-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name": "graalwasm",
         "artifacts": [
             {
@@ -327,9 +327,9 @@
         ]
     },
     {
-        "name": "wasm-java-standalone-svm-java25",
+        "name": "wasm-java-standalone-svm-java26",
         "core": true,
-        "jdk": "jdk_25",
+        "jdk": "jdk_26",
         "override_name": "graalwasm",
         "artifacts": [
             {
diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
@@ -247,32 +247,6 @@ def _create_deprecated_community_distribution(base_distribution):
     return mx_pomdistribution.POMDistribution(_suite, dist_name, distDeps, runtimeDeps, sorted(list(licenses)), **attrs)
 
 
-def _create_deprecated_vendor_specific_distribution(base_distribution):
-    # GR-64088: Remove when changes in language repositories are merged
-    base_name = _trim_suffix(base_distribution.name, 'COMMUNITY')
-    dist_name = base_name + 'POM_COMPATIBILITY'
-    groupId = base_distribution.maven_group_id()
-    artifactId = base_distribution.maven_artifact_id()
-    artifactTags = 'default'
-    maven_data = getattr(base_distribution, 'maven')
-    if isinstance(maven_data, dict) and 'tag' in maven_data:
-        artifactTags = maven_data['tag']
-    description = getattr(base_distribution, 'description')
-    distDeps = []
-    runtimeDeps = [base_distribution]
-    licenses = set(_distribution_license(base_distribution))
-    artifactId = _trim_suffix(artifactId, '-community')
-    attrs = {
-        'maven': {
-            'groupId': groupId,
-            'artifactId': artifactId,
-            'tag': artifactTags,
-        },
-        'description': description,
-    }
-    return mx_pomdistribution.POMDistribution(_suite, dist_name, distDeps, runtimeDeps, sorted(list(licenses)), **attrs)
-
-
 def register_tools_distribution(owner_suite, register_distribution):
     """
     Registers a dynamic TOOLS meta-POM distribution that aggregates all individual tool meta-POMs.
@@ -413,23 +387,6 @@ def register_languages_distribution(owner_suite, register_distribution,
                     polyglot_language_distribution = create_polyglot_meta_pom_distribution_from_base_distribution(deprecated_community_language_distribution)
                     register_distribution(polyglot_language_distribution)
                     deprecated_languages_community_meta_poms.append(polyglot_language_distribution)
-        else:
-            # GR-64088: Remove when changes in language repositories are merged
-            legacy_community_name = _trim_suffix(distribution_name, 'POM') + 'COMMUNITY'
-            language_distribution = mx.distribution(legacy_community_name, fatalIfMissing=False)
-            if language_distribution:
-                # Language suite not yet migrated
-                assert language_distribution.maven_artifact_id().endswith("-community"), f'Unmigrated Language meta-POM distribution {language_distribution.name} must have *-community Maven artifact id.'
-                polyglot_language_distribution = create_polyglot_meta_pom_distribution_from_base_distribution(language_distribution)
-                register_distribution(polyglot_language_distribution)
-                deprecated_languages_community_meta_poms.append(polyglot_language_distribution)
-                languages_licenses.update(_distribution_license(language_distribution))
-
-                language_distribution = _create_deprecated_vendor_specific_distribution(language_distribution)
-                register_distribution(language_distribution)
-                polyglot_language_distribution = create_polyglot_meta_pom_distribution_from_base_distribution(language_distribution)
-                register_distribution(polyglot_language_distribution)
-                languages_meta_poms.append(polyglot_language_distribution)
 
     if languages_meta_poms:
         attrs = {
diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -33,7 +33,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "c5fc49c969911c34930b8642da8dc0785844450f",
+                "version": "7d361dd6bcbecf36a71837e22fea4db292ab11bd",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
@@ -42,14 +42,14 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "c5fc49c969911c34930b8642da8dc0785844450f",
+                "version": "7d361dd6bcbecf36a71837e22fea4db292ab11bd",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
             },
             {
                 "name": "truffleruby",
-                "version": "d1c8bfef4c0f5e3bd91062c9c1c2abe13dbd398f",
+                "version": "e88b353d799c3b00f6e9882f27e9a43538fa3a47",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},
@@ -65,7 +65,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "9c75f8969912c669f5b3ebd089fe15767d543ae3",
+                "version": "edb7bac2f6def8aec598de70f87bf1d62b82e2da",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`# SOFTWARE.`
`40`	`40`	`#`
`41`	`41`	`suite = {`
`42`		`- "mxversion": "7.55.2",`
	`42`	`+ "mxversion": "7.55.6",`
`43`	`43`	`"name" : "sdk",`
`44`	`44`	`"version" : "26.0.0",`
`45`	`45`	`"release" : False,`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "name": "graalvm-community-java25",`
	`3`	`+ "name": "graalvm-community-java26",`
`4`	`4`	`"core": true,`
`5`		`- "jdk": "jdk_25",`
	`5`	`+ "jdk": "jdk_26",`
`6`	`6`	`"artifacts": [`
`7`	`7`	`{`
`8`	`8`	`"os": "linux",`
`@@ -29,7 +29,7 @@`
`29`	`29`	`{`
`30`	`30`	`"name": "maven-bundle-ce",`
`31`	`31`	`"core": true,`
`32`		`- "jdk": "jdk_25",`
	`32`	`+ "jdk": "jdk_26",`
`33`	`33`	`"override_name":"maven-resource-bundle",`
`34`	`34`	`"artifacts": [`
`35`	`35`	`{`
`@@ -40,9 +40,9 @@`
`40`	`40`	`]`
`41`	`41`	`},`
`42`	`42`	`{`
`43`		`- "name": "js-native-standalone-svm-java25",`
	`43`	`+ "name": "js-native-standalone-svm-java26",`
`44`	`44`	`"core": true,`
`45`		`- "jdk": "jdk_25",`
	`45`	`+ "jdk": "jdk_26",`
`46`	`46`	`"override_name":"graaljs",`
`47`	`47`	`"artifacts": [`
`48`	`48`	`{`
`@@ -73,9 +73,9 @@`
`73`	`73`	`]`
`74`	`74`	`},`
`75`	`75`	`{`
`76`		`- "name": "js-java-standalone-svm-java25",`
	`76`	`+ "name": "js-java-standalone-svm-java26",`
`77`	`77`	`"core": true,`
`78`		`- "jdk": "jdk_25",`
	`78`	`+ "jdk": "jdk_26",`
`79`	`79`	`"override_name":"graaljs",`
`80`	`80`	`"artifacts": [`
`81`	`81`	`{`
`@@ -106,9 +106,9 @@`
`106`	`106`	`]`
`107`	`107`	`},`
`108`	`108`	`{`
`109`		`- "name": "nodejs-native-standalone-svm-java25",`
	`109`	`+ "name": "nodejs-native-standalone-svm-java26",`
`110`	`110`	`"core": true,`
`111`		`- "jdk": "jdk_25",`
	`111`	`+ "jdk": "jdk_26",`
`112`	`112`	`"override_name":"graalnodejs",`
`113`	`113`	`"artifacts": [`
`114`	`114`	`{`
`@@ -139,9 +139,9 @@`
`139`	`139`	`]`
`140`	`140`	`},`
`141`	`141`	`{`
`142`		`- "name": "nodejs-java-standalone-svm-java25",`
	`142`	`+ "name": "nodejs-java-standalone-svm-java26",`
`143`	`143`	`"core": true,`
`144`		`- "jdk": "jdk_25",`
	`144`	`+ "jdk": "jdk_26",`
`145`	`145`	`"override_name":"graalnodejs",`
`146`	`146`	`"artifacts": [`
`147`	`147`	`{`
`@@ -172,9 +172,9 @@`
`172`	`172`	`]`
`173`	`173`	`},`
`174`	`174`	`{`
`175`		`- "name": "ruby-native-standalone-svm-java25",`
	`175`	`+ "name": "ruby-native-standalone-svm-java26",`
`176`	`176`	`"core": true,`
`177`		`- "jdk": "jdk_25",`
	`177`	`+ "jdk": "jdk_26",`
`178`	`178`	`"override_name":"truffleruby",`
`179`	`179`	`"artifacts": [`
`180`	`180`	`{`
`@@ -200,9 +200,9 @@`
`200`	`200`	`]`
`201`	`201`	`},`
`202`	`202`	`{`
`203`		`- "name": "ruby-java-standalone-svm-java25",`
	`203`	`+ "name": "ruby-java-standalone-svm-java26",`
`204`	`204`	`"core": true,`
`205`		`- "jdk": "jdk_25",`
	`205`	`+ "jdk": "jdk_26",`
`206`	`206`	`"override_name":"truffleruby",`
`207`	`207`	`"artifacts": [`
`208`	`208`	`{`
`@@ -228,9 +228,9 @@`
`228`	`228`	`]`
`229`	`229`	`},`
`230`	`230`	`{`
`231`		`- "name": "python-native-standalone-svm-java25",`
	`231`	`+ "name": "python-native-standalone-svm-java26",`
`232`	`232`	`"core": true,`
`233`		`- "jdk": "jdk_25",`
	`233`	`+ "jdk": "jdk_26",`
`234`	`234`	`"override_name":"graalpy",`
`235`	`235`	`"artifacts": [`
`236`	`236`	`{`
`@@ -261,9 +261,9 @@`
`261`	`261`	`]`
`262`	`262`	`},`
`263`	`263`	`{`
`264`		`- "name": "python-java-standalone-svm-java25",`
	`264`	`+ "name": "python-java-standalone-svm-java26",`
`265`	`265`	`"core": true,`
`266`		`- "jdk": "jdk_25",`
	`266`	`+ "jdk": "jdk_26",`
`267`	`267`	`"override_name":"graalpy",`
`268`	`268`	`"artifacts": [`
`269`	`269`	`{`
`@@ -294,9 +294,9 @@`
`294`	`294`	`]`
`295`	`295`	`},`
`296`	`296`	`{`
`297`		`- "name": "wasm-native-standalone-svm-java25",`
	`297`	`+ "name": "wasm-native-standalone-svm-java26",`
`298`	`298`	`"core": true,`
`299`		`- "jdk": "jdk_25",`
	`299`	`+ "jdk": "jdk_26",`
`300`	`300`	`"override_name": "graalwasm",`
`301`	`301`	`"artifacts": [`
`302`	`302`	`{`
`@@ -327,9 +327,9 @@`
`327`	`327`	`]`
`328`	`328`	`},`
`329`	`329`	`{`
`330`		`- "name": "wasm-java-standalone-svm-java25",`
	`330`	`+ "name": "wasm-java-standalone-svm-java26",`
`331`	`331`	`"core": true,`
`332`		`- "jdk": "jdk_25",`
	`332`	`+ "jdk": "jdk_26",`
`333`	`333`	`"override_name": "graalwasm",`
`334`	`334`	`"artifacts": [`
`335`	`335`	`{`