Update graalos bench suite to be graalhost compatible: mount extra dirs, don't fail when run from graalos suites, wait for profile files.

Author: Andrija Kolic

substratevm/mx.substratevm/mx_substratevm_benchmark.py

@@ -31,6 +31,7 @@
 import re
 import json
 import datetime
+import time
 from glob import glob
 from pathlib import Path
 from typing import List, Optional
@@ -42,7 +43,7 @@
 from mx_benchmark import BenchmarkSuite, DataPoints, Rule, Vm, SingleBenchmarkExecutionContext
 from mx._impl.mx_codeowners import _load_toml_from_fd
 from mx_sdk_benchmark import SUCCESSFUL_STAGE_PATTERNS, parse_prefixed_args
-from mx_util import StageName, Layer
+from mx_util import Stage, StageName, Layer
 
 _suite = mx.suite("substratevm")
 
@@ -661,7 +662,13 @@ def _gos_scenarios_dir(self) -> Path:
 
     def _vm_benchmarks_graalos_dir(self) -> Path:
         """Returns the path to the directory containing the applications that comprise the scenarios."""
-        return Path(mx.primary_suite().vc_dir) / "vm-benchmarks" / "graalos"
+        vm_enterprise_suite = next(filter(lambda suite: suite.name == "vm-enterprise", mx.suites()), None)
+        if vm_enterprise_suite is None:
+            raise ValueError(f"Failed to find the vm-enterprise suite on which {self.__class__.__name__} relies on for locating the graal-enterpise repository!")
+        vm_benchmarks_graalos_dir = Path(vm_enterprise_suite.vc_dir) / "vm-benchmarks" / "graalos"
+        if not vm_benchmarks_graalos_dir.is_dir():
+            raise ValueError(f"Failed to locate the benchmarks directory! No directory exists with path '{vm_benchmarks_graalos_dir}'!")
+        return vm_benchmarks_graalos_dir
 
     def _app_source_dir(self, app: str) -> Path:
         """Returns the path to the source code directory of the application."""
@@ -891,6 +898,17 @@ def runAndReturnStdOut(self, benchmarks, bmSuiteArgs):
             self._ensure_dataplane_scenario_can_run()
         return retcode, out, dims
 
+    def run_stage(self, vm, stage: Stage, command, out, err, cwd, nonZeroIsFatal):
+        retcode = super().run_stage(vm, stage, command, out, err, cwd, nonZeroIsFatal)
+        if stage.stage_name == StageName.INSTRUMENT_RUN:
+            # GraalOS Load Tester can exit before the app images have shutdown and generated the profile
+            wait_for = 10
+            sleep_duration = 0.5
+            while wait_for >= 0 and not vm.config.profile_path.is_file():
+                time.sleep(sleep_duration)
+                wait_for -= sleep_duration
+        return retcode
+
     def _check_if_dataplane_scenario(self) -> bool:
         """Returns whether the scenario uses 'dataplane' deployment."""
         return self._get_scenario_deployment() == "dataplane"
@@ -993,9 +1011,12 @@ def produceHarnessCommand(self, cmd: List[str], suite: BenchmarkSuite) -> List[s
                 app_cmd += parse_prefixed_args("-Dnative-image.benchmark.extra-run-arg=", bmSuiteArgs)
 
             gos_cmd = [suite._gos_scenario_command(), f"{scenario}", "--local-load-testers", "--skip-upload"]
+            output_dir = suite.execution_context.virtual_machine.config.output_dir
+            gos_cmd += ["-p", f"extra_graalhost_dir_mounts='{output_dir}'"]
             timestamp = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S")
             gos_log_file_name = f"{timestamp}-gos-out.log"
-            gos_cmd += ["--log-to", f"stdout,file:{gos_log_file_name}"]
+            gos_log_file_path = output_dir / gos_log_file_name
+            gos_cmd += ["--log-to", f"stdout,file:{gos_log_file_path}"]
             if suite.execution_context.virtual_machine.graalhost_graalos:
                 gos_cmd += ["-p", f"deployment='nginx-tinyinit-graalhost'"]
             app_cmd_str = " ".join(app_cmd)