[GR-42277] Add aarch64 JDK20 benchmarking.

PullRequest: graal/13870

Author: farquet

ci/ci_common/bench-common.libsonnet

@@ -20,6 +20,8 @@
       "mount_modules": true
     },
     should_use_hwloc:: std.objectHasAll(self, "is_numa") && self.is_numa && std.length(std.find("bench", self.targets)) > 0,
+    restricted_archs:: null,  # null means all architectures are supported, otherwise it must be a list of allowed archs as strings
+    is_arch_supported(arch):: if self.restricted_archs == null then true else std.member(self.restricted_archs, arch),
     min_jdk_version:: null,
     max_jdk_version:: null,
     is_jdk_supported(jdk_version)::

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -8,41 +8,23 @@
   local main_builds = std.flattenArrays([
     [
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.dacapo + { unicorn_pull_request_benchmarking:: {name: 'libgraal', metrics: ['time']}},
-    c.daily      + hw.x52 + jdk + cc.jargraal + bench.dacapo,
     c.weekly     + hw.x52 + jdk + cc.libgraal + bench.dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.dacapo_size_variants,
     c.weekly     + hw.x52 + jdk + cc.libgraal + bench.dacapo_timing,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.dacapo_timing,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo,
-    c.daily      + hw.x52 + jdk + cc.jargraal + bench.scala_dacapo,
     c.weekly     + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.scala_dacapo_size_variants,
     c.weekly     + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo_timing,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.scala_dacapo_timing,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.renaissance + {unicorn_pull_request_benchmarking:: 'libgraal'},
-    c.daily      + hw.x52 + jdk + cc.jargraal + bench.renaissance,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.specjvm2008,
-    c.daily      + hw.x52 + jdk + cc.jargraal + bench.specjvm2008,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.specjbb2015,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.specjbb2015,
     c.weekly     + hw.x52 + jdk + cc.libgraal + bench.specjbb2015_full_machine,
-    c.monthly    + hw.x52 + jdk + cc.jargraal + bench.specjbb2015_full_machine,
     c.weekly     + hw.x52 + jdk + cc.libgraal + bench.renaissance_0_11,
-    c.monthly    + hw.x52 + jdk + cc.jargraal + bench.renaissance_0_11,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.awfy + {unicorn_pull_request_benchmarking:: 'libgraal'},
-    c.daily      + hw.x52 + jdk + cc.jargraal + bench.awfy,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.microservice_benchmarks,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.microservice_benchmarks,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.renaissance_legacy,
-    c.daily      + hw.x52 + jdk + cc.jargraal + bench.renaissance_legacy,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_graal_whitebox,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_graal_whitebox,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_graal_dist,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_graal_dist,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_misc_graal_dist,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_misc_graal_dist,
     c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_shootout_graal_dist,
-    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_shootout_graal_dist,
     ]
   for jdk in cc.bench_jdks
   ]),
@@ -57,22 +39,23 @@
   for suite in bench.groups.profiled_suites
   ]),
 
-  // intensive weekly benchmarking
-  local weekly_forks_builds = std.flattenArrays([
-    bc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.libgraal + suite, subdir='compiler')
+  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')
   for jdk in cc.bench_jdks
   for suite in bench.groups.weekly_forks_suites
   ]),
 
-  local aarch64_builds = std.flattenArrays([
-    [
-    c.weekly + hw.a12c + jdk + cc.libgraal + suite,
-    c.weekly + hw.a12c + jdk + cc.jargraal + suite
-    ]
-  for jdk in cc.bench_jdks
-  for suite in bench.groups.all_suites
+  local weekly_aarch64_forks_builds = std.flattenArrays([
+    bc.generate_fork_builds(c.weekly + hw.a12c + cc.latest_jdk + cc.libgraal + suite, subdir='compiler')
+  for suite in bench.groups.weekly_forks_suites
   ]),
 
+  local aarch64_builds = [
+    c.daily + hw.a12c + cc.latest_jdk + cc.libgraal + suite,
+  for suite in bench.groups.all_suites
+  ],
+
   local avx_builds = [
     c.monthly + hw.x82 + jdk + cc.libgraal + avx + suite,
   for avx in [cc.avx2_mode, cc.avx3_mode]
@@ -93,8 +76,8 @@
   ],
 
 
-  local all_builds = main_builds + weekly_forks_builds + profiling_builds + avx_builds + aarch64_builds + no_tiered_builds + no_profile_info_builds,
-  local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version)],
+  local all_builds = main_builds + weekly_amd64_forks_builds + weekly_aarch64_forks_builds + profiling_builds + avx_builds + aarch64_builds + no_tiered_builds + no_profile_info_builds,
+  local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version) && b.is_arch_supported(b.arch)],
   // adds a "defined_in" field to all builds mentioning the location of this current file
   builds:: [{ defined_in: std.thisFile } + b for b in filtered_builds]
 }

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -13,10 +13,10 @@
     legacy_and_secondary_suites:: unique_suites([$.renaissance_0_11, $.renaissance_legacy]),
     jmh_micros_suites:: unique_suites([$.micros_graal_dist, $.micros_misc_graal_dist , $.micros_shootout_graal_dist]),
     graal_internals_suites:: unique_suites([$.micros_graal_whitebox]),
-    special_suites:: unique_suites([$.renaissance, $.dacapo_size_variants, $.scala_dacapo_size_variants, $.specjbb2015_full_machine]),
+    special_suites:: unique_suites([$.dacapo_size_variants, $.scala_dacapo_size_variants, $.specjbb2015_full_machine]),
     microservice_suites:: unique_suites([$.microservice_benchmarks]),
 
-    main_suites:: unique_suites([$.specjvm2008] + self.open_suites + self.legacy_and_secondary_suites),
+    main_suites:: unique_suites([$.specjvm2008] + self.open_suites),
     all_suites:: unique_suites(self.main_suites + self.spec_suites + self.jmh_micros_suites + self.special_suites + self.microservice_suites),
 
     weekly_forks_suites:: self.main_suites,
@@ -59,8 +59,8 @@
       self._bench_upload(),
       self.benchmark_cmd + ["dacapo-huge:*", "--"] + self.extra_vm_args
     ],
-    timelimit: "07:00:00",
-    forks_batches:: null, # weekly forks disabled
+    timelimit: "09:00:00",
+    forks_batches:: null,
     forks_timelimit:: null,
     min_jdk_version:: 8,
     max_jdk_version:: null
@@ -266,7 +266,8 @@
       bench_upload
     ],
     timelimit: "7:00:00",
-    min_jdk_version:: 11, # GR-32793: disabled JDK8
+    restricted_archs:: ["amd64"],  # load testers only work on amd64 at the moment: GR-35619
+    min_jdk_version:: 11,
     max_jdk_version:: null
   },
 

compiler/ci/ci_common/compiler-common.libsonnet

@@ -31,9 +31,10 @@
     ]
   },
 
+  latest_jdk:: common["labsjdk-ee-20"],
   bench_jdks:: [
     common["labsjdk-ee-17"],
-    common["labsjdk-ee-20"]
+    self.latest_jdk
   ],
 
   // Benchmarking building blocks

compiler/ci/ci_includes/baseline-benchmarks.jsonnet

@@ -5,33 +5,36 @@
   local bench = (import '../ci_common/benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,
 
-  local hotspot_main_builds = [
+  local hotspot_amd64_builds = [
     c.weekly + hw.x52 + jdk + cc.c2 + suite
   for jdk in cc.bench_jdks
   for suite in bench.groups.all_suites
   ],
 
+  local hotspot_aarch64_builds = [
+    c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + suite
+  for suite in bench.groups.all_suites
+  ],
+
   local hotspot_profiling_builds = std.flattenArrays([
     [
-    c.weekly + hw.x52 + jdk + cc.c2 + cc.enable_profiling   + suite + { job_prefix:: "bench-profiling" },
-    c.weekly + hw.x52 + jdk + cc.c2 + cc.footprint_tracking + suite + { job_prefix:: "bench-footprint" }
+    c.weekly + hw.x52  + cc.latest_jdk + cc.c2 + cc.enable_profiling   + suite + { job_prefix:: "bench-profiling" },
+    c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + cc.enable_profiling   + suite + { job_prefix:: "bench-profiling" },
+    c.weekly + hw.x52  + cc.latest_jdk + cc.c2 + cc.footprint_tracking + suite + { job_prefix:: "bench-footprint" },
+    c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + cc.footprint_tracking + suite + { job_prefix:: "bench-footprint" }
     ]
-  for jdk in cc.bench_jdks
   for suite in bench.groups.profiled_suites
   ]),
 
-  local weekly_forks_builds = std.flattenArrays([
+  local weekly_forks_amd64_builds = std.flattenArrays([
     bc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.c2 + suite)
   for jdk in cc.bench_jdks
   for suite in bench.groups.weekly_forks_suites
   ]),
 
-  local aarch64_builds = std.flattenArrays([
-    [
-    c.weekly + hw.a12c + jdk + cc.c2 + suite
-    ]
-  for jdk in cc.bench_jdks
-  for suite in bench.groups.all_suites
+  local weekly_forks_aarch64_builds = std.flattenArrays([
+    bc.generate_fork_builds(c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + suite)
+  for suite in bench.groups.weekly_forks_suites
   ]),
 
   local daily_economy_builds = [
@@ -56,8 +59,9 @@
   for suite in bench.groups.main_suites
   ]),
 
-  local all_builds = hotspot_main_builds + hotspot_profiling_builds + weekly_forks_builds + aarch64_builds + daily_economy_builds + weekly_economy_builds + no_tiered_builds,
-  local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version)],
+  local all_builds = hotspot_amd64_builds + hotspot_aarch64_builds + hotspot_profiling_builds +
+    weekly_forks_amd64_builds + weekly_forks_aarch64_builds + daily_economy_builds + weekly_economy_builds + no_tiered_builds,
+  local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version) && b.is_arch_supported(b.arch)],
   // adds a "defined_in" field to all builds mentioning the location of this current file
   builds:: [{ defined_in: std.thisFile } + b for b in filtered_builds]
 }

graal-common.json

@@ -1,6 +1,6 @@
 {
   "README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "eb33a970f96d7156df8179549e60ed5a00e34eb8"
+    "overlay": "b9d28e698657109fa59673908fbfc722976430d0"
   }
 }