[GR-64914] Fix passing of vm_dims out of python benchmark suites

Author: timfel

mx.graalpython/mx_graalpython_benchmark.py

@@ -402,7 +402,7 @@ def get_extra_polyglot_args(self):
 
 class PythonBaseBenchmarkSuite(VmBenchmarkSuite, AveragingBenchmarkMixin):
     def __init__(self, name, benchmarks):
-        super(PythonBaseBenchmarkSuite, self).__init__()
+        super().__init__()
         self._checkup = 'GRAALPYTHON_BENCHMARKS_CHECKUP' in os.environ
         self._name = name
         self._benchmarks = benchmarks
@@ -599,14 +599,7 @@ def rules(self, output, benchmarks, bm_suite_args):
         ]
 
     def runAndReturnStdOut(self, benchmarks, bmSuiteArgs):
-        ret_code, out, dims = super(PythonBaseBenchmarkSuite, self).runAndReturnStdOut(benchmarks, bmSuiteArgs)
-
-        # host-vm rewrite rules
-        if dims['host-vm'] not in ('graalvm-ce', 'graalvm-ee'):
-            if mx.suite('graal-enterprise', fatalIfMissing=False):
-                dims['host-vm'] = 'graalvm-ee'
-            else:
-                dims['host-vm'] = 'graalvm-ce'
+        ret_code, out, dims = super().runAndReturnStdOut(benchmarks, bmSuiteArgs)
 
         self.post_run_graph(benchmarks[0], dims['host-vm-config'], dims['guest-vm-config'])
 
@@ -619,7 +612,7 @@ def run(self, benchmarks, bm_suite_args):
         if '--checkup' in bm_suite_args:
             self._checkup = True
             bm_suite_args.remove('--checkup')
-        results = super(PythonBaseBenchmarkSuite, self).run(benchmarks, bm_suite_args)
+        results = super().run(benchmarks, bm_suite_args)
         self.addAverageAcrossLatestResults(results)
         return results
 
@@ -731,7 +724,7 @@ def checkup(self, out):
 
 class PythonBenchmarkSuite(PythonBaseBenchmarkSuite):
     def __init__(self, name, bench_path, benchmarks, python_path=None):
-        super(PythonBenchmarkSuite, self).__init__(name, benchmarks)
+        super().__init__(name, benchmarks)
         self._python_path = python_path
         self._harness_path = HARNESS_PATH
         self._harness_path = join(SUITE.dir, self._harness_path)
@@ -799,7 +792,7 @@ def get_benchmark_suites(cls, benchmarks):
 
 class PythonJavaEmbeddingBenchmarkSuite(PythonBaseBenchmarkSuite):
     def __init__(self, name, bench_path, benchmarks):
-        super(PythonJavaEmbeddingBenchmarkSuite, self).__init__(name, benchmarks)
+        super().__init__(name, benchmarks)
         self._bench_path = bench_path
 
     def get_vm_registry(self):

mx.graalpython/mx_graalpython_python_benchmarks.py

@@ -394,19 +394,7 @@ def __iter__(self):
 
 
 class PySuite(mx_benchmark.TemporaryWorkdirMixin, mx_benchmark.VmBenchmarkSuite):
-    def runAndReturnStdOut(self, benchmarks, bmSuiteArgs):
-        ret_code, out, dims = super().runAndReturnStdOut(benchmarks, bmSuiteArgs)
-
-        def _replace_host_vm(old, new):
-            host_vm = dims.get("host-vm")
-            if host_vm and old in host_vm:
-                dims['host-vm'] = host_vm.replace(old, new)
-                mx.logv(f"[DEBUG] replace 'host-vm': '{host_vm}' -> '{dims['host-vm']}'")
-
-        _replace_host_vm('graalvm-ce-python', 'graalvm-ce')
-        _replace_host_vm('graalvm-ee-python', 'graalvm-ee')
-
-        return ret_code, out, dims
+    pass
 
 
 class PyPerformanceSuite(PySuite):
@@ -436,6 +424,7 @@ def get_vm_registry(self):
     def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         workdir = abspath(workdir)
         vm_venv = f"{self.name()}-{vm.name()}-{vm.config_name()}"
+        _, _, vm_dims = vm.run(workdir, ["--version"])
 
         if not hasattr(self, "prepared"):
             self.prepared = True
@@ -488,7 +477,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         mx.log(f"Return code of benchmark harness: {retcode}")
         shutil.copy(join(workdir, json_file), join(SUITE.dir, "raw_results.json"))
         shutil.copy(join(workdir, json_file_memory), join(SUITE.dir, "raw_results_memory.json"))
-        return retcode, ",".join([join(workdir, json_file), join(workdir, json_file_memory)])
+        return retcode, ",".join([join(workdir, json_file), join(workdir, json_file_memory)]), vm_dims
 
 
 class PyPySuite(PySuite):
@@ -518,6 +507,7 @@ def get_vm_registry(self):
     def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         workdir = abspath(workdir)
         vm_venv = f"{self.name()}-{vm.name()}-{vm.config_name()}"
+        _, _, vm_dims = vm.run(workdir, ["--version"])
 
         if not hasattr(self, "prepared"):
             self.prepared = True
@@ -569,7 +559,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         )
         shutil.copy(join(workdir, json_file), join(SUITE.dir, "raw_results.json"))
         mx.log(f"Return code of benchmark harness: {retcode}")
-        return retcode, join(workdir, json_file)
+        return retcode, join(workdir, json_file), vm_dims
 
 
 class NumPySuite(PySuite):
@@ -611,6 +601,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         workdir = abspath(workdir)
         benchdir = join(workdir, "numpy", "benchmarks")
         vm_venv = f"{self.name()}-{vm.name()}-{vm.config_name()}"
+        _, _, vm_dims = vm.run(workdir, ["--version"])
 
         if not hasattr(self, "prepared"):
             self.prepared = True
@@ -671,9 +662,9 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         if json_file:
             json_file = json_file[0]
             shutil.copy(json_file, join(SUITE.dir, "raw_results.json"))
-            return retcode, json_file
+            return retcode, json_file, vm_dims
         else:
-            return -1, ""
+            return -1, "", vm_dims
 
 
 class PandasSuite(PySuite):
@@ -720,6 +711,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         workdir = abspath(workdir)
         benchdir = join(workdir, "pandas", "asv_bench")
         vm_venv = f"{self.name()}-{vm.name()}-{vm.config_name()}"
+        _, _, vm_dims = vm.run(workdir, ["--version"])
 
         if not hasattr(self, "prepared"):
             self.prepared = True
@@ -798,9 +790,9 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
         if json_file:
             json_file = json_file[0]
             shutil.copy(json_file, join(SUITE.dir, "raw_results.json"))
-            return retcode, json_file
+            return retcode, json_file, vm_dims
         else:
-            return -1, ""
+            return -1, "", vm_dims
 
 
 def register_python_benchmarks():