[GR-58235] [GR-58270] [GR-58234] [GR-34642] [GR-56335] [GR-42479] [GR-55041] Several CI benchmarking fixes and improvements.

PullRequest: graal/19458

Author: farquet

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -70,7 +70,7 @@
     run+: [
       self.benchmark_cmd + ["scala-dacapo:*", "--"] + self.extra_vm_args
     ],
-    timelimit: "01:00:00",
+    timelimit: "01:30:00",
     forks_batches:: 2,
     bench_forks_per_batch:: 3,
     forks_timelimit:: "02:30:00",
@@ -105,7 +105,7 @@
     run+: [
       self.benchmark_cmd + ["renaissance:*"] + suite_version_args + ["--"] + self.extra_vm_args
     ],
-    timelimit: "2:00:00",
+    timelimit: "2:30:00",
     forks_batches:: 4,
     bench_forks_per_batch:: 2,
     forks_timelimit:: "4:00:00",

compiler/ci/ci_includes/baseline-benchmarks.jsonnet

@@ -6,20 +6,14 @@
   local bench = (import '../ci_common/benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,
 
-  local hotspot_amd64_builds = [
-    c.weekly + hw.e3 + jdk + cc.c2 + suite
+  local hotspot_builds = std.flattenArrays([
+    [
+      c.weekly + hw.e3 + jdk + cc.c2 + suite,
+      c.weekly + hw.a12c + jdk + cc.c2 + suite
+    ]
   for jdk in cc.jdks_of_interest
   for suite in bench.groups.all_suites
-  ],
-
-  local hotspot_aarch64_builds = [
-    c.weekly + hw.a12c + jdk + cc.c2 + suite
-  for jdk in cc.jdks_of_interest
-  for suite in bench.groups.main_suites
-  ] + [
-    c.monthly + hw.a12c + jdk + cc.c2 + bench.specjbb2015,
-  for jdk in cc.product_jdks
-  ],
+  ]),
 
   local hotspot_profiling_builds = std.flattenArrays([
     [
@@ -73,7 +67,7 @@
     ]
   for jdk in cc.product_jdks
   ]),
-  local all_builds = hotspot_amd64_builds + hotspot_aarch64_builds + hotspot_profiling_builds +
+  local all_builds = hotspot_builds + hotspot_profiling_builds +
     weekly_forks_amd64_builds + weekly_forks_aarch64_builds + economy_builds + no_tiered_builds + gc_variants_builds,
   local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version) && b.is_arch_supported(b.arch)],
 

vm/mx.vm/mx_vm_benchmark.py

@@ -230,6 +230,8 @@ def __init__(self, vm: NativeImageVM, bm_suite: BenchmarkSuite | NativeImageBenc
             base_image_build_args += ['-H:+UseStringInlining']
         if vm.use_open_type_world:
             base_image_build_args += ['-H:-ClosedTypeWorld']
+        if vm.use_compacting_gc:
+            base_image_build_args += ['-H:+CompactingOldGen']
         if vm.is_llvm:
             base_image_build_args += ['--features=org.graalvm.home.HomeFinderFeature'] + ['-H:CompilerBackend=llvm', '-H:DeadlockWatchdogInterval=0']
         if vm.gc:
@@ -531,6 +533,7 @@ def __init__(self, name, config_name, extra_java_args=None, extra_launcher_args=
         self.native_architecture = False
         self.use_upx = False
         self.use_open_type_world = False
+        self.use_compacting_gc = False
         self.graalvm_edition = None
         self.config: Optional[NativeImageBenchmarkConfig] = None
         self.stages_info: Optional[StagesInfo] = None
@@ -569,6 +572,8 @@ def config_name(self):
             config += ["string-inlining"]
         if self.use_open_type_world is True:
             config += ["otw"]
+        if self.use_compacting_gc is True:
+            config += ["compacting-gc"]
         if self.is_gate is True:
             config += ["gate"]
         if self.use_upx is True:
@@ -637,7 +642,8 @@ def _configure_from_name(self, config_name):
             mx.abort(f"config_name must be set. Use 'default' for the default {self.__class__.__name__} configuration.")
 
         # This defines the allowed config names for NativeImageVM. The ones registered will be available via --jvm-config
-        rule = r'^(?P<native_architecture>native-architecture-)?(?P<string_inlining>string-inlining-)?(?P<otw>otw-)?(?P<gate>gate-)?(?P<upx>upx-)?(?P<quickbuild>quickbuild-)?(?P<gc>g1gc-)?(?P<llvm>llvm-)?(?P<pgo>pgo-|pgo-ctx-insens-|pgo-sampler-)?(?P<inliner>inline-)?' \
+        rule = r'^(?P<native_architecture>native-architecture-)?(?P<string_inlining>string-inlining-)?(?P<otw>otw-)?(?P<compacting_gc>compacting-gc-)?(?P<gate>gate-)?(?P<upx>upx-)?(?P<quickbuild>quickbuild-)?(?P<gc>g1gc-)?' \
+               r'(?P<llvm>llvm-)?(?P<pgo>pgo-|pgo-ctx-insens-|pgo-sampler-)?(?P<inliner>inline-)?' \
                r'(?P<analysis_context_sensitivity>insens-|allocsens-|1obj-|2obj1h-|3obj2h-|4obj3h-)?(?P<no_inlining_before_analysis>no-inline-)?(?P<jdk_profiles>jdk-profiles-collect-|adopted-jdk-pgo-)?' \
                r'(?P<profile_inference>profile-inference-feature-extraction-|profile-inference-pgo-|profile-inference-debug-)?(?P<sampler>safepoint-sampler-|async-sampler-)?(?P<optimization_level>O0-|O1-|O2-|O3-|Os-)?(default-)?(?P<edition>ce-|ee-)?$'
 
@@ -667,6 +673,10 @@ def _configure_from_name(self, config_name):
             mx.logv(f"'otw' is enabled for {config_name}")
             self.use_open_type_world = True
 
+        if matching.group("compacting_gc") is not None:
+            mx.logv(f"'compacting-gc' is enabled for {config_name}")
+            self.use_compacting_gc = True
+
         if matching.group("quickbuild") is not None:
             mx.logv(f"'quickbuild' is enabled for {config_name}")
             self.is_quickbuild = True