[GR-70813] Support Layered configuration of Barista: Micronaut Shopcart

PullRequest: graal/22431

Author: Andrija Kolic

compiler/ci/OWNERS.toml

@@ -0,0 +1,6 @@
+[[rule]]
+files = "benchmark-*.libsonnet benchmark-*.jsonnet"
+any = [
+    "[email protected]",
+    "[email protected]",
+]

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -91,15 +91,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.5.0",
+    local barista_version = "0.5.1",
     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.5.0"}
+      "BARISTA_BENCHMARKS": { "name": "barista", "version": "0.5.1"}
     },
     packages+: {
       maven: "==3.8.6",

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -304,9 +304,9 @@ def default_stages(self) -> List[str]:
         return super().default_stages()
 
     def layers(self, bm_suite_args: List[str]) -> List[Layer]:
-        if self.benchmarkName() == "micronaut-pegasus":
+        layered_benchmarks = ["micronaut-pegasus", "micronaut-shopcart"]
+        if self.benchmarkName() in layered_benchmarks:
             return [Layer(0, True), Layer(1, False)]
-        # Currently, "micronaut-pegasus" is the only benchmark that supports running with layers
         # Support for other benchmarks, or even suites? (GR-64772)
         mx.abort(f"The '{self.benchmarkName()}' benchmark does not support layered native images!")