[GR-50987] Use correct bench-suite name if missing

PullRequest: mx/1836
graalvm · Oct 1, 2024 · 48d531c · 48d531c
2 parents f5d0e49 + 04af642
commit 48d531c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -44,8 +44,6 @@ local common_json = import "../common.json";
     _version_build_id[1]
     ,
   local jdks_data = {
-    oraclejdk11: jdk_base + common_json.jdks["oraclejdk11"] + { jdk_version:: 11 },
-  } + {
     [name]: jdk_base + common_json.jdks[name] + { jdk_version:: 17 }
     for name in ["oraclejdk17"] + variants("labsjdk-ce-17") + variants("labsjdk-ee-17")
   } + {

diff --git a/common.json b/common.json
@@ -4,14 +4,12 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.31.0",
+  "mx_version": "7.32.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
     "galahad-jdk":        {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+15-1637", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] },
-
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
     "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02-debug", "platformspecific": true },
@@ -47,13 +45,13 @@
 
     "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+16", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+16-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+16-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+16-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+16-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+16-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+16-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "24",      "build_id": "jdk-24+17", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-24+17-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-24+17-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-24+17-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-24+17-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-24+17-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-24+17-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py
@@ -18204,7 +18204,7 @@ def alarm_handler(signum, frame):
 _CACHE_DIR = get_env('MX_CACHE_DIR', join(dot_mx_dir(), 'cache'))
 
 # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
-version = VersionSpec("7.32.1")  # GR-58516] Added support for specifying a JDK selector on the fetch-jdk command line
+version = VersionSpec("7.32.2")  # [GR-50987] Use correct bench-suite name if missing
 
 _mx_start_datetime = datetime.utcnow()
 

diff --git a/src/mx/_impl/mx_benchmark.py b/src/mx/_impl/mx_benchmark.py
@@ -1495,7 +1495,7 @@ def compiled(pat):
             for datapoint in parsedpoints:
                 datapoint.update(dims)
                 if "bench-suite" not in datapoint:
-                    datapoint["bench-suite"] = self.name()
+                    datapoint["bench-suite"] = self.benchSuiteName()
                 if "bench-suite-version" not in datapoint:
                     datapoint["bench-suite-version"] = self.version()
                 if "is-default-bench-suite-version" not in datapoint:
@@ -3375,7 +3375,7 @@ def dimensions(self, suite, mxBenchmarkArgs, bmSuiteArgs):
           "metric.uuid": self.uid(),
           "group": self.group(suite) if suite else '',
           "subgroup": suite.subgroup() if suite else '',
-          "bench-suite": suite.name() if suite else '',
+          "bench-suite": suite.benchSuiteName() if suite else '',
           "bench-suite-version": suite.version() if suite else '',
           "config.vm-flags": " ".join(suite.vmArgs(bmSuiteArgs)) if suite else '',
           "config.run-flags": " ".join(suite.runArgs(bmSuiteArgs)) if suite else '',