[GR-66392] Support conditional invocation plugin in runtime compilation.

PullRequest: graal/21446

Author: mur47x111

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

@@ -48,10 +48,12 @@
 import jdk.graal.compiler.hotspot.meta.UnimplementedGraalIntrinsics;
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.ConditionalInvocationPlugin;
 import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.runtime.RuntimeProvider;
 import jdk.graal.compiler.test.GraalTest;
+import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
 import jdk.vm.ci.hotspot.VMIntrinsicMethod;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -144,6 +146,16 @@ public interface Refiner {
     public final GraalHotSpotVMConfig config = rt.getVMConfig();
     public final UnimplementedGraalIntrinsics unimplementedGraalIntrinsics = new UnimplementedGraalIntrinsics(rt.getTarget().arch);
 
+    private static boolean isApplicable(InvocationPlugin plugin, Architecture arch) {
+        if (plugin == null) {
+            return false;
+        }
+        if (plugin instanceof ConditionalInvocationPlugin conditionalInvocationPlugin) {
+            return conditionalInvocationPlugin.isApplicable(arch);
+        }
+        return true;
+    }
+
     @Test
     public void test() throws ClassNotFoundException, NoSuchFieldException {
         HotSpotProviders providers = rt.getHostBackend().getProviders();
@@ -170,12 +182,10 @@ public void test() throws ClassNotFoundException, NoSuchFieldException {
 
             InvocationPlugin plugin = invocationPlugins.lookupInvocation(method, Graal.getRequiredCapability(OptionValues.class));
             String m = String.format("%s.%s%s", intrinsic.declaringClass, intrinsic.name, intrinsic.descriptor);
-            if (plugin == null) {
-                if (method != null) {
-                    IntrinsicMethod intrinsicMethod = providers.getConstantReflection().getMethodHandleAccess().lookupMethodHandleIntrinsic(method);
-                    if (intrinsicMethod != null) {
-                        continue;
-                    }
+            if (!isApplicable(plugin, providers.getLowerer().getTarget().arch)) {
+                IntrinsicMethod intrinsicMethod = providers.getConstantReflection().getMethodHandleAccess().lookupMethodHandleIntrinsic(method);
+                if (intrinsicMethod != null) {
+                    continue;
                 }
                 if (!unimplementedGraalIntrinsics.isDocumented(m) && isIntrinsicAvailable(intrinsic) && isIntrinsicSupportedByC2(intrinsic)) {
                     missing.add(m);

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsIndexOfWithMaskTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ public class ArrayUtilsIndexOfWithMaskTest extends GraalCompilerTest {
 
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins, getReplacements());
+        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins);
         super.registerInvocationPlugins(invocationPlugins);
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java

@@ -58,7 +58,7 @@ public class ArrayUtilsRegionEqualsWithMaskConstantTest extends GraalCompilerTes
 
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins, getReplacements());
+        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins);
         super.registerInvocationPlugins(invocationPlugins);
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java

@@ -41,7 +41,7 @@ public class ArrayUtilsRegionEqualsWithMaskTest extends GraalCompilerTest {
 
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins, getReplacements());
+        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins);
         super.registerInvocationPlugins(invocationPlugins);
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsTest.java

@@ -41,7 +41,7 @@ public class ArrayUtilsTest extends GraalCompilerTest {
 
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins, getReplacements());
+        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins);
         super.registerInvocationPlugins(invocationPlugins);
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExactMathTest.java

@@ -41,7 +41,7 @@ public class ExactMathTest extends TruffleCompilerImplTest {
 
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        TruffleGraphBuilderPlugins.registerExactMathPlugins(invocationPlugins, getTypes(), getReplacements(), getLowerer());
+        TruffleGraphBuilderPlugins.registerExactMathPlugins(invocationPlugins, getTypes());
         super.registerInvocationPlugins(invocationPlugins);
     }
 

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringTest.java

@@ -62,7 +62,7 @@ protected void addConstantParameterBinding(GraphBuilderConfiguration conf, Objec
 
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins, getReplacements());
+        TruffleInvocationPlugins.register(getBackend().getTarget().arch, invocationPlugins);
         super.registerInvocationPlugins(invocationPlugins);
     }
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64BaseAssembler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,6 @@
 
 import java.util.EnumSet;
 
-import org.graalvm.collections.EconomicSet;
-
 import jdk.graal.compiler.asm.Assembler;
 import jdk.graal.compiler.core.common.Stride;
 import jdk.graal.compiler.debug.GraalError;
@@ -308,35 +306,6 @@ public final boolean supports(CPUFeature feature) {
         return getFeatures().contains(feature);
     }
 
-    public final boolean supports(String feature) {
-        try {
-            return getFeatures().contains(AMD64.CPUFeature.valueOf(feature));
-        } catch (IllegalArgumentException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Mitigates exception throwing by recording unknown CPU feature names.
-     */
-    private final EconomicSet<String> unknownFeatures = EconomicSet.create();
-
-    /**
-     * Determines if the CPU feature denoted by {@code name} is supported. This name based look up
-     * is for features only available in later JVMCI releases.
-     */
-    public final boolean supportsCPUFeature(String name) {
-        if (unknownFeatures.contains(name)) {
-            return false;
-        }
-        try {
-            return supports(CPUFeature.valueOf(name));
-        } catch (IllegalArgumentException e) {
-            unknownFeatures.add(name);
-            return false;
-        }
-    }
-
     protected static boolean inRC(RegisterCategory rc, Register r) {
         return r.getRegisterCategory().equals(rc);
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LIRGenerator.java

@@ -633,7 +633,7 @@ public void emitArrayCopyWithConversion(EnumSet<?> runtimeCheckedCPUFeatures, Va
     }
 
     @Override
-    public void emitArrayFill(JavaKind kind, EnumSet<?> runtimeCheckedCPUFeatures, Value array, Value arrayBaseOffset, Value length, Value value) {
+    public void emitArrayFill(JavaKind kind, Value array, Value arrayBaseOffset, Value length, Value value) {
         append(new AArch64ArrayFillOp(kind, emitConvertNullToZero(array), asAllocatable(arrayBaseOffset), asAllocatable(length), asAllocatable(value)));
     }
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LoweringProviderMixin.java

@@ -47,11 +47,6 @@ default boolean supportsBulkZeroingOfEden() {
         return true;
     }
 
-    @Override
-    default boolean supportsRounding() {
-        return true;
-    }
-
     @Override
     default boolean writesStronglyOrdered() {
         /* AArch64 only requires a weak memory model. */
@@ -88,14 +83,4 @@ default boolean supportsFoldingExtendIntoAccess(ExtendableMemoryAccess access, M
         }
         return false;
     }
-
-    @Override
-    default boolean supportsFloatToUnsignedConvert() {
-        return true;
-    }
-
-    @Override
-    default boolean supportsUnsignedToFloatConvert() {
-        return true;
-    }
 }