Skip to content

Commit ffad82a

Browse files
committed
[GR-62815] Adapt JDK-8348561: Add aarch64 intrinsics for ML-DSA
PullRequest: graal/20237
2 parents 0d105b2 + bace161 commit ffad82a

27 files changed

+135
-132
lines changed

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
782782
}
783783

784784
// @formatter:off
785-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/share/opto/library_call.cpp#L2902-L2956",
785+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/share/opto/library_call.cpp#L2913-L2967",
786786
sha1 = "353e0d45b0f63ac58af86dcab5b19777950da7e2")
787787
// @formatter:on
788788
private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config, GraphBuilderContext b, ResolvedJavaMethod targetMethod, ForeignCallDescriptor descriptor,
@@ -831,7 +831,7 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
831831
}
832832

833833
// @formatter:off
834-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/share/opto/library_call.cpp#L3722-L3806",
834+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/share/opto/library_call.cpp#L3733-L3817",
835835
sha1 = "3e9cfba4d9554f7cd9ab392f0826a31ae6396193")
836836
// @formatter:on
837837
private static class ContinuationPinningPlugin extends InvocationPlugin {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import jdk.graal.compiler.word.Word;
4646

4747
// @formatter:off
48-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/share/opto/library_call.cpp#L4644-L4778",
48+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/share/opto/library_call.cpp#L4622-L4756",
4949
sha1 = "c212d1dbff26d02d4d749e085263d4104895f1ba")
5050
// @formatter:on
5151
public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/MonitorSnippets.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@
199199
* appropriately to comply with the layouts above.
200200
*/
201201
// @formatter:off
202-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L174-L498",
203-
sha1 = "7bf54a5cd262e46c33067da8674032974e80af08")
202+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7a5acb9be17cd54bbd0abf2524386b981dd5ac04/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L174-L495",
203+
sha1 = "eeccf08eec0f427f9056a88620ff3f53ab8c189c")
204204
// @formatter:on
205205
public class MonitorSnippets implements Snippets {
206206

@@ -413,7 +413,7 @@ private static boolean tryStackLocking(Object object, Word lock, Word mark, Word
413413
}
414414

415415
// @formatter:off
416-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L500-L666",
416+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/8f8a879de03add68e385f2610863d3b4ddd86df7/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L497-L663",
417417
sha1 = "1c396a67926e92a2cbc64c27fe667142e9ec157d")
418418
// @formatter:on
419419
@SuppressWarnings("unused")
@@ -543,8 +543,8 @@ private static boolean tryStackUnlocking(Object object, Word thread, Word lock,
543543
}
544544

545545
// @formatter:off
546-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L668-L837",
547-
sha1 = "34c70e9dd2d3093e82189a25c056e7fdb1aff506")
546+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7a5acb9be17cd54bbd0abf2524386b981dd5ac04/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L665-L832",
547+
sha1 = "ad63b9816f3e1851c7defe445488b49dd49e69d6")
548548
// @formatter:on
549549
private static boolean tryLightweightUnlocking(Object object, Word thread, Word lock, boolean trace, Counters counters) {
550550
// Load top

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/TypeCheckSnippetUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static boolean checkUnknownSubType(KlassPointer t, KlassPointer sNonNull, Counte
9191
}
9292

9393
// @formatter:off
94-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L4973-L5191",
94+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L4997-L5215",
9595
sha1 = "10849f217123323ad73af5fe2aee2876a2943e1d")
9696
// @formatter:on
9797
static boolean checkSecondarySubType(KlassPointer t, KlassPointer s, boolean isTAlwaysAbstract, Counters counters) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* Snippet for updating JFR thread local data on {@code Thread#setCurrentThread} events.
6565
*/
6666
// @formatter:off
67-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/share/opto/library_call.cpp#L3508-L3636",
67+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/share/opto/library_call.cpp#L3519-L3647",
6868
sha1 = "59f07096cdbe1aac79b1248db345e9616b54f4a4")
6969
// @formatter:on
7070
public class VirtualThreadUpdateJFRSnippets implements Snippets {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/LookUpSecondarySupersTableStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public LookUpSecondarySupersTableStub(OptionValues options, HotSpotProviders pro
6262
}
6363

6464
// @formatter:off
65-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L5193-L5299",
65+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L5217-L5323",
6666
sha1 = "573099757de85d90c3cf8cee8ff332e195fe68c7")
6767
// @formatter:on
6868
@Snippet

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMulAddOp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
// @formatter:off
5050

51-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L4883-L4903",
51+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L5943-L5963",
5252
sha1 = "4b7c56d39d91df3d900d50ca260ff8ad04815574")
5353
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L4234-L4270",
5454
sha1 = "33649be9177daf5f0b4817d807458a5ff8c00365")

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import jdk.vm.ci.meta.Value;
5858

5959
// @formatter:off
60-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L4806-L4844",
60+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L5866-L5904",
6161
sha1 = "232bbf6f1aa4cf95182f546679b4fa7f9cfba70c")
6262
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L3725-L3734",
6363
sha1 = "376de6fbb2caccaac53c4aa934ce96f8f0dc7f18")

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerSquareToLenOp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import jdk.vm.ci.meta.Value;
5454

5555
// @formatter:off
56-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L4846-L4881",
56+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L5906-L5941",
5757
sha1 = "4ccf6fdbe1a4dce5aedb73eb3afc26c003d81401")
5858
// @formatter:on
5959
public final class AArch64BigIntegerSquareToLenOp extends AArch64LIRInstruction {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CountPositivesOp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
// @formatter:off
7272
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L5749-L5818",
7373
sha1 = "ce54a7cf2fcfe7ccb8f6604c038887fc1c4ebce1")
74-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L5139-L5306",
74+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L6199-L6366",
7575
sha1 = "45239b79c957ea992a4d05afa358d5b953fe84fe")
7676
// @formatter:on
7777
@Opcode("AARCH64_COUNT_POSITIVES")

0 commit comments

Comments
 (0)