[GR-65944] Support barista that use 1.1.384 micronaut-pegasus

PullRequest: graal/21109

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.4.2",
+    local barista_version = "v0.4.4",
     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.5"}
+      "BARISTA_BENCHMARKS": { "name": "barista", "version": "0.4.4"}
     },
     packages+: {
       maven: "==3.8.6",

sdk/mx.sdk/mx_sdk_benchmark.py

@@ -2883,6 +2883,9 @@ def baristaDirectoryPath(self):
                      "Barista benchmark suite directory.")
         return barista_home
 
+    def baristaApplicationDirectoryPath(self, benchmark: str) -> Path:
+        return Path(self.baristaDirectoryPath()) / "benchmarks" / benchmark
+
     def baristaFilePath(self, file_name):
         barista_home = self.baristaDirectoryPath()
         file_path = os.path.abspath(os.path.join(barista_home, file_name))

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -329,8 +329,14 @@ def get_bundle_path_for_benchmark_standalone(self, benchmark) -> str:
         return self._application_nibs[benchmark]
 
     def get_bundle_path_for_benchmark_layer(self, benchmark, layer_info) -> str:
-        standalone_nib = Path(self.get_bundle_path_for_benchmark_standalone(benchmark))
-        return (standalone_nib.parent / f"layer{layer_info.index}-{standalone_nib.name}").absolute()
+        app_dir = self.baristaApplicationDirectoryPath(benchmark)
+        nib_candidates = list(app_dir.glob(f"**/layer{layer_info.index}-*.nib"))
+        if len(nib_candidates) == 0:
+            mx.abort(f"Expected to find exactly one 'layer{layer_info.index}-*.nib' file somewhere in the '{app_dir}' directory subtree, instead found none!")
+        if len(nib_candidates) > 1:
+            mx.abort(f"Expected to find exactly one 'layer{layer_info.index}-*.nib' file somewhere in the '{app_dir}' directory subtree, instead found "
+                     + "multiple: [" + ", ".join(str(path) for path in nib_candidates) + "]")
+        return str(nib_candidates[0])
 
     def get_latest_layer(self) -> Optional[Layer]:
         latest_image_stage = self.execution_context.virtual_machine.stages_info.get_latest_image_stage()
@@ -369,6 +375,12 @@ def extra_run_arg(self, benchmark, args, image_run_args):
         # Added by BaristaNativeImageCommand
         return []
 
+    def build_assertions(self, benchmark: str, is_gate: bool) -> List[str]:
+        # We cannot enable assertions along with emitting a build report for layered images, due to GR-65751
+        if self.stages_info.current_stage.is_layered:
+            return []
+        return super().build_assertions(benchmark, is_gate)
+
     def run(self, benchmarks, bmSuiteArgs) -> mx_benchmark.DataPoints:
         return self.intercept_run(super(), benchmarks, bmSuiteArgs)