Migrate most benchmarking to x52s and keep minimal E3 jobs while including the machine name by default in benchmark jobs

Author: farquet

ci/ci_common/bench-common.libsonnet

@@ -6,7 +6,7 @@
   bench_base:: common.build_base + {
     # job name automatically generated: <job_prefix>-<suite>-<platform>-<jdk_name>-<os>-<arch>-<job_suffix>
     # null values are omitted from the list.
-    generated_name:: utils.hyphenize([self.job_prefix, self.suite, self.platform, self.jdk_name, self.os, self.arch, self.job_suffix]),
+    generated_name:: utils.hyphenize([self.job_prefix, self.suite, self.platform, self.jdk_name, if std.objectHasAll(self, 'machine_name') then self.machine_name else null, self.os, self.arch, self.job_suffix]),
     job_prefix:: null,
     job_suffix:: null,
     name:
@@ -69,6 +69,13 @@
       default_numa_node:: 0,
       num_threads:: 16
     },
+    x52:: common.linux_amd64 + self._bench_machine + {
+      machine_name:: "x52",
+      capabilities+: ["tmpfs25g"],
+      numa_nodes:: [0, 1],
+      default_numa_node:: 1,
+      num_threads:: 72
+    },
     x82:: common.linux_amd64 + self._bench_machine + {
       machine_name:: "x82",
       capabilities+: ["tmpfs25g"],

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -11,36 +11,39 @@
 
   local main_builds = std.flattenArrays([
     [
-    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.dacapo + PR_bench_libgraal,
-    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.scala_dacapo + PR_bench_libgraal,
-    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.renaissance + PR_bench_libgraal,
-    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.barista + PR_bench_libgraal,
-    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.specjvm2008 + PR_bench_libgraal,
-    c.on_demand                + hw.e3 + jdk + cc.libgraal + bench.dacapo_size_variants,
-    c.on_demand                + hw.e3 + jdk + cc.libgraal + bench.scala_dacapo_size_variants,
-    c.monthly                  + hw.e3 + jdk + cc.libgraal + bench.specjbb2015,
-    c.daily + c.opt_post_merge + hw.e3 + jdk + cc.libgraal + bench.awfy + PR_bench_libgraal,
-    c.daily                    + hw.e3 + jdk + cc.libgraal + bench.microservice_benchmarks,
-    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.micros_graal_whitebox,
-    c.weekly                   + hw.e3 + jdk + cc.libgraal + bench.micros_graal_dist,
+    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.dacapo + PR_bench_libgraal,
+    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo + PR_bench_libgraal,
+    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.renaissance + PR_bench_libgraal,
+    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.barista + PR_bench_libgraal,
+    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.specjvm2008 + PR_bench_libgraal,
+    c.on_demand                + hw.x52 + jdk + cc.libgraal + bench.dacapo_size_variants,
+    c.on_demand                + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo_size_variants,
+    c.monthly                  + hw.x52 + jdk + cc.libgraal + bench.specjbb2015,
+    c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.awfy + PR_bench_libgraal,
+    c.daily                    + hw.x52 + jdk + cc.libgraal + bench.microservice_benchmarks,
+    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.micros_graal_whitebox,
+    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.micros_graal_dist,
     ]
   for jdk in cc.product_jdks
   ]),
 
   local profiling_builds = std.flattenArrays([
     [
-    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" }
+    c.monthly + hw.x52 + jdk + cc.libgraal + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
+    c.monthly + hw.x52 + jdk + cc.libgraal + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" }
     ]
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ]),
 
-  local weekly_amd64_forks_builds = std.flattenArrays([
+  local weekly_amd64_forks_builds = std.flattenArrays(std.flattenArrays([
+    [
+    bc.generate_fork_builds(c.weekly  + hw.x52  + jdk + cc.libgraal + suite, subdir='compiler'),
     bc.generate_fork_builds(c.weekly  + hw.e3  + jdk + cc.libgraal + suite, subdir='compiler')
+    ]
   for jdk in cc.product_jdks
   for suite in bench.groups.weekly_forks_suites
-  ]),
+  ])),
 
   local weekly_aarch64_forks_builds = std.flattenArrays([
     bc.generate_fork_builds(c.weekly + hw.a12c + jdk + cc.libgraal + suite, subdir='compiler')
@@ -65,7 +68,7 @@
   ],
 
   local zgc_builds = [
-    c.weekly + hw.e3 + jdk + cc.libgraal + cc.zgc_mode + suite,
+    c.weekly + hw.x52 + jdk + cc.libgraal + cc.zgc_mode + suite,
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites + [bench.specjbb2015]
   ],

compiler/ci/ci_includes/baseline-benchmarks.jsonnet

@@ -8,7 +8,7 @@
 
   local hotspot_builds = std.flattenArrays([
     [
-      c.weekly + hw.e3 + jdk + cc.c2 + suite,
+      c.weekly + hw.x52 + jdk + cc.c2 + suite,
       c.weekly + hw.a12c + jdk + cc.c2 + suite
     ]
   for jdk in cc.product_jdks
@@ -17,20 +17,23 @@
 
   local hotspot_profiling_builds = std.flattenArrays([
     [
-    c.monthly + hw.e3  + jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
+    c.monthly + hw.x52  + jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
     c.monthly + hw.a12c + jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
-    c.monthly + hw.e3  + jdk + cc.c2 + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" },
+    c.monthly + hw.x52  + jdk + cc.c2 + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" },
     c.monthly + hw.a12c + jdk + cc.c2 + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" }
     ]
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ]),
 
-  local weekly_forks_amd64_builds = std.flattenArrays([
-    bc.generate_fork_builds(c.weekly + hw.e3 + jdk + cc.c2 + suite)
+  local weekly_forks_amd64_builds = std.flattenArrays(std.flattenArrays([
+    [
+    bc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.c2 + suite),
+    bc.generate_fork_builds(c.weekly + hw.e3  + jdk + cc.c2 + suite)
+    ]
   for jdk in cc.product_jdks
   for suite in bench.groups.weekly_forks_suites
-  ]),
+  ])),
 
   local weekly_forks_aarch64_builds = std.flattenArrays([
     bc.generate_fork_builds(c.weekly + hw.a12c + jdk + cc.c2 + suite)
@@ -39,31 +42,31 @@
   ]),
 
   local economy_builds = [
-      c.weekly + hw.e3 + jdk + cc.libgraal + cc.economy_mode + suite
+      c.weekly + hw.x52 + jdk + cc.libgraal + cc.economy_mode + suite
     for jdk in cc.product_jdks
     for suite in bench.groups.main_suites
   ],
   local no_tiered_builds = std.flattenArrays([
     [
-    c.monthly + hw.e3 + jdk + cc.c1                                             + suite,
-    c.monthly + hw.e3 + jdk + cc.c2                         + cc.no_tiered_comp + suite,
-    c.monthly + hw.e3 + jdk + cc.libgraal + cc.economy_mode + cc.no_tiered_comp + suite
+    c.monthly + hw.x52 + jdk + cc.c1                                             + suite,
+    c.monthly + hw.x52 + jdk + cc.c2                         + cc.no_tiered_comp + suite,
+    c.monthly + hw.x52 + jdk + cc.libgraal + cc.economy_mode + cc.no_tiered_comp + suite
     ]
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ]),
 
   local gc_variants_builds = std.flattenArrays([
     [
-    c.monthly + hw.e3 + jdk + cc.c2                         + cc.zgc_mode + suite,
+    c.monthly + hw.x52 + jdk + cc.c2                         + cc.zgc_mode + suite,
     ]
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ]) + std.flattenArrays([
     [
-    c.monthly + hw.e3 + jdk + cc.c2                         + cc.serialgc_mode + bench.microservice_benchmarks,
-    c.monthly + hw.e3 + jdk + cc.c2                         + cc.pargc_mode    + bench.microservice_benchmarks,
-    c.monthly + hw.e3 + jdk + cc.c2                         + cc.zgc_mode      + bench.microservice_benchmarks,
+    c.monthly + hw.x52 + jdk + cc.c2                         + cc.serialgc_mode + bench.microservice_benchmarks,
+    c.monthly + hw.x52 + jdk + cc.c2                         + cc.pargc_mode    + bench.microservice_benchmarks,
+    c.monthly + hw.x52 + jdk + cc.c2                         + cc.zgc_mode      + bench.microservice_benchmarks,
     ]
   for jdk in cc.product_jdks
   ]),

espresso/ci/ci_common/common.jsonnet

@@ -34,8 +34,8 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   linux_amd64: self.common + self.linux + graal_common.linux_amd64,
   linux_aarch64: self.common + self.linux + graal_common.linux_aarch64,
 
-  e3: {
-    capabilities+: ['no_frequency_scaling', 'tmpfs25g', 'e3'],
+  x52: {
+    capabilities+: ['no_frequency_scaling', 'tmpfs25g', 'x52'],
   },
 
   darwin_amd64: self.common + graal_common.darwin_amd64 + {
@@ -110,15 +110,15 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   jdk21_gate_darwin_amd64       : self.gate          + self.darwin_amd64_21,
   jdk21_gate_darwin_aarch64     : self.gate          + self.darwin_aarch64_21,
   jdk21_gate_windows_amd64      : self.gate          + self.windows_21,
-  jdk21_bench_linux             : self.bench         + self.linux_amd64_21 + self.e3,
+  jdk21_bench_linux             : self.bench         + self.linux_amd64_21 + self.x52,
   jdk21_bench_darwin            : self.bench         + self.darwin_amd64_21,
   jdk21_bench_windows           : self.bench         + self.windows_21,
   jdk21_daily_linux_amd64       : self.daily         + self.linux_amd64_21,
   jdk21_daily_linux_aarch64     : self.daily         + self.linux_aarch64_21,
   jdk21_daily_darwin_amd64      : self.daily         + self.darwin_amd64_21,
   jdk21_daily_darwin_aarch64    : self.daily         + self.darwin_aarch64_21,
   jdk21_daily_windows_amd64     : self.daily         + self.windows_21,
-  jdk21_daily_bench_linux       : self.dailyBench    + self.linux_amd64_21 + self.e3,
+  jdk21_daily_bench_linux       : self.dailyBench    + self.linux_amd64_21 + self.x52,
   jdk21_daily_bench_darwin      : self.dailyBench    + self.darwin_amd64_21,
   jdk21_daily_bench_windows     : self.dailyBench    + self.windows_21,
   jdk21_weekly_linux_amd64      : self.weekly        + self.linux_amd64_21,
@@ -131,14 +131,14 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
   jdk21_monthly_darwin_amd64    : self.monthly       + self.darwin_amd64_21,
   jdk21_monthly_darwin_aarch64  : self.monthly       + self.darwin_aarch64_21,
   jdk21_monthly_windows_amd64   : self.monthly       + self.windows_21,
-  jdk21_weekly_bench_linux      : self.weeklyBench   + self.linux_amd64_21 + self.e3,
+  jdk21_weekly_bench_linux      : self.weeklyBench   + self.linux_amd64_21 + self.x52,
   jdk21_weekly_bench_darwin     : self.weeklyBench   + self.darwin_amd64_21,
   jdk21_weekly_bench_windows    : self.weeklyBench   + self.windows_21,
-  jdk21_monthly_bench_linux     : self.monthlyBench  + self.linux_amd64_21 + self.e3,
+  jdk21_monthly_bench_linux     : self.monthlyBench  + self.linux_amd64_21 + self.x52,
   jdk21_on_demand_linux         : self.onDemand      + self.linux_amd64_21,
   jdk21_on_demand_darwin        : self.onDemand      + self.darwin_amd64_21,
   jdk21_on_demand_windows       : self.onDemand      + self.windows_21,
-  jdk21_on_demand_bench_linux   : self.onDemandBench + self.linux_amd64_21 + self.e3,
+  jdk21_on_demand_bench_linux   : self.onDemandBench + self.linux_amd64_21 + self.x52,
   jdk21_on_demand_bench_darwin  : self.onDemandBench + self.darwin_amd64_21,
   jdk21_on_demand_bench_windows : self.onDemandBench + self.windows_21,
 

truffle/ci/ci.jsonnet

@@ -200,7 +200,7 @@
 
     # BENCHMARKS
 
-    bench_hw.e3 + common.labsjdkLatestCE + bench_common + {
+    bench_hw.x52 + common.labsjdkLatestCE + bench_common + {
       name: "bench-truffle-jmh-linux-amd64",
       notify_groups:: ["truffle_bench"],
       run: [

vm/ci/ci_common/common-bench.jsonnet

@@ -10,7 +10,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
 {
   vm_bench_common_gate: {
     result_file:: 'results.json',
-    capabilities+: ['e3'],
+    capabilities+: ['x52'],
     timelimit: '1:30:00',
   },
   vm_bench_common: self.vm_bench_common_gate + {
@@ -117,7 +117,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
   } + (if is_gate then self.vm_bench_common_gate else self.vm_bench_common),
 
   vm_bench_polybench_hpc_linux_common(env, metric, benchmarks='*', polybench_vm_config='native-interpreter'): self.vm_bench_polybench_linux_common(env=env) + self.polybench_hpc_linux_common + {
-    local machine_name = "e3",     // restricting ourselves to specific hardware to ensure performance counters work there
+    local machine_name = "x52",     // restricting ourselves to specific hardware to ensure performance counters work there
     machine_name_prefix:: "gate-",
     capabilities+: [machine_name],
     run+: [

wasm/ci/ci_common/common.jsonnet

@@ -158,7 +158,7 @@ local graal_suite_root = root_ci.graal_suite_root;
       ]
     ],
     logs: ['bench-results.json'],
-    capabilities+: ['e3'],
+    capabilities+: ['x52'],
     timelimit: '1:00:00',
   },