[GR-52118] Migrate remaining bench jobs to E3.

farquet · farquet · commit 62dce1594fee · 2024-04-22T19:46:06.000Z
PullRequest: graal/17545
diff --git a/ci/ci_common/bench-common.libsonnet b/ci/ci_common/bench-common.libsonnet
@@ -55,13 +55,6 @@
       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+: ["tmpfs25g"],
-      numa_nodes:: [0, 1],
-      default_numa_node:: 0,
-      num_threads:: 72
-    },
     e3:: common.linux_amd64 + self._bench_machine + {
       machine_name:: "e3",
       capabilities: ["e3", "tmpfs25g", "linux", "amd64"],
diff --git a/compiler/ci/ci_includes/baseline-benchmarks.jsonnet b/compiler/ci/ci_includes/baseline-benchmarks.jsonnet
@@ -7,7 +7,7 @@
   local hw = bc.bench_hw,
 
   local hotspot_amd64_builds = [
-    c.weekly + hw.x52 + jdk + cc.c2 + suite
+    c.weekly + hw.e3 + jdk + cc.c2 + suite
   for jdk in cc.product_jdks
   for suite in bench.groups.all_suites
   ],
@@ -20,17 +20,17 @@
 
   local hotspot_profiling_builds = std.flattenArrays([
     [
-    c.monthly + hw.x52  + jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
+    c.monthly + hw.e3  + 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.x52  + jdk + cc.c2 + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" },
+    c.monthly + hw.e3  + 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.x52 + jdk + cc.c2 + suite)
+    bc.generate_fork_builds(c.weekly + hw.e3 + jdk + cc.c2 + suite)
   for jdk in cc.jdks_of_interest
   for suite in bench.groups.weekly_forks_suites
   ]),
@@ -42,32 +42,32 @@
   ]),
 
   local economy_builds = [
-      c.weekly + hw.x52 + jdk + cc.libgraal + cc.economy_mode + suite
+      c.weekly + hw.e3 + 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.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
+    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
     ]
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ]),
 
   local gc_variants_builds = std.flattenArrays([
     [
-    c.monthly + hw.x52 + jdk + cc.c2                         + cc.zgc_mode + suite,
+    c.monthly + hw.e3 + 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.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,
-    c.monthly + hw.x52 + jdk + cc.c2                         + cc.gen_zgc_mode  + bench.microservice_benchmarks,
+    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.e3 + jdk + cc.c2                         + cc.gen_zgc_mode  + bench.microservice_benchmarks,
     ]
   for jdk in cc.product_jdks
   ]),
diff --git a/espresso/ci/ci_common/common.jsonnet b/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,
 
-  x52: {
-    capabilities+: ['no_frequency_scaling', 'tmpfs25g', 'x52'],
+  e3: {
+    capabilities+: ['no_frequency_scaling', 'tmpfs25g', 'e3'],
   },
 
   darwin_amd64: self.common + graal_common.darwin_amd64 + {
@@ -106,15 +106,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.x52,
+  jdk21_bench_linux             : self.bench         + self.linux_amd64_21 + self.e3,
   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.x52,
+  jdk21_daily_bench_linux       : self.dailyBench    + self.linux_amd64_21 + self.e3,
   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,
@@ -127,13 +127,13 @@ 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.x52,
+  jdk21_weekly_bench_linux      : self.weeklyBench   + self.linux_amd64_21 + self.e3,
   jdk21_weekly_bench_darwin     : self.weeklyBench   + self.darwin_amd64_21,
   jdk21_weekly_bench_windows    : self.weeklyBench   + self.windows_21,
   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.x52,
+  jdk21_on_demand_bench_linux   : self.onDemandBench + self.linux_amd64_21 + self.e3,
   jdk21_on_demand_bench_darwin  : self.onDemandBench + self.darwin_amd64_21,
   jdk21_on_demand_bench_windows : self.onDemandBench + self.windows_21,
 
diff --git a/truffle/ci/ci.jsonnet b/truffle/ci/ci.jsonnet
@@ -159,7 +159,7 @@
 
     # BENCHMARKS
 
-    bench_hw.x52 + common.labsjdkLatestCE + bench_common + {
+    bench_hw.e3 + common.labsjdkLatestCE + bench_common + {
       name: "bench-truffle-jmh",
       notify_groups:: ["truffle_bench"],
       run: [
diff --git a/vm/ci/ci_common/common-bench.jsonnet b/vm/ci/ci_common/common-bench.jsonnet
@@ -12,7 +12,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
     result_file:: 'results.json',
     upload:: ['bench-uploader.py', self.result_file],
     upload_and_wait_for_indexing:: self.upload + ['--wait-for-indexing'],
-    capabilities+: ['tmpfs25g', 'x52'],
+    capabilities+: ['tmpfs25g', 'e3'],
     timelimit: '1:30:00',
   },
 
@@ -41,6 +41,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
       ENABLE_POLYBENCH_HPC: 'yes',
       POLYBENCH_HPC_EXTRA_HEADERS: '/cm/shared/apps/papi/papi-5.5.1/include',
       POLYBENCH_HPC_PAPI_LIB_DIR: '/cm/shared/apps/papi/papi-5.5.1/lib',
+      LIBPFM_FORCE_PMU: 'amd64'
     },
   },
 
@@ -124,7 +125,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
   },
 
   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 = "x52",     // restricting ourselves to x52 machines since we know hardware performance counters work properly there
+    local machine_name = "e3",     // restricting ourselves to specific hardware to ensure performance counters work there
     machine_name_prefix:: "gate-",
     capabilities+: [machine_name],
     run+: [
@@ -239,7 +240,7 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
     timelimit: '55:00',
   },
 
-  x52_js_bench_compilation_throughput(pgo): self.vm_bench_common + common.heap.default + {
+  js_bench_compilation_throughput(pgo): self.vm_bench_common + common.heap.default + {
     local mx_libgraal = ["mx", "--env", repo_config.vm.mx_env.libgraal],
 
     setup+: [
@@ -307,8 +308,8 @@ local repo_config = import '../../../ci/repo-configuration.libsonnet';
 
     vm_common.vm_base('linux', 'amd64', 'daily', bench=true) + self.vm_bench_polybench_nfi_linux_amd64 + vm.vm_java_21 + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-nfi-java21-linux-amd64', notify_groups:: ['polybench']},
 
-    vm_common.vm_base('linux', 'amd64', 'daily', bench=true) + self.x52_js_bench_compilation_throughput(true) + vm.vm_java_21 + { name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-libgraal-pgo-throughput-js-typescript-java' + self.jdk_version + '-linux-amd64' },
-    vm_common.vm_base('linux', 'amd64', 'daily', bench=true) + self.x52_js_bench_compilation_throughput(false) + vm.vm_java_21 + { name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-libgraal-no-pgo-throughput-js-typescript-java' + self.jdk_version + '-linux-amd64' },
+    vm_common.vm_base('linux', 'amd64', 'daily', bench=true) + self.js_bench_compilation_throughput(true) + vm.vm_java_21 + { name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-libgraal-pgo-throughput-js-typescript-java' + self.jdk_version + '-linux-amd64' },
+    vm_common.vm_base('linux', 'amd64', 'daily', bench=true) + self.js_bench_compilation_throughput(false) + vm.vm_java_21 + { name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-libgraal-no-pgo-throughput-js-typescript-java' + self.jdk_version + '-linux-amd64' },
 
     vm_common.vm_base('linux', 'amd64', 'daily', bench=true) + self.vm_bench_js_linux_amd64() + {
       # Override `self.vm_bench_js_linux_amd64.run`
diff --git a/wasm/ci/ci_common/common.jsonnet b/wasm/ci/ci_common/common.jsonnet
@@ -172,7 +172,7 @@ local graal_suite_root = root_ci.graal_suite_root;
       ]
     ],
     logs: ['bench-results.json'],
-    capabilities+: ['x52'],
+    capabilities+: ['e3'],
     timelimit: '1:00:00',
   },
 

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ local graal_suite_root = root_ci.graal_suite_root;`
`172`	`172`	`]`
`173`	`173`	`],`
`174`	`174`	`logs: ['bench-results.json'],`
`175`		`- capabilities+: ['x52'],`
	`175`	`+ capabilities+: ['e3'],`
`176`	`176`	`timelimit: '1:00:00',`
`177`	`177`	`},`
`178`	`178`