[GR-49587] [GR-50805] Migrate Benchmarking to JDK latest.

PullRequest: graal/16467

Author: farquet

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -13,14 +13,11 @@
     [
     c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.dacapo + PR_bench_libgraal,
     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 + PR_bench_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 + PR_bench_libgraal,
     c.daily + c.opt_post_merge + hw.x52 + jdk + cc.libgraal + bench.specjvm2008 + PR_bench_libgraal,
     c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.specjbb2015,
-    c.weekly                   + hw.x52 + jdk + cc.libgraal + bench.specjbb2015_full_machine,
     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.daily                    + hw.x52 + jdk + cc.libgraal + bench.micros_graal_whitebox,
@@ -34,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 suite in bench.groups.profiled_suites
+  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,
-  for suite in bench.groups.all_suites
+    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/benchmark-suites.libsonnet

@@ -12,14 +12,13 @@
     spec_suites:: unique_suites([$.specjvm2008, $.specjbb2015]),
     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([$.dacapo_size_variants, $.scala_dacapo_size_variants, $.specjbb2015_full_machine]),
+    special_suites:: unique_suites([$.dacapo_size_variants, $.scala_dacapo_size_variants]),
     microservice_suites:: unique_suites([$.microservice_benchmarks]),
 
     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,
-    profiled_suites::     std.setDiff(self.main_suites, [$.specjbb2015], keyF=_suite_key),
     all_but_main_suites:: std.setDiff(self.all_suites, self.main_suites, keyF=_suite_key),
   },
 
@@ -65,16 +64,6 @@
     max_jdk_version:: null
   },
 
-  dacapo_timing: cc.compiler_benchmark + c.heap.default + {
-    suite:: "dacapo-timing",
-    run+: [
-      self.benchmark_cmd + ["dacapo-timing:*", "--"] + self.extra_vm_args
-    ],
-    timelimit: "45:00",
-    min_jdk_version:: 8,
-    max_jdk_version:: null
-  },
-
   scala_dacapo: cc.compiler_benchmark + c.heap.default + {
     suite:: "scala-dacapo",
     run+: [
@@ -108,16 +97,6 @@
     max_jdk_version:: null
   },
 
-  scala_dacapo_timing: cc.compiler_benchmark + c.heap.default + {
-    suite:: "scala-dacapo-timing",
-    run+: [
-      self.benchmark_cmd + ["scala-dacapo-timing:*", "--"] + self.extra_vm_args
-    ],
-    timelimit: "45:00",
-    min_jdk_version:: 8,
-    max_jdk_version:: null
-  },
-
   renaissance_template(suite_version=null, suite_name="renaissance", max_jdk_version=null):: cc.compiler_benchmark + c.heap.default + {
     suite:: suite_name,
     local suite_version_args = if suite_version != null then ["--bench-suite-version=" + suite_version] else [],
@@ -148,19 +127,6 @@
     max_jdk_version:: null
   },
 
-  specjbb2015_full_machine: cc.compiler_benchmark + c.heap.large_with_large_young_gen + {
-    suite:: "specjbb2015-full-machine",
-    downloads+: {
-      "SPECJBB2015": { name: "specjbb2015", version: "1.03" }
-    },
-    run+: [
-      self.plain_benchmark_cmd + ["specjbb2015", "--"] + self.extra_vm_args
-    ],
-    timelimit: "3:00:00",
-    min_jdk_version:: 8,
-    max_jdk_version:: null
-  },
-
   specjvm2008: cc.compiler_benchmark + c.heap.default + {
     suite:: "specjvm2008",
     downloads+: {

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
-  for suite in bench.groups.all_suites
+    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 suite in bench.groups.profiled_suites
+  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,

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": "a3a0f1c506dc9974814a49de1cd24504c25c56f3"
+    "overlay": "ad801a5f7147561be19dd164003600bd31a43075"
   }
 }