Skip to content

Commit eb44770

Browse files
committed
[GR-46685] Unconditionally register snippet stubs.
PullRequest: graal/14874
2 parents 3498ec6 + aaba913 commit eb44770

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
8989
register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null));
9090

9191
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, ArrayEqualsForeignCalls.STUBS_AMD64);
92-
93-
if (VectorizedHashCodeNode.isSupported(target.arch)) {
94-
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, VectorizedHashCodeNode.STUBS);
95-
}
92+
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, VectorizedHashCodeNode.STUBS);
9693

9794
super.initialize(providers, options);
9895
}
@@ -116,5 +113,4 @@ protected void registerMathStubs(GraalHotSpotVMConfig hotSpotVMConfig, HotSpotPr
116113
super.registerMathStubs(hotSpotVMConfig, providers, options);
117114
}
118115
}
119-
120116
}

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
import org.graalvm.word.LocationIdentity;
156156

157157
import jdk.vm.ci.code.CodeCacheProvider;
158-
import jdk.vm.ci.code.TargetDescription;
159158
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
160159
import jdk.vm.ci.meta.JavaKind;
161160
import jdk.vm.ci.meta.MetaAccessProvider;
@@ -629,21 +628,6 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
629628
registerForeignCall(CHACHA20Block, c.chacha20Block, NativeCall);
630629
}
631630

632-
TargetDescription target = providers.getCodeCache().getTarget();
633-
634-
if (AESNode.isSupported(target.arch)) {
635-
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, AESNode.STUBS);
636-
}
637-
if (CounterModeAESNode.isSupported(target.arch)) {
638-
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CounterModeAESNode.STUB);
639-
}
640-
if (CipherBlockChainingAESNode.isSupported(target.arch)) {
641-
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CipherBlockChainingAESNode.STUBS);
642-
}
643-
if (GHASHProcessBlocksNode.isSupported(target.arch)) {
644-
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, GHASHProcessBlocksNode.STUB);
645-
}
646-
647631
registerSnippetStubs(providers, options);
648632
registerStubCallFunctions(options, providers, runtime.getVMConfig());
649633
}
@@ -675,6 +659,10 @@ private void registerSnippetStubs(HotSpotProviders providers, OptionValues optio
675659
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, BigIntegerMultiplyToLenNode.STUB);
676660
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, BigIntegerMulAddNode.STUB);
677661
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, BigIntegerSquareToLenNode.STUB);
662+
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, AESNode.STUBS);
663+
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CounterModeAESNode.STUB);
664+
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, CipherBlockChainingAESNode.STUBS);
665+
linkSnippetStubs(providers, options, IntrinsicStubsGen::new, GHASHProcessBlocksNode.STUB);
678666
}
679667

680668
@FunctionalInterface

0 commit comments

Comments
 (0)