[GR-18961] Extract VM info once before the first call to run.

PullRequest: graal/4652
zcfrank1st · Oct 19, 2019 · 0ee6f57 · 0ee6f57
2 parents 38e89b4 + 0cf80b5
commit 0ee6f57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "5.236.0",
+  "mxversion" : "5.241.1",
   "name" : "compiler",
   "sourceinprojectwhitelist" : [],
 

diff --git a/vm/mx.vm/mx_vm_benchmark.py b/vm/mx.vm/mx_vm_benchmark.py
@@ -67,10 +67,11 @@ def post_process_launcher_command_line_args(self, args):
                args
 
     def dimensions(self, cwd, args, code, out):
-        return {}
+        return super(GraalVm, self).dimensions(cwd, args, code, out)
 
     def run_java(self, args, out=None, err=None, cwd=None, nonZeroIsFatal=False):
         """Run 'java' workloads."""
+        self.extract_vm_info()
         return mx.run([os.path.join(mx_vm.graalvm_home(fatalIfMissing=True), 'bin', 'java')] + args, out=out, err=err, cwd=cwd, nonZeroIsFatal=nonZeroIsFatal)
 
     def run_lang(self, cmd, args, cwd):
@@ -79,6 +80,7 @@ def run_lang(self, cmd, args, cwd):
 
     def run_launcher(self, cmd, args, cwd):
         """Run the 'cmd' command in the 'bin' directory."""
+        self.extract_vm_info()
         out = mx.TeeOutputCapture(mx.OutputCapture())
         args = self.post_process_launcher_command_line_args(args)
         mx.log("Running '{}' on '{}' with args: '{}'".format(cmd, self.name(), args))