[GR-59047] Add 'micronaut-pegasus' to the 'barista-native-image' suite

PullRequest: graal/19256

Author: Andrija Kolic

sdk/mx.sdk/mx_sdk_benchmark.py

@@ -1189,6 +1189,7 @@ def rules(self, out, benchmarks, bmSuiteArgs):
         "micronaut-hello-world": {},
         "micronaut-shopcart": {},
         "micronaut-similarity": {},
+        "micronaut-pegasus": {},
         "quarkus-hello-world": {},
         "quarkus-tika-odt": {
             "barista-bench-name": "quarkus-tika",
@@ -1260,7 +1261,10 @@ def subgroup(self):
         return "graal-compiler"
 
     def benchmarkList(self, bmSuiteArgs):
-        return self.completeBenchmarkList(bmSuiteArgs)
+        exclude = []
+        # Barista currently does not support running 'micronaut-pegasus' on the JVM - running it results in a crash
+        exclude.append("micronaut-pegasus")
+        return [b for b in self.completeBenchmarkList(bmSuiteArgs) if not b in exclude]
 
     def completeBenchmarkList(self, bmSuiteArgs):
         return _baristaConfig["benchmarks"].keys()

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -286,6 +286,15 @@ def benchSuiteName(self, bmSuiteArgs=None):
     def benchmarkName(self):
         return self.context.benchmark
 
+    def benchmarkList(self, bmSuiteArgs):
+        return self.completeBenchmarkList(bmSuiteArgs)
+
+    def default_stages(self):
+        if self.context.benchmark == "micronaut-pegasus":
+            # The 'agent' stage is not supported, as currently we cannot run micronaut-pegasus on the JVM
+            return ['instrument-image', 'instrument-run', 'image', 'run']
+        return super().default_stages()
+
     def application_nib(self):
         if self.benchmarkName() not in self._application_nibs:
             # Run subprocess retrieving the application nib from the Barista 'build' script
@@ -337,6 +346,7 @@ def extra_run_arg(self, benchmark, args, image_run_args):
         return []
 
     def run(self, benchmarks, bmSuiteArgs) -> mx_benchmark.DataPoints:
+        self.context = mx_sdk_benchmark.BaristaBenchmarkSuite.RuntimeContext(self, None, benchmarks[0], bmSuiteArgs)
         return self.intercept_run(super(), benchmarks, bmSuiteArgs)
 
     def ensure_image_is_at_desired_location(self, bmSuiteArgs):