compiler : fix JVMCIVersionCheck --as-tag output

Author: marwan-hallaoui

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckMain.java

@@ -79,8 +79,7 @@ public void testMinVersionAsTag() {
         String out = runMainCaptureOut("--min-version", "--as-tag");
         Assert.assertNotNull(out);
         Assert.assertFalse(out.contains("No minimum JVMCI version specified for JDK version"));
-        // check that the output is a valid version
-        Runtime.Version.parse(out.strip());
+        Assert.assertTrue(out.startsWith("jvmci-"));
     }
 
     @Test(expected = IllegalArgumentException.class)

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java

@@ -246,17 +246,17 @@ public int hashCode() {
             return Objects.hashCode(this.jdkVersion) ^ Objects.hashCode(this.releaseName) ^ this.jvmciBuild;
         }
 
-        public static final String AS_TAG_FORMAT_RELEASE_NAME = "%s-jvmci-%s-b%02d";
+        public static final String AS_TAG_FORMAT_RELEASE_NAME = "jvmci-%s-b%02d";
+        public static final String TO_STRING_FORMAT_RELEASE_NAME = "%s-jvmci-%s-b%02d";
         public static final String AS_TAG_FORMAT_22_AND_LATER = "%s-jvmci-b%02d";
-        public static final String AS_TAG_FORMAT_21_AND_EARLIER = "jvmci-%d.%d-b%02d";
 
         @Override
         public String toString() {
             if (isOpenJDK()) {
                 return jdkVersion.toString();
             }
             if (releaseName != null) {
-                return String.format(AS_TAG_FORMAT_RELEASE_NAME, jdkVersion, releaseName, jvmciBuild);
+                return String.format(TO_STRING_FORMAT_RELEASE_NAME, jdkVersion, releaseName, jvmciBuild);
             } else {
                 return String.format(AS_TAG_FORMAT_22_AND_LATER, jdkVersion, jvmciBuild);
             }
@@ -265,7 +265,15 @@ public String toString() {
         public String printFormat(PrintFormat format) {
             return switch (format) {
                 case TUPLE -> String.format("%s,%s,%d", jdkVersion, releaseName, jvmciBuild);
-                case AS_TAG -> toString();
+                case AS_TAG -> {
+                    if (isOpenJDK()) {
+                        yield jdkVersion.toString();
+                    } else if (releaseName != null) {
+                        yield String.format(AS_TAG_FORMAT_RELEASE_NAME, releaseName, jvmciBuild);
+                    } else {
+                        yield String.format(AS_TAG_FORMAT_22_AND_LATER, jdkVersion, jvmciBuild);
+                    }
+                }
             };
         }