[GR-15253] run micro-native benchmarks with cPython as well

PullRequest: graalpython/491

Author: cosminbasca

ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  overlay: "627f30447cbecc2e4f5d16553cbfc6b669396c5d",
+  overlay: "bf72da98b99c9f367e7d749e12d189e3405c6853",
 
   // ======================================================================================================
   //

mx.graalpython/mx_graalpython.py

@@ -42,7 +42,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_DEFAULT, CONFIG_EXPERIMENTAL_SPLITTING, CONFIGURATION_SANDBOXED, CONFIGURATION_NATIVE
 
 SUITE = mx.suite('graalpython')
 SUITE_COMPILER = mx.suite("compiler", fatalIfMissing=False)
@@ -903,10 +903,14 @@ def import_python_sources(args):
 # post init
 #
 # ----------------------------------------------------------------------------------------------------------------------
-
 def _register_vms(namespace):
-    python_vm_registry.add_vm(CPythonVm(CONFIGURATION_DEFAULT), SUITE)
-    python_vm_registry.add_vm(PyPyVm(CONFIGURATION_DEFAULT), SUITE)
+    # cpython
+    python_vm_registry.add_vm(CPythonVm(config_name=CONFIGURATION_DEFAULT), SUITE)
+
+    # pypy
+    python_vm_registry.add_vm(PyPyVm(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=CONFIG_EXPERIMENTAL_SPLITTING, extra_vm_args=[
         '-Dgraal.TruffleExperimentalSplitting=true',
@@ -915,6 +919,9 @@ def _register_vms(namespace):
     python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_SANDBOXED, extra_polyglot_args=[
         '--llvm.sandboxed',
     ]), SUITE, 10)
+    python_vm_registry.add_vm(GraalPythonVm(config_name=CONFIGURATION_NATIVE, extra_polyglot_args=[
+        "--llvm.sandboxed=false"
+    ]), SUITE, 10)
 
 
 def _register_bench_suites(namespace):
@@ -934,7 +941,6 @@ def python_coverage(args):
     mx.command_function("jacocoreport")(["--omit-excluded", "--format=html"])
 
 
-
 # ----------------------------------------------------------------------------------------------------------------------
 #
 # register the suite commands (if any)

mx.graalpython/mx_graalpython_benchmark.py

@@ -50,10 +50,12 @@
 VM_NAME_GRAALPYTHON = "graalpython"
 VM_NAME_CPYTHON = "cpython"
 VM_NAME_PYPY = "pypy"
+VM_NAME_GRAALPYTHON_SVM = "graalpython-svm"
 GROUP_GRAAL = "Graal"
 SUBGROUP_GRAAL_PYTHON = "graalpython"
 PYTHON_VM_REGISTRY_NAME = "Python"
 CONFIGURATION_DEFAULT = "default"
+CONFIGURATION_NATIVE = "native"
 CONFIG_EXPERIMENTAL_SPLITTING = "experimental_splitting"
 CONFIGURATION_SANDBOXED = "sandboxed"
 
@@ -223,7 +225,6 @@ def run(self, cwd, args):
             else:
                 extra_polyglot_args += ["--experimental-options"]
 
-
         vm_args = mx.get_runtime_jvm_args(dists, cp_suffix=self._cp_suffix, cp_prefix=self._cp_prefix)
         if isinstance(self._extra_vm_args, list):
             vm_args += self._extra_vm_args
@@ -232,7 +233,12 @@ def run(self, cwd, args):
             "com.oracle.graal.python.shell.GraalPythonMain"
         ]
         cmd = truffle_options + vm_args + extra_polyglot_args + args
-        return self.host_vm().run(cwd, cmd)
+
+        host_vm = self.host_vm()
+        if hasattr(host_vm, 'run_lang'):
+            return host_vm.run_lang('graalpython', extra_polyglot_args + args, cwd)
+        else:
+            return host_vm.run(cwd, cmd)
 
     def name(self):
         return VM_NAME_GRAALPYTHON