Skip to content

Commit c6f913d

Browse files
mur47x111mur47x111
committed
[GR-64150] Update stubport info.
PullRequest: graal/20525
2 parents e9b3019 + b29c6e9 commit c6f913d

21 files changed

+71
-65
lines changed

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

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ public ForeignCallsProvider getForeignCalls() {
101101
/**
102102
* Convert a normal oop into a colored pointer in a single register.
103103
*/
104-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4acafb809c66589fbbfee9c9a4ba7820f848f0e4/src/hotspot/cpu/x86/gc/z/z_x86_64.ad#L37-L42", sha1 = "344c51c07478c916bdaabb0c697a053e7a2f64dd")
104+
// @formatter:off
105+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4acafb809c66589fbbfee9c9a4ba7820f848f0e4/src/hotspot/cpu/x86/gc/z/z_x86_64.ad#L37-L42",
106+
sha1 = "344c51c07478c916bdaabb0c697a053e7a2f64dd")
107+
// @formatter:on
105108
public static void zColor(CompilationResultBuilder crb, AMD64MacroAssembler masm, Register ref) {
106109
crb.recordMark(HotSpotMarkId.Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_SHL);
107110
masm.shlq(ref, UNPATCHED);
@@ -121,7 +124,10 @@ public static void zColor(CompilationResultBuilder crb, AMD64MacroAssembler masm
121124
/**
122125
* Convert a colored pointer into normal oop.
123126
*/
124-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4acafb809c66589fbbfee9c9a4ba7820f848f0e4/src/hotspot/cpu/x86/gc/z/z_x86_64.ad#L44-L47", sha1 = "5024a425db7a0d1504713ad9029a68da6089967f")
127+
// @formatter:off
128+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/4acafb809c66589fbbfee9c9a4ba7820f848f0e4/src/hotspot/cpu/x86/gc/z/z_x86_64.ad#L44-L47",
129+
sha1 = "5024a425db7a0d1504713ad9029a68da6089967f")
130+
// @formatter:on
125131
public static void zUncolor(CompilationResultBuilder crb, AMD64MacroAssembler masm, Register ref) {
126132
crb.recordMark(HotSpotMarkId.Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_SHL);
127133
masm.shrq(ref, UNPATCHED);
@@ -131,8 +137,12 @@ public static void zUncolor(CompilationResultBuilder crb, AMD64MacroAssembler ma
131137
* Emit the full store barrier with a fast path, and an out of line medium path with a final
132138
* slow path call to the runtime.
133139
*/
134-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L303-L320", sha1 = "9a628c1771df79ae8b4cee89d2863fbd4a4964bc")
135-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L373-L417", sha1 = "7688e7aeab5f1aa413690066355a17c18a4273fa")
140+
// @formatter:off
141+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7e69b98e0548803b85b04b518929c073f8ffaf8c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L302-L319",
142+
sha1 = "9a628c1771df79ae8b4cee89d2863fbd4a4964bc")
143+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7e69b98e0548803b85b04b518929c073f8ffaf8c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L372-L416",
144+
sha1 = "7688e7aeab5f1aa413690066355a17c18a4273fa")
145+
// @formatter:on
136146
public static void emitPreWriteBarrier(CompilationResultBuilder crb,
137147
AMD64MacroAssembler masm,
138148
LIRInstruction op,
@@ -208,7 +218,10 @@ public static void emitPreWriteBarrier(CompilationResultBuilder crb,
208218
/**
209219
* Try to perform any local store barrier fixups or dispatch to the slow path.
210220
*/
211-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L453-L508", sha1 = "4b729acf92e6a297229b7f1e957601708c315f4f")
221+
// @formatter:off
222+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7e69b98e0548803b85b04b518929c073f8ffaf8c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L452-L507",
223+
sha1 = "4b729acf92e6a297229b7f1e957601708c315f4f")
224+
// @formatter:on
212225
static void storeBarrierMedium(CompilationResultBuilder crb,
213226
AMD64MacroAssembler masm,
214227
AMD64Address address,
@@ -273,7 +286,10 @@ static void storeBarrierMedium(CompilationResultBuilder crb,
273286
/**
274287
* Add a value to the store buffer.
275288
*/
276-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L419-L451", sha1 = "638b10c65bb14fa4b254efa4d5bbb1751fdbb6bf")
289+
// @formatter:off
290+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7e69b98e0548803b85b04b518929c073f8ffaf8c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L418-L450",
291+
sha1 = "638b10c65bb14fa4b254efa4d5bbb1751fdbb6bf")
292+
// @formatter:on
277293
static void storeBarrierBufferAdd(AMD64MacroAssembler masm,
278294
AMD64Address address,
279295
Register tmp1,
@@ -311,7 +327,10 @@ static void storeBarrierBufferAdd(AMD64MacroAssembler masm,
311327
* done with a special stack-only calling convention that saves and restores all registers
312328
* around the call. This simplifies the code generation as no extra registers are required.
313329
*/
314-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L218-L301", sha1 = "16f5bff0a0f68ae40be8dd980b7728d7ee60cd2c")
330+
// @formatter:off
331+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/73c8c755ea638c09147d28080646ee8887ee8283/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L218-L300",
332+
sha1 = "b115de722f09759f23e6778fda61d7701fc1cee7")
333+
// @formatter:on
315334
public static void emitLoadBarrier(CompilationResultBuilder crb,
316335
AMD64MacroAssembler masm,
317336
Register resultReg,

‎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
@@ -788,7 +788,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
788788
}
789789

790790
// @formatter:off
791-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/share/opto/library_call.cpp#L2965-L3019",
791+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/share/opto/library_call.cpp#L2959-L3013",
792792
sha1 = "353e0d45b0f63ac58af86dcab5b19777950da7e2")
793793
// @formatter:on
794794
private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config, GraphBuilderContext b, ResolvedJavaMethod targetMethod, ForeignCallDescriptor descriptor,
@@ -837,7 +837,7 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config
837837
}
838838

839839
// @formatter:off
840-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/share/opto/library_call.cpp#L3784-L3868",
840+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/share/opto/library_call.cpp#L3778-L3862",
841841
sha1 = "3e9cfba4d9554f7cd9ab392f0826a31ae6396193")
842842
// @formatter:on
843843
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/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/share/opto/library_call.cpp#L4673-L4807",
48+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/c447a10225576bc59e1ba9477417367d2ac28511/src/hotspot/share/opto/library_call.cpp#L4662-L4796",
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@
211211
* appropriately to comply with the layouts above.
212212
*/
213213
// @formatter:off
214-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L172-L493",
215-
sha1 = "eeccf08eec0f427f9056a88620ff3f53ab8c189c")
214+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L157-L463",
215+
sha1 = "223a88b7bdd10862cd3b112181e1d17682b0fbe2")
216216
// @formatter:on
217217
public class MonitorSnippets implements Snippets {
218218

@@ -445,8 +445,8 @@ private static boolean tryStackLocking(Object object, Word lock, Word mark, Word
445445
}
446446

447447
// @formatter:off
448-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L495-L661",
449-
sha1 = "1c396a67926e92a2cbc64c27fe667142e9ec157d")
448+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L465-L625",
449+
sha1 = "1fb0a66183a752797b07a39526a981f2a89f5044")
450450
// @formatter:on
451451
@SuppressWarnings("unused")
452452
private static boolean tryLightweightLocking(Object object, Word lock, Word mark, Word thread, boolean trace, Counters counters, Register stackPointerRegister) {
@@ -573,8 +573,8 @@ private static boolean tryStackUnlocking(Object object, Word thread, Word lock,
573573
}
574574

575575
// @formatter:off
576-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L663-L830",
577-
sha1 = "ad63b9816f3e1851c7defe445488b49dd49e69d6")
576+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L627-L788",
577+
sha1 = "e88d7b8c4bb85358c6a810ee1d7d92fde5db42e6")
578578
// @formatter:on
579579
private static boolean tryLightweightUnlocking(Object object, Word thread, Word lock, boolean trace, Counters counters) {
580580
// 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/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L4997-L5215",
94+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L5017-L5235",
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/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/share/opto/library_call.cpp#L3570-L3698",
67+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/share/opto/library_call.cpp#L3564-L3692",
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/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L5217-L5323",
65+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L5237-L5343",
6666
sha1 = "573099757de85d90c3cf8cee8ff332e195fe68c7")
6767
// @formatter:on
6868
@Snippet

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static void loadKey(AMD64MacroAssembler masm, Register xmmDst, Register key, int
108108
}
109109

110110
static Register asXMMRegister(int index) {
111-
return AMD64.xmmRegistersSSE[index];
111+
return AMD64.xmmRegistersAVX512[index];
112112
}
113113

114114
@Override

‎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/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L3378-L3431",
6161
sha1 = "fab3e655909df456c2fc5a065f98aa62aac0bc08")
62-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7819-L7853",
62+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7e69b98e0548803b85b04b518929c073f8ffaf8c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7837-L7871",
6363
sha1 = "e68b8c7bdb37d4bd1350c7e1219fdcb419d2618a")
64-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L8071-L8248",
64+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7e69b98e0548803b85b04b518929c073f8ffaf8c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L8089-L8266",
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
@@ -58,7 +58,7 @@
5858
// @formatter:off
5959
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L3143-L3199",
6060
sha1 = "bb78557c95005fea278c78ad114bfdc8e256151a")
61-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7075-L7532",
61+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/7e69b98e0548803b85b04b518929c073f8ffaf8c/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7093-L7550",
6262
sha1 = "0763af542cf9f40a1c542e4834a67fc4b2c74e1c")
6363
// @formatter:on
6464
public final class AMD64BigIntegerMultiplyToLenOp extends AMD64LIRInstruction {

0 commit comments

Comments
 (0)