[GR-12096] reusable graalpython benchmarking constructs

PullRequest: graalpython/233

Author: cosminbasca

graalpython/benchmarks/src/harness.py

@@ -46,6 +46,7 @@
 _HRULE = '-'.join(['' for i in range(80)])
 ATTR_BENCHMARK = '__benchmark__'
 ATTR_PROCESS_ARGS = '__process_args__'
+ATTR_TEARDOWN = '__teardown__'
 
 
 def ccompile(name, code):
@@ -162,6 +163,10 @@ def run(self):
                 else:
                     print("### iteration=%s, name=%s, duration=%s" % (iteration, self.bench_module.__name__, duration))
 
+        print("teardown ... ")
+        self._call_attr(ATTR_TEARDOWN)
+        print("benchmark complete")
+
 
 def run_benchmark(prog, args):
     warmup = 0

graalpython/benchmarks/src/micro/arith-binop.py

@@ -43,3 +43,8 @@ def measure(num):
 
 def __benchmark__(num=5):
     measure(num)
+
+
+def __teardown__():
+    # teardown example
+    print("arith-binop teardown")

mx.graalpython/mx_graalpython.py

@@ -36,7 +36,7 @@
 import mx_subst
 import mx_urlrewrites
 from mx_gate import Task
-from mx_graalpython_bench_param import PATH_MESO
+from mx_graalpython_bench_param import PATH_MESO, BENCHMARKS
 from mx_graalpython_benchmark import PythonBenchmarkSuite
 from mx_unittest import unittest
 
@@ -424,7 +424,7 @@ def graalpython_gate_runner(args, tasks):
             apprepo = os.environ["GRAALPYTHON_APPTESTS_REPO_URL"]
             _apptest_suite = _suite.import_suite(
                 "graalpython-apptests",
-                version="006db2cfd79a51ba49e23a42629da13a54b87451",
+                version="fe1458e3af707f5996f192aedc7b76585501e8ba",
                 urlinfos=[mx.SuiteImportURLInfo(mx_urlrewrites.rewriteurl(apprepo), "git", mx.vc_system("git"))]
             )
             mx.run_mx(["-p", _apptest_suite.dir, "graalpython-apptests"])
@@ -868,7 +868,7 @@ def import_python_sources(args):
 # add the defined python benchmark suites
 #
 # ----------------------------------------------------------------------------------------------------------------------
-for py_bench_suite in PythonBenchmarkSuite.get_benchmark_suites():
+for py_bench_suite in PythonBenchmarkSuite.get_benchmark_suites(BENCHMARKS):
     mx_benchmark.add_bm_suite(py_bench_suite)
 
 

mx.graalpython/mx_graalpython_bench_param.py

@@ -28,7 +28,7 @@
 _graalpython_suite = mx.suite('graalpython')
 
 py = ".py"
-_BASE_PATH = os.path.join('graalpython', 'benchmarks', 'src')
+_BASE_PATH = os.path.join(_graalpython_suite.dir, 'graalpython', 'benchmarks', 'src')
 HARNESS_PATH = os.path.join(_BASE_PATH, 'harness.py')
 
 PATH_BENCH = os.path.join(_BASE_PATH, 'benchmarks')

mx.graalpython/mx_graalpython_benchmark.py

@@ -183,14 +183,14 @@ def config_name(self):
 #
 # ----------------------------------------------------------------------------------------------------------------------
 class PythonBenchmarkSuite(VmBenchmarkSuite, AveragingBenchmarkMixin):
-    def __init__(self, name, harness_path):
+    def __init__(self, name, bench_path, benchmarks):
         self._name = name
-        self._harness_path = harness_path
+        self._harness_path = HARNESS_PATH
         self._harness_path = join(_graalpython_suite.dir, self._harness_path)
         if not self._harness_path:
             mx.abort("python harness path not specified!")
 
-        self._bench_path, self._benchmarks = BENCHMARKS[self._name]
+        self._bench_path, self._benchmarks = bench_path, benchmarks
         self._bench_path = join(_graalpython_suite.dir, self._bench_path)
 
     def rules(self, output, benchmarks, bm_suite_args):
@@ -292,8 +292,10 @@ def get_vm_registry(self):
         return python_vm_registry
 
     @classmethod
-    def get_benchmark_suites(cls):
-        return [cls(suite_name, HARNESS_PATH) for suite_name in BENCHMARKS]
+    def get_benchmark_suites(cls, benchmarks):
+        assert isinstance(benchmarks, dict), "benchmarks must be a dict: {suite: [path, benchmarks], ...}"
+        return [cls(suite_name, suite_info[0], suite_info[1])
+                for suite_name, suite_info in benchmarks.items()]
 
 
 # ----------------------------------------------------------------------------------------------------------------------