Update imports

Author: Ariouz

ci/graal/ci/ci_common/bench-common.libsonnet

@@ -34,7 +34,7 @@
   # max number of threads to use for benchmarking in general
   # the goal being to limit parallelism on very large servers which may not be respresentative of real-world scenarios
   bench_max_threads:: {
-   restrict_threads:: 36
+   restrict_threads:: if self.arch == 'amd64' then 36 else 32,
   },
 
   bench_no_thread_cap:: {
@@ -99,7 +99,27 @@
       default_numa_node:: 0,
       num_threads:: 160,
       hyperthreading:: false
-    }
+    },
+    hr350a:: common.linux_aarch64 + self._bench_machine + {
+      machine_name:: "hr350a",
+      capabilities+: ["tmpfs25g"],
+      numa_nodes:: [0],
+      default_numa_node:: 0,
+      num_threads:: 32,
+      hyperthreading:: false
+    },
+    osprey:: common.linux_aarch64 + self._bench_machine + {
+      machine_name:: "osprey",
+      capabilities+: ["tmpfs25g"],
+      numa_nodes:: [0],
+      default_numa_node:: 0,
+      num_threads:: 32,
+      hyperthreading:: false
+    },
+    local contains(a_str, substr) = std.length(std.findSubstr(substr, a_str)) > 0,
+    # Useful to distribute the benchmark load between two machine types, but always stay consistent for the same benchmark suite
+    # This guarantees comparability of results, whatever the platform/context, for each suite
+    hr350a_or_osprey(suite=null):: if suite != null && std.count([contains(s, suite) for s in ["barista", "renaissance"]], true) > 0 then self.osprey else self.hr350a,
   },
 
   hwloc_cmd(cmd, num_threads, node, hyperthreading, max_threads_per_node)::

ci/graal/ci/common.jsonnet

@@ -150,7 +150,6 @@ local common_json = import "../common.json";
       packages+: {
         python3: "==3.8.10",
         "pip:ninja_syntax": common_json.pip.ninja_syntax,
-        "pip:psutil": "==7.1.3",
         mx: common_json.mx_version,
       },
       python_version: "3", # To use the correct virtualenv

ci/graal/common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.68.4",
+  "mx_version": "7.68.5",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
@@ -49,12 +49,12 @@
     "graalvm-ee-25-ea":   {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
 
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true }
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b12", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b12-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b12-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b12", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b12-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b12-sulong", "platformspecific": true }
   },
 
   "eclipse": {
@@ -69,4 +69,4 @@
     "pylint": "==2.4.4",
     "black": "==23.11.0"
   }
-}
+}

mx.graalpython/suite.py

@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "e61a4623b7fc839ee10df84050c120d59056b871",
+                "version": "89c1619a2e20ffbf943cf399b24e3d91590cff66",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "e61a4623b7fc839ee10df84050c120d59056b871",
+                "version": "89c1619a2e20ffbf943cf399b24e3d91590cff66",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},