From 85c12f8ca4d8217d33d0e7f3fb45a23a35ddb910 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Thu, 19 Sep 2024 10:24:29 +0200 Subject: [PATCH 1/4] Use correct bench-suite name if missing --- src/mx/_impl/mx_benchmark.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx_benchmark.py b/src/mx/_impl/mx_benchmark.py index 7bf1aa69..ce1ded89 100644 --- 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: From 038f6ef601634670236e24b9f51fbe5afebb349a Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Fri, 20 Sep 2024 14:44:34 +0200 Subject: [PATCH 2/4] Fix default bench-suite in default dimensions --- src/mx/_impl/mx_benchmark.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx_benchmark.py b/src/mx/_impl/mx_benchmark.py index ce1ded89..a0707972 100644 --- a/src/mx/_impl/mx_benchmark.py +++ b/src/mx/_impl/mx_benchmark.py @@ -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 '', From ea3421ad06cd03440e30cf19d453212636d98649 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Tue, 1 Oct 2024 15:38:40 +0200 Subject: [PATCH 3/4] Update version --- src/mx/_impl/mx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index da5b7464..590a6e9e 100755 --- 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() From 04af642010a4dd05fac2e99998d45971b44cca58 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Tue, 1 Oct 2024 15:59:53 +0200 Subject: [PATCH 4/4] Sync common.jsonnet --- ci/common.jsonnet | 2 -- common.json | 18 ++++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ci/common.jsonnet b/ci/common.jsonnet index 33b53520..b9feda18 100644 --- 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 index be2d46c0..11a64df5 100644 --- 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": {