From 3553229fdaa507473f43f18dffb8490d5d9cc661 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 9 Oct 2024 17:19:17 +0200 Subject: [PATCH 1/2] Update common files --- common.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common.json b/common.json index 11a64df5..974c9f3c 100644 --- a/common.json +++ b/common.json @@ -4,11 +4,11 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.32.0", + "mx_version": "7.32.2", "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"]}, + "galahad-jdk": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+18-2013", "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 }, @@ -45,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+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 } + "oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+18", "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+18-jvmci-b01", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+18-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+18-jvmci-b01-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+18-jvmci-b01", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+18-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+18-jvmci-b01-sulong", "platformspecific": true } }, "eclipse": { From c929b059e3be46e57784f20192c52826157e31d9 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Wed, 9 Oct 2024 17:16:01 +0200 Subject: [PATCH 2/2] Fix the detection of Truffle language launchers in proftool --- src/mx/_impl/mx.py | 2 +- src/mx/_impl/mx_proftool.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mx/_impl/mx.py b/src/mx/_impl/mx.py index 590a6e9e..db0a1b25 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.2") # [GR-50987] Use correct bench-suite name if missing +version = VersionSpec("7.32.3") # [GR-58959] Fix the detection of Truffle language launchers in proftool _mx_start_datetime = datetime.utcnow() diff --git a/src/mx/_impl/mx_proftool.py b/src/mx/_impl/mx_proftool.py index bcaf0199..f429875b 100644 --- a/src/mx/_impl/mx_proftool.py +++ b/src/mx/_impl/mx_proftool.py @@ -1747,7 +1747,7 @@ def build_capture_command(files, command_line, extra_vm_args=None, options=None) perf_cmd, vm_args = build_capture_args(files, extra_vm_args, options) # Transform JVM options for Truffle language launchers - if os.path.exists(executable) and re.search(r'/languages/\w+/bin/', os.path.realpath(executable)): + if os.path.exists(executable) and not is_executable_compiled_by_native_image(executable) and not executable.endswith('java'): for i in range(len(vm_args)): vm_args[i] = '--vm.' + vm_args[i][1:]