Skip to content

Commit 43fff3d

Browse files
committed
Adapt JDK-8362193: Re-work MacOS/AArch64 SpinPause to handle SB
1 parent e324a6a commit 43fff3d

21 files changed

+26
-24
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
@@ -804,7 +804,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
804804
}
805805

806806
// @formatter:off
807-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L3013-L3067",
807+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L3016-L3070",
808808
sha1 = "353e0d45b0f63ac58af86dcab5b19777950da7e2")
809809
// @formatter:on
810810
private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config, GraphBuilderContext b, ResolvedJavaMethod targetMethod, ForeignCallDescriptor descriptor,
@@ -853,7 +853,7 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
853853
}
854854

855855
// @formatter:off
856-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L3832-L3916",
856+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L3835-L3919",
857857
sha1 = "3e9cfba4d9554f7cd9ab392f0826a31ae6396193")
858858
// @formatter:on
859859
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/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L4716-L4850",
46+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L4710-L4844",
4747
sha1 = "c212d1dbff26d02d4d749e085263d4104895f1ba")
4848
// @formatter:on
4949
public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {

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/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/share/opto/library_call.cpp#L3618-L3746",
67+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/share/opto/library_call.cpp#L3621-L3749",
6868
sha1 = "59f07096cdbe1aac79b1248db345e9616b54f4a4")
6969
// @formatter:on
7070
public class VirtualThreadUpdateJFRSnippets implements Snippets {

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

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

5858
// @formatter:off
59-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2859-L2891",
59+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2862-L2894",
6060
sha1 = "8560756dddc464e0480a51c3072fe8d0f96543d7")
6161
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/macroAssembler_aarch64_aes.cpp#L33-L109",
6262
sha1 = "4916141cba98c26e4d98edb457161f88a8c66ffa")

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

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

6868
// @formatter:off
69-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2826-L2857",
69+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2829-L2860",
7070
sha1 = "4b3253d1846c8f6d34d4177de822be1b9f809b18")
7171
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/macroAssembler_aarch64_aes.cpp#L111-L282",
7272
sha1 = "41ef4f49f68c0e08ff4d698c8cc962e392cc16ec")

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/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7827-L7847",
51+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7830-L7850",
5252
sha1 = "1c7cd8d5f5630955c23eee37f61e7c493cb6b04e")
5353
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L4244-L4280",
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/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7750-L7788",
60+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7753-L7791",
6161
sha1 = "2330d39ce8b81ede5e4433f27ca0f703d6f54d89")
6262
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L3735-L3744",
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/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7790-L7825",
56+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7793-L7828",
5757
sha1 = "f3bb99392495d4cb539f36febfb45a25a43a2f44")
5858
// @formatter:on
5959
public final class AArch64BigIntegerSquareToLenOp extends AArch64LIRInstruction {

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/016694bf74f6920f850330e353df9fd03458cca1/src/hotspot/cpu/aarch64/aarch64.ad#L13589-L13613",
39+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/cpu/aarch64/aarch64.ad#L13709-L13733",
4040
sha1 = "5e7655c00a9d610fa3c992305c0f6aeba32b2d6c")
4141
// @formatter:on
4242
public class AArch64BitSwapOp extends AArch64LIRInstruction {

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

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

6969
// @formatter:off
70-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2998-L3105",
70+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/0ad919c1e54895b000b58f6a1b54d79f76970845/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L3001-L3108",
7171
sha1 = "84ae1ab445b05995baff38925310af705f7183ce")
7272
// @formatter:on
7373
public final class AArch64CipherBlockChainingAESDecryptOp extends AArch64LIRInstruction {

0 commit comments

Comments
 (0)