add tools options to our benchmark runner

Author: timfel

mx.graalpython/mx_graalpython.py

@@ -43,7 +43,7 @@
 from mx_gate import Task
 from mx_graalpython_bench_param import PATH_MESO, BENCHMARKS
 from mx_graalpython_benchmark import PythonBenchmarkSuite, python_vm_registry, CPythonVm, PyPyVm, GraalPythonVm, \
-    CONFIGURATION_DEFAULT, CONFIG_EXPERIMENTAL_SPLITTING, CONFIGURATION_SANDBOXED, CONFIGURATION_NATIVE, CONFIGURATION_DUMP
+    CONFIGURATION_DEFAULT, CONFIG_EXPERIMENTAL_SPLITTING, CONFIGURATION_SANDBOXED, CONFIGURATION_NATIVE
 
 SUITE = mx.suite('graalpython')
 SUITE_COMPILER = mx.suite("compiler", fatalIfMissing=False)
@@ -1003,9 +1003,6 @@ def _register_vms(namespace):
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE, extra_polyglot_args=[
         "--llvm.managed=false"
     ]), SUITE, 10)
-    python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_DUMP, extra_polyglot_args=[
-        "--experimental-options", "-dump"
-    ]), SUITE, 10)
 
 
 def _register_bench_suites(namespace):

mx.graalpython/mx_graalpython_benchmark.py

@@ -58,7 +58,6 @@
 CONFIGURATION_NATIVE = "native"
 CONFIG_EXPERIMENTAL_SPLITTING = "experimental_splitting"
 CONFIGURATION_SANDBOXED = "sandboxed"
-CONFIGURATION_DUMP = "dump"
 
 DEFAULT_ITERATIONS = 10
 
@@ -336,15 +335,27 @@ def run(self, benchmarks, bm_suite_args):
     def postprocess_run_args(self, run_args):
         parser = argparse.ArgumentParser(add_help=False)
         parser.add_argument("-i", default=None)
+        parser.add_argument("--cpusampler", action="store_true")
+        parser.add_argument("--memtracer", action="store_true")
+        parser.add_argument("-dump", action="store_true")
         args, remaining = parser.parse_known_args(run_args)
+
+        vm_options = []
+        if args.cpusampler:
+            vm_options.append("--cpusampler")
+        if args.memtracer:
+            vm_options.append("--memtracer")
+        if args.dump:
+            vm_options.append("-dump")
+
         if args.i:
             if args.i.isdigit():
-                return ["-i", args.i] + remaining
+                return vm_options, (["-i", args.i] + remaining)
             if args.i == "-1":
-                return remaining
+                return vm_options, remaining
         else:
             iterations = DEFAULT_ITERATIONS + self.getExtraIterationCount(DEFAULT_ITERATIONS)
-            return ["-i", str(iterations)] + remaining
+            return vm_options, (["-i", str(iterations)] + remaining)
 
     def createVmCommandLineArgs(self, benchmarks, run_args):
         if not benchmarks or len(benchmarks) != 1:
@@ -371,9 +382,9 @@ def createVmCommandLineArgs(self, benchmarks, run_args):
 
         if len(run_args) == 0:
             run_args = self._benchmarks[benchmark]
-        run_args = self.postprocess_run_args(run_args)
+        vm_options, run_args = self.postprocess_run_args(run_args)
         cmd_args.extend(run_args)
-        return cmd_args
+        return vm_options + cmd_args
 
     def benchmarkList(self, bm_suite_args):
         return self._benchmarks.keys()