Benchmarks: translate --vm.XX arguments to -XX when not running in GraalVM

Author: steve-s

graalpython/com.oracle.graal.python.benchmarks/python/host_interop/image-magix-sized2.py renamed to graalpython/com.oracle.graal.python.benchmarks/python/meso/image-magix-sized2.py

@@ -111,14 +111,10 @@ def __getitem__(self, t):
 
 
 SZ = 20
-import java
-INPUT_DATA = java.type("int[]")(SZ * SZ)
-for i in range(SZ * SZ):
-    INPUT_DATA[i] = i
 
 
 def measure(num):
-    img = Image(SZ, SZ, data=INPUT_DATA)
+    img = Image(SZ, SZ, data=list(range(SZ * SZ)))
     for i in range(num):
         img = img.sobel(horizontal=True, vertical=True)
         img = img.fisheye(bilinear=True, fraction=3)
@@ -129,14 +125,20 @@ def __benchmark__(num=10000):
     return measure(num)
 
 
+def java_embedded_bench_entrypoint(num=10000):
+    measure(int(num))
+
+
 if __name__ == '__main__':
     import sys
-    import time
-    start = time.time()
-    if len(sys.argv) >= 2:
-        num = int(sys.argv[1])
-        img = __benchmark__(num)
-    else:
-        img = __benchmark__(2)
-    print(img.data)
-    print("%s took %s s" % (__file__, time.time() - start))
+    if not (len(sys.argv) == 1 and sys.argv[0] == 'java_embedding_bench'):
+        import time
+        SZ = 5
+        start = time.time()
+        if len(sys.argv) >= 2:
+            num = int(sys.argv[1])
+            img = __benchmark__(num)
+        else:
+            img = __benchmark__(2)
+        print(img.data)
+        print("%s took %s s" % (__file__, time.time() - start))

mx.graalpython/mx_graalpython_benchmark.py

@@ -347,6 +347,13 @@ def get_classpath(self):
             cp.append(self._cp_suffix)
         return cp
 
+    @staticmethod
+    def _remove_vm_prefix(argument):
+        if argument.startswith('--vm.'):
+            return '-' + argument.strip('--vm.')
+        else:
+            return argument
+
     def run(self, cwd, args):
         _check_vm_args(self.name(), args)
         extra_polyglot_args = self.get_extra_polyglot_args()
@@ -356,6 +363,7 @@ def run(self, cwd, args):
             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(x) for x in args]
         truffle_options = [
             # "-Dpolyglot.engine.CompilationExceptionsAreFatal=true"
         ]
@@ -733,7 +741,7 @@ def postprocess_run_args(self, run_args):
             remaining = ["-i", str(iterations)] + (remaining if remaining else [])
 
         if self._checkup:
-            vm_options += ['--engine.TraceCompilation', '-XX:+PrintGC']
+            vm_options += ['--engine.TraceCompilation', '--vm.XX:+PrintGC']
 
         return vm_options, remaining