[GR-27525] Allow running some benchmarks against Jython

PullRequest: graalpython/1398

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "24ab0c3d875432abb2e9f7da123ae440d0bea32f" }
+{ "overlay": "481a7d5f2aa66914f27e9d8b1be83d26b1c92b33" }

graalpython/com.oracle.graal.python.benchmarks/python/harness.py

@@ -47,7 +47,13 @@
 import sys
 import types
 
-GRAALPYTHON = sys.implementation.name == "graalpython"
+try:
+    import statistics
+except ImportError:
+    statistics = None
+
+# for compatibility with Jython 2.7
+GRAALPYTHON = getattr(getattr(sys, "implementation", None), "name", None) == "graalpython"
 
 # Try to use the timer with best accuracy. Unfortunately, 'monotonic_ns' is not available everywhere.
 if GRAALPYTHON:
@@ -57,7 +63,7 @@
 else:
     monotonic_best_accuracy = time
     UNITS_PER_SECOND = 1.0
-    
+
 _HRULE = '-'.join(['' for i in range(80)])
 
 #: this function is used to pre-process the arguments as expected by the __benchmark__ and __setup__ entry points
@@ -329,8 +335,7 @@ def run(self):
                 # a bit of fuzzy logic to avoid timing out on configurations
                 # that are slow, without having to rework our logic for getting
                 # default iterations
-                if os.environ.get("CI") and iteration >= 4 and duration > 20:
-                    import statistics
+                if statistics and os.environ.get("CI") and iteration >= 4 and duration > 20:
                     v = durations[-4:]
                     if statistics.stdev(v) / min(v) < 0.03:
                         # with less than 3 percent variance across ~20s

mx.graalpython/mx_graalpython_benchmark.py

@@ -48,6 +48,7 @@
 #
 # ----------------------------------------------------------------------------------------------------------------------
 ENV_PYPY_HOME = "PYPY_HOME"
+ENV_JYTHON_JAR = "JYTHON_JAR"
 VM_NAME_GRAALPYTHON = "graalpython"
 VM_NAME_CPYTHON = "cpython"
 VM_NAME_PYPY = "pypy"
@@ -248,22 +249,55 @@ def name(self):
         return VM_NAME_PYPY
 
 
-class JythonVm(AbstractPythonIterationsControlVm):
+class JythonVm(AbstractPythonIterationsControlVm, GuestVm):
     JYTHON_INTERPRETER = "jython"
 
-    def __init__(self, config_name, options=None, env=None, iterations=None):
-        super(JythonVm, self).__init__(config_name, options=options, env=env, iterations=iterations)
+    def __init__(self, config_name, options=None, env=None, iterations=None, host_vm=None):
+        AbstractPythonIterationsControlVm.__init__(self, config_name, options=options, env=env, iterations=iterations)
+        GuestVm.__init__(self, host_vm=host_vm)
 
     def override_iterations(self, requested_iterations):
-        return 2
+        return 3
+
+    def hosting_registry(self):
+        return java_vm_registry
 
     @property
     def interpreter(self):
         try:
             return subprocess.check_output("which %s" % JythonVm.JYTHON_INTERPRETER, shell=True).decode().strip()
-        except OSError as e:
+        except Exception as e:
             mx.log_error(e)
-            mx.abort("Error when executing `which jython`!\n")
+            mx.abort("`jython` is neither on the path, nor is {} set!\n".format(ENV_JYTHON_JAR))
+
+    def run(self, cwd, args):
+        jar = mx.get_env(ENV_JYTHON_JAR)
+        if jar:
+            _check_vm_args(self.name(), args)
+            host_vm = self.host_vm()
+
+            vm_args = mx.get_runtime_jvm_args([])
+            vm_args += ["-jar", jar]
+            for a in args[:]:
+                if a.startswith("-D") or a.startswith("-XX"):
+                    vm_args.insert(0, a)
+                    args.remove(a)
+            args = self._override_iterations_args(args)
+            cmd = vm_args + args
+
+            if not self._env:
+                self._env = dict()
+            with environ(self._env):
+                return host_vm.run(cwd, cmd)
+        else:
+            return AbstractPythonIterationsControlVm.run(self, cwd, args)
+
+    def config_name(self):
+        return self._config_name
+
+    def with_host_vm(self, host_vm):
+        return self.__class__(config_name=self._config_name, options=self._options, env=self._env,
+                              iterations=self._iterations, host_vm=host_vm)
 
     def name(self):
         return VM_NAME_JYTHON
@@ -657,4 +691,3 @@ def rules(self, output, benchmarks, bm_suite_args):
                 }
             ),
         ]
-