Add 'layered' VM config modifier; update to Stage & StagesInfo: stages now include layer information along with the stage name, stages are prepared at a single point in the benchmark; handle layered benchmarks appropriately; introduce LayeredNativeImageBundleBasedBenchmarkMixin as a starting point for supporting layered benchmarks.

Author: Andrija Kolic

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -129,15 +129,15 @@
 
   barista_template(suite_version=null, suite_name="barista", max_jdk_version=null, cmd_app_prefix=["hwloc-bind --cpubind node:0.core:0-3.pu:0 --membind node:0"], non_prefix_barista_args=[]):: cc.compiler_benchmark + {
     suite:: suite_name,
-    local barista_version = "v0.3.4",
+    local barista_version = "v0.4.2",
     local suite_version_args = if suite_version != null then ["--bench-suite-version=" + suite_version] else [],
     local prefix_barista_arg = if std.length(cmd_app_prefix) > 0 then [std.format("--cmd-app-prefix=%s", std.join(" ", cmd_app_prefix))] else [],
     local all_barista_args = prefix_barista_arg + non_prefix_barista_args,
     local barista_args_with_separator = if std.length(all_barista_args) > 0 then ["--"] + all_barista_args else [],
     downloads+: {
       "WRK": { "name": "wrk", "version": "a211dd5", platformspecific: true},
       "WRK2": { "name": "wrk2", "version": "2.1", platformspecific: true},
-      "BARISTA_BENCHMARKS": { "name": "barista", "version": "0.3.0"}
+      "BARISTA_BENCHMARKS": { "name": "barista", "version": "0.3.5"}
     },
     packages+: {
       maven: "==3.8.6",

compiler/mx.compiler/mx_graal_benchmark.py

@@ -33,7 +33,7 @@
 import mx_sdk_benchmark
 from mx_benchmark import DataPoints
 from mx_sdk_benchmark import DaCapoBenchmarkSuite, ScalaDaCapoBenchmarkSuite, RenaissanceBenchmarkSuite, SpecJvm2008BenchmarkSuite
-from mx_sdk_benchmark import JvmciJdkVm, SUCCESSFUL_STAGE_PATTERNS, Stage
+from mx_sdk_benchmark import JvmciJdkVm, SUCCESSFUL_STAGE_PATTERNS
 
 _suite = mx.suite('compiler')
 
@@ -259,20 +259,8 @@ def get_jmh_result_file(self, bm_suite_args: List[str]) -> Optional[str]:
         :class:`mx_benchmark.JMHJsonRule`) will produce datapoints at every stage, based on results from a previous
         stage.
         """
-        if self.is_native_mode(bm_suite_args) and not self.stages_info.fallback_mode:
-            # At this point, the StagesInfo class may not have all the information yet, in that case we rely on the
-            # requested stage. But if this function is called later again when it is fully set up, we have to use the
-            # effective stage instead.
-            # This is important so that the JMH parsing rule is only enabled when the stage actually ran (if it is
-            # skipped, it would otherwise pick up a previous result file)
-            if self.stages_info.is_set_up:
-                current_stage = self.stages_info.effective_stage
-            else:
-                current_stage = self.stages_info.requested_stage
-
-            if current_stage not in [Stage.AGENT, Stage.INSTRUMENT_RUN, Stage.RUN]:
-                return None
-
+        if self.is_native_mode(bm_suite_args) and not self.stages_info.fallback_mode and self.stages_info.current_stage.is_image():
+            return None
         return super().get_jmh_result_file(bm_suite_args)
 
     def fallback_mode_reason(self, bm_suite_args: List[str]) -> Optional[str]: