remove support code for JDK < 17

Author: dougxc

compiler/mx.compiler/suite.py

@@ -580,6 +580,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "JVMCI_HOTSPOT",
+        "JFR",
         "org.graalvm.compiler.api.runtime",
         "org.graalvm.compiler.printer",
         "org.graalvm.compiler.replacements",
@@ -600,32 +601,6 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.jdk17" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies": [
-        "org.graalvm.compiler.hotspot",
-        "JVMCI_HOTSPOT",
-        "JFR",
-      ],
-      "requiresConcealed" : {
-        "jdk.internal.vm.ci" : [
-          "jdk.vm.ci.hotspot",
-          "jdk.vm.ci.meta",
-          "jdk.vm.ci.services",
-        ],
-      },
-      "annotationProcessors" : [
-        "GRAAL_PROCESSOR",
-      ],
-      "overlayTarget" : "org.graalvm.compiler.hotspot",
-      "multiReleaseJarVersion" : "17",
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "17+",
-      "checkPackagePrefix" : "false",
-      "workingSets" : "Graal,HotSpot",
-    },
-
     "org.graalvm.compiler.management" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -731,26 +706,6 @@
       "workingSets" : "Graal,HotSpot,Test",
     },
 
-    "org.graalvm.compiler.hotspot.jdk17.test" : {
-      "testProject" : True,
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.replacements.test",
-      ],
-      "requiresConcealed" : {
-        "java.base" : [
-          "jdk.internal.misc",
-        ],
-        "jdk.internal.vm.ci" : [
-          "jdk.vm.ci.meta",
-        ],
-      },
-      "checkstyle": "org.graalvm.compiler.graph",
-      "javaCompliance" : "17+",
-      "workingSets" : "Graal,HotSpot,Test",
-    },
-
     "org.graalvm.compiler.hotspot.lir.test" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -1865,21 +1820,6 @@
       "workingSets" : "Graal,Truffle",
     },
 
-    "org.graalvm.compiler.truffle.runtime.hotspot.jdk17" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.truffle.runtime",
-        "JVMCI_HOTSPOT",
-      ],
-      "checkPackagePrefix" : "false",
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "17+",
-      "multiReleaseJarVersion" : "17",
-      "overlayTarget" : "org.graalvm.compiler.truffle.runtime.hotspot",
-      "workingSets" : "Graal,Truffle",
-    },
-
     "org.graalvm.compiler.truffle.compiler.hotspot.amd64" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -1988,7 +1928,6 @@
         "org.graalvm.compiler.hotspot.aarch64.test",
         "org.graalvm.compiler.hotspot.amd64.test",
         "org.graalvm.compiler.hotspot.lir.test",
-        "org.graalvm.compiler.hotspot.jdk17.test",
         "org.graalvm.compiler.options.test",
         "org.graalvm.compiler.jtt",
         "org.graalvm.compiler.lir.jtt",

compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java

@@ -49,7 +49,6 @@
 import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
 import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
@@ -87,16 +86,7 @@ public AMD64HotSpotSafepointOp(LIRFrameState state, GraalHotSpotVMConfig config,
             temp = Value.ILLEGAL;
         }
         EnumSet<CPUFeature> features = ((AMD64) tool.getLIRGeneratorTool().target().arch).getFeatures();
-        if (JavaVersionUtil.JAVA_SPEC < 17 && features.contains(AMD64.CPUFeature.AVX512F)) {
-            /*
-             * Hotspot doesn't save AVX512 opmask registers on JDK11. Mark them as killed to force
-             * spilling around safepoints.
-             */
-            killedMaskRegisters = MASK_REGISTERS;
-        } else {
-            killedMaskRegisters = AllocatableValue.NONE;
-        }
-
+        killedMaskRegisters = AllocatableValue.NONE;
     }
 
     @Override

compiler/src/org.graalvm.compiler.hotspot.jdk17/src/org/graalvm/compiler/hotspot/HotSpotGraalServices.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.hotspot.jdk17.test;
+package org.graalvm.compiler.hotspot.test;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

compiler/src/org.graalvm.compiler.hotspot.jdk17/src/org/graalvm/compiler/hotspot/IsGraalPredicate.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.hotspot.jdk17.test;
+package org.graalvm.compiler.hotspot.test;
 
 import org.graalvm.compiler.replacements.test.MethodSubstitutionTest;
 import org.junit.Test;

compiler/src/org.graalvm.compiler.hotspot.jdk17.test/src/org/graalvm/compiler/hotspot/jdk17/test/CheckIndexLongTest.java renamed to compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckIndexLongTest.java

@@ -25,14 +25,11 @@
 
 package org.graalvm.compiler.hotspot.test;
 
-import static org.junit.Assume.assumeTrue;
-
 import java.lang.reflect.Field;
 
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.ParameterNode;
@@ -150,7 +147,6 @@ static void init() {
 
     @Test
     public void testUnsafeFoldComponentType() {
-        assumeTrue(GraalHotSpotVMConfig.jvmciGE(GraalHotSpotVMConfig.JVMCI_20_3_b04));
         runTest = new Runnable() {
             @Override
             public void run() {

compiler/src/org.graalvm.compiler.hotspot.jdk17.test/src/org/graalvm/compiler/hotspot/jdk17/test/ClassReplacementsTest.java renamed to compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ClassReplacementsTest.java

@@ -31,7 +31,6 @@
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotBackend;
-import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.replacements.test.MethodSubstitutionTest;
 import org.junit.Test;
 
@@ -135,16 +134,9 @@ public static Class<?> getComponentType(Class<?> clazz) {
     public void testThreadSubstitutions() {
         GraalHotSpotVMConfig config = ((HotSpotBackend) getBackend()).getRuntime().getVMConfig();
         testGraph("currentThread");
-        if (config.osThreadInterruptedOffset != Integer.MAX_VALUE) {
-            assertInGraph(testGraph("threadIsInterrupted", "isInterrupted", true), IfNode.class);
-            assertInGraph(testGraph("threadInterrupted", "isInterrupted", true), IfNode.class);
-        }
 
         Thread currentThread = Thread.currentThread();
         test("currentThread", currentThread);
-        if (config.osThreadInterruptedOffset != Integer.MAX_VALUE) {
-            test("threadIsInterrupted", currentThread);
-        }
     }
 
     @SuppressWarnings("all")

compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java

@@ -64,13 +64,13 @@ public void test01() {
                     String javaVmVersion = String.format("prefix-jvmci-%s-suffix", version);
                     if (!version.isLessThan(minVersion)) {
                         try {
-                            JVMCIVersionCheck.check(props, minVersion, "11", javaVmVersion, false);
+                            JVMCIVersionCheck.check(props, minVersion, "17", javaVmVersion, false);
                         } catch (InternalError e) {
                             throw new AssertionError("Failed " + JVMCIVersionCheckTest.class.getSimpleName() + " with -Dtest.seed=" + seed, e);
                         }
                     } else {
                         try {
-                            JVMCIVersionCheck.check(props, minVersion, "11", javaVmVersion, false);
+                            JVMCIVersionCheck.check(props, minVersion, "17", javaVmVersion, false);
                             Assert.fail("expected to fail checking " + javaVmVersion + " against " + minVersion + " (-Dtest.seed=" + seed + ")");
                         } catch (InternalError e) {
                             // pass

compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.hotspot.jdk17.test;
+package org.graalvm.compiler.hotspot.test;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.ReferenceQueue;