make it easy to run meso benchmarks on jython

Author: timfel

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

@@ -40,6 +40,7 @@
 import _io
 import os
 import sys
+import types
 from time import time
 
 
@@ -229,7 +230,7 @@ def get_bench_module(bench_file):
             return bench_module
 
         else:
-            bench_module = type(sys)(name, bench_file)
+            bench_module = types.ModuleType(name, bench_file)
             with _io.FileIO(bench_file, "r") as f:
                 bench_module.__file__ = bench_file
                 bench_module.ccompile = ccompile
@@ -256,7 +257,10 @@ def run(self):
         args = self._call_attr(ATTR_PROCESS_ARGS, *self.bench_args)
         if args is None:
             # default args processor considers all args as ints
-            args = list(map(int, self.bench_args))
+            if sys.version_info.major < 3:
+                args = list(map(lambda x: int(x.replace("_", "")), self.bench_args))
+            else:
+                args = list(map(int, self.bench_args))
 
         print("### args = ", args)
         print(_HRULE)

graalpython/com.oracle.graal.python.benchmarks/python/meso/meteor3.py

@@ -41,6 +41,7 @@
 #
 # contributed by Daniel Nanz, 2008-08-21
 # 2to3
+from __future__ import print_function
 from bisect import bisect
 import time
 
@@ -181,7 +182,7 @@ def main(n):
 
 def measure(num):
     main(num)
-    
+
 
 def __benchmark__(num=2098):
     measure(num)

graalpython/com.oracle.graal.python.benchmarks/python/meso/richards3.py

@@ -45,6 +45,8 @@
 #  Translation from C++, Mario Wolczko
 #  Outer loop added by Alex Jacoby
 
+from __future__ import print_function
+
 # Task IDs
 I_IDLE = 1
 I_WORK = 2

mx.graalpython/mx_graalpython.py

@@ -52,7 +52,7 @@
 import mx_urlrewrites
 from mx_gate import Task
 from mx_graalpython_bench_param import PATH_MESO, BENCHMARKS, JBENCHMARKS
-from mx_graalpython_benchmark import PythonBenchmarkSuite, python_vm_registry, CPythonVm, PyPyVm, GraalPythonVm, \
+from mx_graalpython_benchmark import PythonBenchmarkSuite, python_vm_registry, CPythonVm, PyPyVm, JythonVm, GraalPythonVm, \
     CONFIGURATION_DEFAULT, CONFIGURATION_SANDBOXED, CONFIGURATION_NATIVE, \
     CONFIGURATION_DEFAULT_MULTI, CONFIGURATION_SANDBOXED_MULTI, CONFIGURATION_NATIVE_MULTI, \
     PythonInteropBenchmarkSuite
@@ -1286,6 +1286,9 @@ def _register_vms(namespace):
     # pypy
     python_vm_registry.add_vm(PyPyVm(config_name=CONFIGURATION_DEFAULT), SUITE)
 
+    # jython
+    python_vm_registry.add_vm(JythonVm(config_name=CONFIGURATION_DEFAULT), SUITE)
+
     # graalpython
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_DEFAULT), SUITE, 10)
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_DEFAULT_MULTI, extra_polyglot_args=[

mx.graalpython/mx_graalpython_benchmark.py

@@ -51,6 +51,7 @@
 VM_NAME_GRAALPYTHON = "graalpython"
 VM_NAME_CPYTHON = "cpython"
 VM_NAME_PYPY = "pypy"
+VM_NAME_JYTHON = "jython"
 VM_NAME_GRAALPYTHON_SVM = "graalpython-svm"
 GROUP_GRAAL = "Graal"
 SUBGROUP_GRAAL_PYTHON = "graalpython"
@@ -245,6 +246,27 @@ def name(self):
         return VM_NAME_PYPY
 
 
+class JythonVm(AbstractPythonIterationsControlVm):
+    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 override_iterations(self, requested_iterations):
+        return 2
+
+    @property
+    def interpreter(self):
+        try:
+            return subprocess.check_output("which %s" % JythonVm.JYTHON_INTERPRETER, shell=True).decode().strip()
+        except OSError:
+            mx.abort("{} is not set!".format(ENV_JYTHON_HOME))
+        return join(home, 'bin', JythonVm.JYTHON_INTERPRETER)
+
+    def name(self):
+        return VM_NAME_JYTHON
+
+
 class GraalPythonVm(GuestVm):
     def __init__(self, config_name=CONFIGURATION_DEFAULT, distributions=None, cp_suffix=None, cp_prefix=None,
                  host_vm=None, extra_vm_args=None, extra_polyglot_args=None, env=None):