Skip to content

Commit 3566e04

Browse files
mur47x111mur47x111
committed
[GR-67956] Adapt JDK-8359965: Enable paired pushp and popp instruction usage for APX enabled CPUs
PullRequest: graal/21593
2 parents 2ef76d1 + 2f56774 commit 3566e04

24 files changed

+44
-44
lines changed

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/z/AMD64HotSpotZBarrierSetLIRGenerator.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ public static void zUncolor(CompilationResultBuilder crb, AMD64MacroAssembler ma
140140
// @formatter:off
141141
@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L357-L374",
142142
sha1 = "9a628c1771df79ae8b4cee89d2863fbd4a4964bc")
143-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L427-L471",
144-
sha1 = "7688e7aeab5f1aa413690066355a17c18a4273fa")
143+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4994bd594299e91e804438692e068b1c5dd5cc02/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L427-L471",
144+
sha1 = "f0ebe23274c133d4f10c44ac94f755ec5e1ce951")
145145
// @formatter:on
146146
public static void emitPreWriteBarrier(CompilationResultBuilder crb,
147147
AMD64MacroAssembler masm,
@@ -219,8 +219,8 @@ public static void emitPreWriteBarrier(CompilationResultBuilder crb,
219219
* Try to perform any local store barrier fixups or dispatch to the slow path.
220220
*/
221221
// @formatter:off
222-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L507-L562",
223-
sha1 = "4b729acf92e6a297229b7f1e957601708c315f4f")
222+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4994bd594299e91e804438692e068b1c5dd5cc02/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L507-L562",
223+
sha1 = "3e1d9694c103cc90ce14b2f8258a1f609b6b1bf2")
224224
// @formatter:on
225225
static void storeBarrierMedium(CompilationResultBuilder crb,
226226
AMD64MacroAssembler masm,
@@ -287,8 +287,8 @@ static void storeBarrierMedium(CompilationResultBuilder crb,
287287
* Add a value to the store buffer.
288288
*/
289289
// @formatter:off
290-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L473-L505",
291-
sha1 = "638b10c65bb14fa4b254efa4d5bbb1751fdbb6bf")
290+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4994bd594299e91e804438692e068b1c5dd5cc02/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L473-L505",
291+
sha1 = "2576cfbe1a01fbc48ad932335603ff1b4f9238aa")
292292
// @formatter:on
293293
static void storeBarrierBufferAdd(AMD64MacroAssembler masm,
294294
AMD64Address address,
@@ -328,8 +328,8 @@ static void storeBarrierBufferAdd(AMD64MacroAssembler masm,
328328
* around the call. This simplifies the code generation as no extra registers are required.
329329
*/
330330
// @formatter:off
331-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L273-L355",
332-
sha1 = "b115de722f09759f23e6778fda61d7701fc1cee7")
331+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4994bd594299e91e804438692e068b1c5dd5cc02/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L273-L355",
332+
sha1 = "4868c985deb91bb0a0067c15f99ea0c9360d31f6")
333333
// @formatter:on
334334
public static void emitLoadBarrier(CompilationResultBuilder crb,
335335
AMD64MacroAssembler masm,

‎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
@@ -799,7 +799,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
799799
}
800800

801801
// @formatter:off
802-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/share/opto/library_call.cpp#L2986-L3040",
802+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L3013-L3067",
803803
sha1 = "353e0d45b0f63ac58af86dcab5b19777950da7e2")
804804
// @formatter:on
805805
private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config, GraphBuilderContext b, ResolvedJavaMethod targetMethod, ForeignCallDescriptor descriptor,
@@ -848,7 +848,7 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
848848
}
849849

850850
// @formatter:off
851-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/share/opto/library_call.cpp#L3805-L3889",
851+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L3832-L3916",
852852
sha1 = "3e9cfba4d9554f7cd9ab392f0826a31ae6396193")
853853
// @formatter:on
854854
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
@@ -43,7 +43,7 @@
4343
import jdk.graal.compiler.word.Word;
4444

4545
// @formatter:off
46-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/share/opto/library_call.cpp#L4689-L4823",
46+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L4716-L4850",
4747
sha1 = "c212d1dbff26d02d4d749e085263d4104895f1ba")
4848
// @formatter:on
4949
public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {

‎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
@@ -90,7 +90,7 @@ static boolean checkUnknownSubType(KlassPointer t, KlassPointer sNonNull, Counte
9090
}
9191

9292
// @formatter:off
93-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L4230-L4448",
93+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/e6ac956a7ac613b916c0dbfda7e57856c1b8a83c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L4246-L4464",
9494
sha1 = "10849f217123323ad73af5fe2aee2876a2943e1d")
9595
// @formatter:on
9696
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/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/share/opto/library_call.cpp#L3591-L3719",
67+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L3618-L3746",
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/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L4450-L4556",
65+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/e6ac956a7ac613b916c0dbfda7e57856c1b8a83c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L4466-L4572",
6666
sha1 = "573099757de85d90c3cf8cee8ff332e195fe68c7")
6767
// @formatter:on
6868
@Snippet

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitSwapOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import jdk.vm.ci.meta.AllocatableValue;
3737

3838
// @formatter:off
39-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/aarch64.ad#L13604-L13628",
39+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/cpu/aarch64/aarch64.ad#L13589-L13613",
4040
sha1 = "5e7655c00a9d610fa3c992305c0f6aeba32b2d6c")
4141
// @formatter:on
4242
public class AArch64BitSwapOp extends AArch64LIRInstruction {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* Returns -1, 0, or 1 if either x < y, x == y, or x > y.
4242
*/
4343
// @formatter:off
44-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/aarch64.ad#L9256-L9338",
44+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/cpu/aarch64/aarch64.ad#L9241-L9323",
4545
sha1 = "84da421c1489e188366d61bb4298e0425ccac14b")
4646
// @formatter:on
4747
public class AArch64NormalizedUnsignedCompareOp extends AArch64LIRInstruction {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
// @formatter:off
6060
@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L3378-L3431",
6161
sha1 = "0acab67ba719cb484db0a201e1a3c949148aca66")
62-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L6918-L6952",
62+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/e6ac956a7ac613b916c0dbfda7e57856c1b8a83c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L6934-L6968",
6363
sha1 = "e68b8c7bdb37d4bd1350c7e1219fdcb419d2618a")
64-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7170-L7347",
64+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/e6ac956a7ac613b916c0dbfda7e57856c1b8a83c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7186-L7363",
6565
sha1 = "d89ad721deb560178359f86e8c6c96ffc6530878")
6666
// @formatter:on
6767
public final class AMD64BigIntegerMulAddOp extends AMD64LIRInstruction {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
// @formatter:off
6060
@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L3143-L3199",
6161
sha1 = "a27b423247760ab694d031351766867ff0eacc04")
62-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L6174-L6631",
62+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/e6ac956a7ac613b916c0dbfda7e57856c1b8a83c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L6190-L6647",
6363
sha1 = "0763af542cf9f40a1c542e4834a67fc4b2c74e1c")
6464
// @formatter:on
6565
public final class AMD64BigIntegerMultiplyToLenOp extends AMD64LIRInstruction {

0 commit comments

Comments
 (0)