[GR-41724] JVMCIVersionCheck should print to stdout instead of to a file

PullRequest: graal/12933

Author: zapster

compiler/mx.compiler/mx_compiler.py

@@ -123,13 +123,11 @@ def source_supplier():
                 fp.write(source_supplier().replace('package org.graalvm.compiler.hotspot;', ''))
             mx.run([jdk.javac, '-d', sdu.directory, unqualified_source_path])
 
-    jvmci_version_file = join(binDir, 'jvmci_version.' + str(os.getpid()))
-    mx.run([jdk.java, '-DJVMCIVersionCheck.jvmci.version.file=' + jvmci_version_file, '-cp', binDir, unqualified_name])
-    if exists(jvmci_version_file):
-        with open(jvmci_version_file) as fp:
-            global _jdk_jvmci_version
-            _jdk_jvmci_version = tuple((int(n) for n in fp.read().split(',')))
-        os.remove(jvmci_version_file)
+    out = mx.OutputCapture()
+    mx.run([jdk.java, '-cp', binDir, unqualified_name], out=out)
+    global _jdk_jvmci_version
+    if out.data:
+        _jdk_jvmci_version = tuple((int(n) for n in out.data.split(',')))
 
 if os.environ.get('JVMCI_VERSION_CHECK', None) != 'ignore':
     _check_jvmci_version(jdk)

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java

@@ -146,7 +146,7 @@ public static boolean jvmciGE(Version v) {
     public static final boolean JDK_PRERELEASE;
     static {
         String vmVersion = getProperty("java.vm.version");
-        JVMCI_VERSION = Version.parse(vmVersion, Services.getSavedProperties());
+        JVMCI_VERSION = Version.parse(vmVersion);
         JDK_PRERELEASE = vmVersion.contains("SNAPSHOT") || vmVersion.contains("-dev");
         JVMCI = JVMCI_VERSION != null;
     }

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java

@@ -114,7 +114,7 @@ public void onSelection() {
     }
 
     private void initialize() {
-        JVMCIVersionCheck.check(Services.getSavedProperties(), false);
+        JVMCIVersionCheck.check(Services.getSavedProperties(), false, true);
         assert options == null : "cannot select " + getClass() + " service more than once";
         try {
             options = HotSpotGraalOptionValues.defaultOptions();

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java

@@ -24,10 +24,6 @@
  */
 package org.graalvm.compiler.hotspot;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.Formatter;
 import java.util.HashMap;
 import java.util.Map;
@@ -54,21 +50,13 @@ public static class Version {
         private final int minor;
         private final int build;
 
-        static Version parse(String vmVersion, Map<String, String> props) {
+        static Version parse(String vmVersion) {
             Matcher m = Pattern.compile(".*-jvmci-(\\d+)\\.(\\d+)-b(\\d+).*").matcher(vmVersion);
             if (m.matches()) {
                 try {
                     int major = Integer.parseInt(m.group(1));
                     int minor = Integer.parseInt(m.group(2));
                     int build = Integer.parseInt(m.group(3));
-                    String jvmciVersionFile = props.get("JVMCIVersionCheck.jvmci.version.file");
-                    if (jvmciVersionFile != null) {
-                        try {
-                            Files.write(Paths.get(jvmciVersionFile), String.format("%d,%d,%d", major, minor, build).getBytes());
-                        } catch (IOException e) {
-                            throw new UncheckedIOException(e);
-                        }
-                    }
                     return new Version(major, minor, build);
                 } catch (NumberFormatException e) {
                     // ignore
@@ -163,9 +151,9 @@ private JVMCIVersionCheck(Map<String, String> props, String javaSpecVersion, Str
         this.vmVersion = vmVersion;
     }
 
-    static void check(Map<String, String> props, boolean exitOnFailure) {
+    static void check(Map<String, String> props, boolean exitOnFailure, boolean quiet) {
         JVMCIVersionCheck checker = new JVMCIVersionCheck(props, props.get("java.specification.version"), props.get("java.vm.version"));
-        checker.run(exitOnFailure, JVMCI_MIN_VERSION);
+        checker.run(exitOnFailure, JVMCI_MIN_VERSION, quiet);
     }
 
     /**
@@ -176,10 +164,10 @@ public static void check(Map<String, String> props,
                     String javaSpecVersion,
                     String javaVmVersion, boolean exitOnFailure) {
         JVMCIVersionCheck checker = new JVMCIVersionCheck(props, javaSpecVersion, javaVmVersion);
-        checker.run(exitOnFailure, minVersion);
+        checker.run(exitOnFailure, minVersion, true);
     }
 
-    private void run(boolean exitOnFailure, Version minVersion) {
+    private void run(boolean exitOnFailure, Version minVersion, boolean quiet) {
         if (javaSpecVersion.compareTo("11") < 0) {
             failVersionCheck(exitOnFailure, "Graal requires JDK 11 or later.%n");
         } else {
@@ -192,8 +180,11 @@ private void run(boolean exitOnFailure, Version minVersion) {
             }
             if (vmVersion.contains("-jvmci-")) {
                 // A "labsjdk"
-                Version v = Version.parse(vmVersion, props);
+                Version v = Version.parse(vmVersion);
                 if (v != null) {
+                    if (!quiet) {
+                        System.out.println(String.format("%d,%d,%d", v.major, v.minor, v.build));
+                    }
                     if (v.isLessThan(minVersion)) {
                         failVersionCheck(exitOnFailure, "The VM does not support the minimum JVMCI API version required by Graal: %s < %s.%n", v, minVersion);
                     }
@@ -216,6 +207,6 @@ public static void main(String[] args) {
         for (String name : sprops.stringPropertyNames()) {
             props.put(name, sprops.getProperty(name));
         }
-        check(props, true);
+        check(props, true, false);
     }
 }