Get rid of benchmarks running from an old-style graalvm

Author: timfel

mx.graalpython/mx_graalpython_benchmark.py

@@ -345,9 +345,6 @@ def hosting_registry(self):
     def launcher_class(self):
         raise NotImplementedError()
 
-    def run_in_graalvm(self, cwd, args, extra_polyglot_args, host_vm):
-        raise NotImplementedError()
-
     def get_extra_polyglot_args(self):
         raise NotImplementedError()
 
@@ -374,8 +371,6 @@ def run(self, cwd, args):
         extra_polyglot_args = self.get_extra_polyglot_args()
 
         host_vm = self.host_vm()
-        if hasattr(host_vm, 'run_lang'): # this is a full GraalVM build
-            return self.run_in_graalvm(cwd, args, extra_polyglot_args, host_vm)
 
         # Otherwise, we're running from the source tree
         args = self._remove_vm_prefix_for_all(args)
@@ -457,14 +452,6 @@ def run(self, cwd, args):
             sys.exit(1)
         return super().run(cwd, args)
 
-    def run_in_graalvm(self, cwd, args, extra_polyglot_args, host_vm):
-        with environ(self._env or {}):
-            cp = self.get_classpath()
-            if len(cp) > 0:
-                extra_polyglot_args.append("--vm.classpath=" + ":".join(cp))
-            launcher_name = 'graalpy'
-            return self._validate_output(*host_vm.run_launcher(launcher_name, extra_polyglot_args + args, cwd))
-
     def get_extra_polyglot_args(self):
         return ["--experimental-options", "-snapshot-startup", "--python.MaxNativeMemory=%s" % (2**34)] + self._extra_polyglot_args
 
@@ -480,10 +467,9 @@ def __init__(self, config_name=CONFIGURATION_DEFAULT, cp_suffix=None, distributi
     def launcher_class(self):
         return 'com.oracle.graal.python.benchmarks.JavaBenchmarkDriver'
 
-    def run_in_graalvm(self, cwd, args, extra_polyglot_args, host_vm):
-        # In GraalVM we run the Java benchmarks driver like one would run any other Java application
-        # that embeds GraalPython on GraalVM. We need to add the dependencies on class path, and since
-        # we use run_java, we need to do some output postprocessing that normally run_launcher would do
+    def run(self, cwd, args):
+        extra_polyglot_args = self.get_extra_polyglot_args()
+        host_vm = self.host_vm()
         with environ(self._env or {}):
             cp = self.get_classpath()
             jhm = mx.dependency("mx:JMH_1_21")