[GR-60445][GR-60446] Fix failing benchmark jobs.

PullRequest: graalpython/3615

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "eb0ecaed8ee3ac6f5ec37e163a0df409585dbdc9" }
+{ "overlay": "80c82ac2e9a0455373dc290cffb8f3fac2ebe4f7" }

mx.graalpython/mx_graalpython_benchmark.py

@@ -397,7 +397,7 @@ def run(self, cwd, args):
         if isinstance(self._extra_vm_args, list):
             vm_args += self._extra_vm_args
         vm_args += [
-            "-Dorg.graalvm.language.python.home=%s" % join(SUITE.dir, "graalpython"),
+            "-Dorg.graalvm.language.python.home=%s" % mx.dependency("GRAALPYTHON_GRAALVM_SUPPORT").get_output(),
             self.launcher_class(),
         ]
         for a in args[:]:
@@ -998,7 +998,7 @@ def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
             dists.append('SULONG_NATIVE')
 
         vmArgs += [
-            "-Dorg.graalvm.language.python.home=%s" % join(SUITE.dir, "graalpython"),
+            "-Dorg.graalvm.language.python.home=%s" % mx.dependency("GRAALPYTHON_GRAALVM_SUPPORT").get_output(),
         ]
         vmArgs += mx.get_runtime_jvm_args(dists + ['com.oracle.graal.python.benchmarks'], jdk=mx.get_jdk())
         jmh_entry = ["com.oracle.graal.python.benchmarks.parser.ParserBenchRunner"]

mx.graalpython/mx_graalpython_python_benchmarks.py

@@ -113,7 +113,7 @@
     # "html5lib",
     "json_dumps",
     "json_loads",
-    "logging",
+    # "logging",
     # "mako",
     "meteor_contest",
     "nbody",
@@ -572,7 +572,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
                 join(vm_venv, "bin", "pyperformance"),
                 "run",
                 "--inherit-environ",
-                "PIP_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS",
+                "PIP_INDEX_URL,PIP_EXTRA_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS",
                 "-o",
                 json_file,
                 *bms,
@@ -590,7 +590,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
                 "--debug-single-value",
                 "--track-memory",
                 "--inherit-environ",
-                "PIP_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS",
+                "PIP_INDEX_URL,PIP_EXTRA_INDEX_URL,PIP_TRUSTED_HOST,PIP_TIMEOUT,PIP_RETRIES,LD_LIBRARY_PATH,LIBRARY_PATH,CPATH,PATH,PYPY_GC_MAX,JAVA_OPTS,GRAAL_PYTHON_ARGS",
                 "-o",
                 json_file_memory,
                 *bms,