Merge upstream vm-23.1.5 tag

.github/workflows/quarkus.yml

@@ -37,18 +37,18 @@ jobs:
       matrix: ${{ steps.read.outputs.matrix }}
     steps:
     - name: Checkout oracle/graal
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: Checkout graalvm/mx
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: graalvm/mx.git
         fetch-depth: 1
         ref: master
         path: ${{ env.MX_PATH }}
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.8'
     - name: Get latest Quarkus release
@@ -58,13 +58,13 @@ jobs:
         curl --output quarkus.tgz -sL https://api.github.com/repos/quarkusio/quarkus/tarball/$QUARKUS_VERSION
         mkdir ${QUARKUS_PATH}
         tar xf quarkus.tgz -C ${QUARKUS_PATH} --strip-components=1
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ~/.mx
         key: ${{ runner.os }}-mx-${{ hashFiles('**/suite.py') }}
@@ -89,7 +89,7 @@ jobs:
       shell: bash
       run: tar -czvf graalvm.tgz -C $(dirname ${GRAALVM_HOME}) $(basename ${GRAALVM_HOME})
     - name: Persist GraalVM build
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: graalvm
         path: graalvm.tgz
@@ -112,7 +112,7 @@ jobs:
       shell: bash
       run: tar -czvf maven-repo.tgz -C ~ .m2/repository
     - name: Persist Maven Repo
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: maven-repo
         path: maven-repo.tgz
@@ -130,7 +130,7 @@ jobs:
     steps:
       - name: Download GraalVM build
         if: startsWith(matrix.os-name, 'ubuntu')
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: graalvm
           path: .
@@ -151,7 +151,7 @@ jobs:
         run: ${QUARKUS_PATH}/.github/ci-prerequisites.sh
       - name: Download Maven Repo
         if: startsWith(matrix.os-name, 'ubuntu')
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: maven-repo
           path: .
@@ -178,7 +178,7 @@ jobs:
         shell: bash
         run: find . -type d -name '*-reports' -o -wholename '*/build/reports/tests/functionalTest' | tar -czf test-reports.tgz -T -
       - name: Upload failure Archive (if maven failed)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-reports-native-${{matrix.category}}

ci/ci_common/bench-common.libsonnet

@@ -31,6 +31,17 @@
       else true
   },
 
+  # 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
+  },
+
+  bench_no_thread_cap:: {
+    restrict_threads:: null,
+    should_use_hwloc:: false
+  },
+
   bench_hw:: {
     _bench_machine:: {
       targets+: ["bench"],
@@ -42,15 +53,16 @@
       numa_nodes:: [],
       is_numa:: std.length(self.numa_nodes) > 0,
       num_threads:: error "num_threads must bet set!",
+      hyperthreading:: true,
       threads_per_node:: if self.is_numa then self.num_threads / std.length(self.numa_nodes) else self.num_threads,
     },
 
-    x52:: common.linux_amd64 + self._bench_machine + {
-      machine_name:: "x52",
-      capabilities+: ["no_frequency_scaling", "tmpfs25g"],
+    e3:: common.linux_amd64 + self._bench_machine + {
+      machine_name:: "e3",
+      capabilities: ["e3", "tmpfs25g", "linux", "amd64"],
       numa_nodes:: [0, 1],
-      default_numa_node:: 0,
-      num_threads:: 72
+      default_numa_node:: 1,
+      num_threads:: 256
     },
     x82:: common.linux_amd64 + self._bench_machine + {
       machine_name:: "x82",
@@ -62,31 +74,29 @@
     xgene3:: common.linux_aarch64 + self._bench_machine + {
       machine_name:: "xgene3",
       capabilities+: [],
-      num_threads:: 32
+      num_threads:: 32,
+      hyperthreading:: false
     },
     a12c:: common.linux_aarch64 + self._bench_machine + {
       machine_name:: "a12c",
       capabilities+: ["no_frequency_scaling", "tmpfs25g"],
       numa_nodes:: [0, 1],
       default_numa_node:: 0,
-      num_threads:: 160
+      num_threads:: 160,
+      hyperthreading:: false
     }
   },
 
-  hwlocIfNuma(numa, cmd, node=0)::
-    if numa then
+  hwloc_cmd(cmd, num_threads, node, hyperthreading, max_threads_per_node)::
+    if num_threads == null then
       ["hwloc-bind", "--cpubind", "node:"+node, "--membind", "node:"+node, "--"] + cmd
     else
-      cmd,
-
-  parallelHwloc(cmd_node0, cmd_node1)::
-    // Returns a list of commands that will run cmd_nod0 on NUMA node 0
-    // concurrently with cmd_node1 on NUMA node 1 and then wait for both to complete.
-    [
-      $.hwlocIfNuma(true, cmd_node0, node=0) + ["&"],
-      $.hwlocIfNuma(true, cmd_node1, node=1) + ["&"],
-      ["wait"]
-    ],
+      local threads = if num_threads != null then num_threads else max_threads_per_node;
+      assert if hyperthreading then threads % 2 == 0 else true: "It is required to bind to an even number of threads on hyperthreaded machines. Got requested "+threads+" threads";
+      assert threads <= max_threads_per_node: "Benchmarking must run on a single NUMA node for stability reasons. Got requested "+threads+" threads but the machine has only "+max_threads_per_node+" threads per node";      local cores = if hyperthreading then "0-"+((threads/2)-1)+".pu:0-1" else "0-"+(threads-1)+".pu:0";
+      local cpu_bind = if hyperthreading then "node:"+node+".core:"+cores else "node:"+node+".core:"+cores+".pu:0";
+      ["hwloc-bind", "--cpubind", cpu_bind, "--membind", "node:"+node, "--"] + cmd
+  ,
 
   // building block used to generate fork builds
   many_forks_benchmarking:: common.build_base + {

common.json

@@ -19,12 +19,12 @@
     "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.8+2-jvmci-23.1-b02-sulong", "platformspecific": true },
 
     "oraclejdk21":        {"name": "jpg-jdk",   "version": "21",      "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21.0.2+13-jvmci-23.1-b30", "platformspecific": true },
-    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21.0.2+13-jvmci-23.1-b30-debug", "platformspecific": true },
-    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21.0.2+13-jvmci-23.1-b30-sulong", "platformspecific": true },
-    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21.0.3+7-jvmci-23.1-b37", "platformspecific": true },
-    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.3+7-jvmci-23.1-b37-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.3+7-jvmci-23.1-b37-sulong", "platformspecific": true },
+    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48", "platformspecific": true },
+    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-debug", "platformspecific": true },
+    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-sulong", "platformspecific": true },
+    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48", "platformspecific": true },
+    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-debug", "platformspecific": true },
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.5+9-jvmci-23.1-b48-sulong", "platformspecific": true },
 
     "oraclejdk22":        {"name": "jpg-jdk",   "version": "22",      "build_id": "2", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
   },

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -7,40 +7,40 @@
 
   local main_builds = std.flattenArrays([
     [
-    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.dacapo + { unicorn_pull_request_benchmarking:: {name: 'libgraal', metrics: ['time']}},
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.dacapo_size_variants,
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.dacapo_timing,
-    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo + {unicorn_pull_request_benchmarking:: 'libgraal'},
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo_size_variants,
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo_timing,
-    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.renaissance + {unicorn_pull_request_benchmarking:: 'libgraal'},
-    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.specjvm2008 + {unicorn_pull_request_benchmarking:: 'libgraal'},
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.specjbb2015,
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.specjbb2015_full_machine,
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.renaissance_0_11,
-    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.awfy + {unicorn_pull_request_benchmarking:: 'libgraal'},
-    c.daily                    + hw.x52 + jdk + cc.libgraal + bench.microservice_benchmarks,
-    c.daily                    + hw.x52 + jdk + cc.libgraal + bench.renaissance_legacy,
-    c.daily                    + hw.x52 + jdk + cc.libgraal + bench.micros_graal_whitebox,
-    c.daily                    + hw.x52 + jdk + cc.libgraal + bench.micros_graal_dist,
-    c.daily                    + hw.x52 + jdk + cc.libgraal + bench.micros_misc_graal_dist,
-    c.daily                    + hw.x52 + jdk + cc.libgraal + bench.micros_shootout_graal_dist,
+    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.dacapo + { unicorn_pull_request_benchmarking:: {name: 'libgraal', metrics: ['time']}},
+    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.dacapo_size_variants,
+    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.dacapo_timing,
+    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.scala_dacapo + {unicorn_pull_request_benchmarking:: 'libgraal'},
+    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.scala_dacapo_size_variants,
+    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.scala_dacapo_timing,
+    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.renaissance + {unicorn_pull_request_benchmarking:: 'libgraal'},
+    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.specjvm2008 + {unicorn_pull_request_benchmarking:: 'libgraal'},
+    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.specjbb2015,
+    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.specjbb2015_full_machine,
+    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.renaissance_0_11,
+    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.awfy + {unicorn_pull_request_benchmarking:: 'libgraal'},
+    c.daily                    + hw.e3 + jdk + cc.libgraal + bench.microservice_benchmarks,
+    c.daily                    + hw.e3 + jdk + cc.libgraal + bench.renaissance_legacy,
+    c.daily                    + hw.e3 + jdk + cc.libgraal + bench.micros_graal_whitebox,
+    c.daily                    + hw.e3 + jdk + cc.libgraal + bench.micros_graal_dist,
+    c.daily                    + hw.e3 + jdk + cc.libgraal + bench.micros_misc_graal_dist,
+    c.daily                    + hw.e3 + jdk + cc.libgraal + bench.micros_shootout_graal_dist,
     ]
   for jdk in cc.bench_jdks
   ]),
 
   local profiling_builds = std.flattenArrays([
     [
-    c.weekly + hw.x52 + jdk + cc.libgraal + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
-    c.weekly + hw.x52 + jdk + cc.libgraal + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" }
+    c.monthly + hw.e3 + jdk + cc.libgraal + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
+    c.monthly + hw.e3 + jdk + cc.libgraal + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" }
     ]
   for jdk in cc.bench_jdks
   for suite in bench.groups.profiled_suites
   ]),
 
   local weekly_amd64_forks_builds = std.flattenArrays([
-    bc.generate_fork_builds(c.weekly  + hw.x52  + jdk + cc.libgraal + suite, subdir='compiler') +
-    bc.generate_fork_builds(c.monthly + hw.x52  + jdk + cc.jargraal + suite, subdir='compiler')
+    bc.generate_fork_builds(c.weekly  + hw.e3  + jdk + cc.libgraal + suite, subdir='compiler') +
+    bc.generate_fork_builds(c.monthly + hw.e3  + jdk + cc.jargraal + suite, subdir='compiler')
   for jdk in cc.bench_jdks
   for suite in bench.groups.weekly_forks_suites
   ]),
@@ -63,7 +63,7 @@
   ],
 
   local zgc_builds = [
-    c.weekly + hw.x52 + jdk + cc.libgraal + cc.zgc_mode + suite,
+    c.weekly + hw.e3 + jdk + cc.libgraal + cc.zgc_mode + suite,
   for jdk in cc.bench_jdks
   for suite in bench.groups.main_suites + [bench.specjbb2015]
   ],
@@ -76,13 +76,13 @@
   ],
 
   local no_tiered_builds = [
-    c.weekly + hw.x52 + jdk + cc.libgraal + cc.no_tiered_comp + suite,
+    c.monthly + hw.e3 + jdk + cc.libgraal + cc.no_tiered_comp + suite,
   for jdk in cc.bench_jdks
   for suite in bench.groups.main_suites
   ],
 
   local no_profile_info_builds = [
-    c.weekly + hw.x52 + jdk + cc.libgraal + cc.no_profile_info + suite,
+    c.monthly + hw.e3 + jdk + cc.libgraal + cc.no_profile_info + suite,
   for jdk in cc.bench_jdks
   for suite in bench.groups.main_suites
   ],