[GR-69515] [GR-55039] Update benchmark jobs frequencies.

PullRequest: graal/22084

Author: farquet

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -16,8 +16,6 @@
     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,
@@ -29,9 +27,9 @@
 
   local profiling_builds = std.flattenArrays([
     [
-    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" },
-    c.monthly + hw.x52_root + jdk + cc.libgraal + suite + cc.energy_tracking + { job_prefix:: "bench-compiler-energy" }
+    c.on_demand + hw.x52 + jdk + cc.libgraal + suite + cc.enable_profiling     + { job_prefix:: "bench-compiler-profiling" },
+    c.on_demand + hw.x52 + jdk + cc.libgraal + suite + cc.footprint_tracking   + { job_prefix:: "bench-compiler-footprint" },
+    c.monthly + hw.x52_root + jdk + cc.libgraal + suite + cc.energy_tracking   + { job_prefix:: "bench-compiler-energy" }
     ]
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -13,11 +13,10 @@
     spec_suites:: unique_suites([$.specjvm2008, $.specjbb2015]),
     jmh_micros_suites:: unique_suites([$.micros_graal_dist]),
     graal_internals_suites:: unique_suites([$.micros_graal_whitebox]),
-    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),
+    all_suites:: unique_suites(self.main_suites + self.spec_suites + self.jmh_micros_suites + self.microservice_suites),
 
     weekly_forks_suites:: self.main_suites + self.microservice_suites,
     all_but_main_suites:: std.setDiff(self.all_suites, self.main_suites, keyF=_suite_key),
@@ -61,22 +60,6 @@
     max_jdk_version:: null
   },
 
-  dacapo_size_variants: cc.compiler_benchmark + c.heap.default + bc.bench_max_threads + {
-    suite:: "dacapo-size-variants",
-    run+: [
-      self.benchmark_cmd + ["dacapo-small:*", "--"] + self.extra_vm_args,
-      self._bench_upload(),
-      self.benchmark_cmd + ["dacapo-large:*", "--"] + self.extra_vm_args,
-      self._bench_upload(),
-      self.benchmark_cmd + ["dacapo-huge:*", "--"] + self.extra_vm_args
-    ],
-    timelimit: "04:30:00",
-    forks_batches:: null,
-    forks_timelimit:: null,
-    min_jdk_version:: 8,
-    max_jdk_version:: null
-  },
-
   scala_dacapo: cc.compiler_benchmark + c.heap.default + bc.bench_max_threads + {
     suite:: "scala-dacapo",
     run+: [
@@ -90,27 +73,6 @@
     max_jdk_version:: null
   },
 
-  scala_dacapo_size_variants: cc.compiler_benchmark + c.heap.default + bc.bench_max_threads + {
-    suite:: "scala-dacapo-size-variants",
-    run+: [
-      self.benchmark_cmd + ["scala-dacapo-tiny:*", "--"] + self.extra_vm_args,
-      self._bench_upload(),
-      self.benchmark_cmd + ["scala-dacapo-small:*", "--"] + self.extra_vm_args,
-      self._bench_upload(),
-      self.benchmark_cmd + ["scala-dacapo-large:*", "--"] + self.extra_vm_args,
-      self._bench_upload(),
-      self.benchmark_cmd + ["scala-dacapo-huge:*", "--"] + self.extra_vm_args,
-      // Disabling the 'gargantuan' sizes since they require a lot of compute time for little added value
-      //self._bench_upload(),
-      //self.benchmark_cmd + ["scala-dacapo-gargantuan:*", "--"] + self.extra_vm_args
-    ],
-    timelimit: "03:00:00",
-    forks_batches:: null, # weekly forks disabled
-    forks_timelimit:: null,
-    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 + bc.bench_max_threads + {
     suite:: suite_name,
     local suite_version_args = if suite_version != null then ["--bench-suite-version=" + suite_version] else [],

compiler/ci/ci_includes/baseline-benchmarks.jsonnet

@@ -17,11 +17,11 @@
 
   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.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.a12c + jdk + cc.c2 + suite + cc.footprint_tracking  + { job_prefix:: "bench-compiler-footprint" },
-    c.monthly + hw.x52_root + jdk + cc.c2 + suite + cc.energy_tracking + { job_prefix:: "bench-compiler-energy" }
+    c.on_demand + hw.x52  + jdk + cc.c2 + suite + cc.enable_profiling    + { job_prefix:: "bench-compiler-profiling" },
+    c.on_demand + hw.a12c + jdk + cc.c2 + suite + cc.enable_profiling    + { job_prefix:: "bench-compiler-profiling" },
+    c.on_demand + hw.x52  + jdk + cc.c2 + suite + cc.footprint_tracking  + { job_prefix:: "bench-compiler-footprint" },
+    c.on_demand + hw.a12c + jdk + cc.c2 + suite + cc.footprint_tracking  + { job_prefix:: "bench-compiler-footprint" },
+    c.monthly + hw.x52_root + jdk + cc.c2 + suite + cc.energy_tracking   + { job_prefix:: "bench-compiler-energy" }
     ]
   for jdk in cc.product_jdks
   for suite in bench.groups.main_suites

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": "0fe21f893386fb7e7c5afdcb6b088e596544faa6"
+    "overlay": "49f8376ffc0773e2069aea7be211e06eafc1088b"
   }
 }