From f6d233b3b542c9656713a8897681d5a4a76afb07 Mon Sep 17 00:00:00 2001 From: Andrija Kolic Date: Tue, 21 Oct 2025 19:37:09 +0200 Subject: [PATCH] Support Layered configuration of Barista: Micronaut Shopcart. --- compiler/ci/OWNERS.toml | 6 ++++++ compiler/ci/ci_common/benchmark-suites.libsonnet | 4 ++-- substratevm/mx.substratevm/mx_substratevm_benchmark.py | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 compiler/ci/OWNERS.toml diff --git a/compiler/ci/OWNERS.toml b/compiler/ci/OWNERS.toml new file mode 100644 index 000000000000..caf3fe7d4e94 --- /dev/null +++ b/compiler/ci/OWNERS.toml @@ -0,0 +1,6 @@ +[[rule]] +files = "benchmark-*.libsonnet benchmark-*.jsonnet" +any = [ + "francois.farquet@oracle.com", + "andrija.kolic@oracle.com", +] diff --git a/compiler/ci/ci_common/benchmark-suites.libsonnet b/compiler/ci/ci_common/benchmark-suites.libsonnet index cb34ecac2a7d..14da8e6fb614 100644 --- a/compiler/ci/ci_common/benchmark-suites.libsonnet +++ b/compiler/ci/ci_common/benchmark-suites.libsonnet @@ -91,7 +91,7 @@ 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, @@ -99,7 +99,7 @@ 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", diff --git a/substratevm/mx.substratevm/mx_substratevm_benchmark.py b/substratevm/mx.substratevm/mx_substratevm_benchmark.py index 2cb4d56b4700..f914b92d1a46 100644 --- a/substratevm/mx.substratevm/mx_substratevm_benchmark.py +++ b/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!")