Migrate JIT benchmarks to JDK latest

Author: farquet

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -31,64 +31,66 @@
     c.daily                    + hw.e4_8_64 + jdk + cc.libgraal + bench.specjvm2008 + {job_prefix:: "bench-e4vm-compiler"},
     c.daily                    + hw.e4_8_64 + jdk + cc.libgraal + bench.microservice_benchmarks + {job_prefix:: "bench-e4vm-compiler"},
     ]
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_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" }
     ]
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_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')
-  for jdk in cc.bench_jdks
+  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 + cc.latest_jdk + cc.libgraal + suite, subdir='compiler')
+    bc.generate_fork_builds(c.weekly + hw.a12c + jdk + cc.libgraal + suite, subdir='compiler')
+  for jdk in cc.product_jdks
   for suite in bench.groups.weekly_forks_suites
   ]),
 
   local aarch64_builds = [
-    c.daily + hw.a12c + cc.latest_jdk + cc.libgraal + suite,
+    c.daily + hw.a12c + jdk + cc.libgraal + suite,
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ],
 
   local avx_builds = [
     c.monthly + hw.x82 + jdk + cc.libgraal + avx + suite,
   for avx in [cc.avx2_mode, cc.avx3_mode]
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ],
 
   local zgc_builds = [
     c.weekly + hw.x52 + jdk + cc.libgraal + cc.zgc_mode + suite,
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites + [bench.specjbb2015]
   ],
 
   local zgc_avx_builds = [
     c.monthly + hw.x82 + jdk + cc.libgraal + cc.zgc_mode + avx + suite,
   for avx in [cc.avx2_mode, cc.avx3_mode]
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ],
 
   local no_tiered_builds = [
     c.weekly + hw.x52 + jdk + cc.libgraal + cc.no_tiered_comp + suite,
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_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,
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ],
 

compiler/ci/ci_common/compiler-common.libsonnet

@@ -33,9 +33,13 @@
     ]
   },
 
-  latest_jdk:: common["labsjdk-ee-21"],
-  bench_jdks:: [
-    self.latest_jdk
+  product_jdks:: [
+     common["labsjdk-ee-latest"],
+  ],
+
+  jdks_of_interest:: [
+     common["labsjdk-ee-21"],
+     common["labsjdk-ee-latest"],
   ],
 
   compiler_benchmarks_notifications:: {

compiler/ci/ci_includes/baseline-benchmarks.jsonnet

@@ -8,45 +8,48 @@
 
   local hotspot_amd64_builds = [
     c.weekly + hw.x52 + jdk + cc.c2 + suite
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.all_suites
   ],
 
   local hotspot_aarch64_builds = [
-    c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + suite
+    c.weekly + hw.a12c + jdk + cc.c2 + suite
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ],
 
   local hotspot_profiling_builds = std.flattenArrays([
     [
-    c.weekly + hw.x52  + cc.latest_jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
-    c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
-    c.weekly + hw.x52  + cc.latest_jdk + cc.c2 + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" },
-    c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" }
+    c.weekly + hw.x52  + jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
+    c.weekly + hw.a12c + jdk + cc.c2 + suite + cc.enable_profiling   + { job_prefix:: "bench-compiler-profiling" },
+    c.weekly + hw.x52  + jdk + cc.c2 + suite + cc.footprint_tracking + { job_prefix:: "bench-compiler-footprint" },
+    c.weekly + 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)
-  for jdk in cc.bench_jdks
+  for jdk in cc.jdks_of_interest
   for suite in bench.groups.weekly_forks_suites
   ]),
 
   local weekly_forks_aarch64_builds = std.flattenArrays([
-    bc.generate_fork_builds(c.weekly + hw.a12c + cc.latest_jdk + cc.c2 + suite)
+    bc.generate_fork_builds(c.weekly + hw.a12c + jdk + cc.c2 + suite)
+  for jdk in cc.product_jdks
   for suite in bench.groups.weekly_forks_suites
   ]),
 
   local daily_economy_builds = [
       c.daily + hw.x52 + jdk + cc.libgraal + cc.economy_mode + suite
-    for jdk in cc.bench_jdks
+    for jdk in cc.product_jdks
     for suite in bench.groups.main_suites
   ],
 
   local weekly_economy_builds = [
       c.weekly + hw.x52 + jdk + cc.libgraal + cc.economy_mode + suite
-    for jdk in cc.bench_jdks
+    for jdk in cc.product_jdks
     for suite in bench.groups.all_but_main_suites
   ],
 
@@ -56,15 +59,15 @@
     c.weekly + hw.x52 + jdk + cc.c2                         + cc.no_tiered_comp + suite,
     c.weekly + hw.x52 + jdk + cc.libgraal + cc.economy_mode + cc.no_tiered_comp + suite
     ]
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ]),
 
   local gc_variants_builds = std.flattenArrays([
     [
     c.weekly + hw.x52 + jdk + cc.c2                         + cc.zgc_mode + suite,
     ]
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   for suite in bench.groups.main_suites
   ]) + std.flattenArrays([
     [
@@ -73,7 +76,7 @@
     c.weekly + hw.x52 + jdk + cc.c2                         + cc.zgc_mode + bench.microservice_benchmarks,
     c.weekly + hw.x52 + jdk + cc.c2                         + cc.gen_zgc_mode + bench.microservice_benchmarks,
     ]
-  for jdk in cc.bench_jdks
+  for jdk in cc.product_jdks
   ]),
   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 + gc_variants_builds,