[GR-66864] [GR-67426] Adapt JDK-8360707: Globally enumerate all blobs, stubs and entries

PullRequest: graal/21426

Author: mur47x111

compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/SyncPortProcessor.java

@@ -209,8 +209,8 @@ private void compareDigest(MessageDigest md, AnnotationMirror annotationMirror,
                                     latestCommit,
                                     path);
                     if (shouldDump) {
-                        dump(proxy, urlOld, lineStart - 1, lineEnd, element + ".old");
-                        dump(proxy, url, lineStart - 1, lineEnd, element + ".new");
+                        dump(proxy, urlOld, lineStart - 1, lineEnd, "old", element.toString());
+                        dump(proxy, url, lineStart - 1, lineEnd, "new", element.toString());
                     }
                 }
             } else {
@@ -225,6 +225,9 @@ private void compareDigest(MessageDigest md, AnnotationMirror annotationMirror,
                                 lineStart,
                                 lineEnd,
                                 sha1Latest);
+                if (dumpUpdateCommands != null) {
+                    dumpUpdateCommands.printf("sed -i s+%s+%s+g $(git grep --files-with-matches %s)%n", sha1, sha1Latest, sha1);
+                }
             }
             env().getMessager().printMessage(kind,
                             String.format("Sha1 digest of %s (ported by %s) does not match https://github.com/%s/jdk/blob%s/%s#L%d-L%d : expected %s but was %s.%s",
@@ -289,11 +292,16 @@ private static int find(Proxy proxy, String oldUrl, String newUrl, int lineStart
         return -1;
     }
 
-    private static void dump(Proxy proxy, String url, int lineStartExclusive, int lineEnd, String fileName) throws IOException, URISyntaxException {
+    private static void dump(Proxy proxy, String url, int lineStartExclusive, int lineEnd, String dirName, String fileName) throws IOException, URISyntaxException {
         URLConnection connection = new URI(url).toURL().openConnection(proxy);
         try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
             String content = in.lines().skip(lineStartExclusive).limit(lineEnd - lineStartExclusive).collect(Collectors.joining("\n"));
-            try (PrintWriter out = new PrintWriter(fileName + ".tmp")) {
+            File directory = new File(dirName);
+            if (!directory.exists()) {
+                directory.mkdir();
+            }
+
+            try (PrintWriter out = new PrintWriter(dirName + "/" + fileName + ".tmp")) {
                 out.print(content);
                 out.print('\n');
             }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Assembler.java

@@ -4082,7 +4082,9 @@ public void msr(SystemRegister systemRegister, Register src) {
      * C6.2.230 Speculation barrier.
      */
     public void sb() {
-        emitInt(SB.encoding | BarrierOp);
+        if (supports(CPUFeature.SB)) {
+            emitInt(SB.encoding | BarrierOp);
+        }
     }
 
     public void annotatePatchingImmediate(int pos, Instruction instruction, int operandSizeBits, int offsetBits, int shift) {

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

@@ -197,9 +197,9 @@
  * appropriately to comply with the layouts above.
  */
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/9eeb86d972ac4cc38d923b2b868b426bbd27a4e8/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L465-L625",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L457-L617",
           sha1 = "2d66e0ccf8dbf69f575be2633d5a17f77a20131d")
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L627-L788",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L619-L780",
           sha1 = "e88d7b8c4bb85358c6a810ee1d7d92fde5db42e6")
 // @formatter:on
 public class MonitorSnippets implements Snippets {

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

@@ -56,8 +56,8 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2859-L2891",
-          sha1 = "194d065676bd588faf8346f04d1ffed30ac88390")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2859-L2891",
+          sha1 = "8560756dddc464e0480a51c3072fe8d0f96543d7")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/macroAssembler_aarch64_aes.cpp#L33-L109",
           sha1 = "4916141cba98c26e4d98edb457161f88a8c66ffa")
 // @formatter:on

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

@@ -66,8 +66,8 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2826-L2857",
-          sha1 = "90bf2f17582a498872c2da19966a9121a43de0f5")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2826-L2857",
+          sha1 = "4b3253d1846c8f6d34d4177de822be1b9f809b18")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/macroAssembler_aarch64_aes.cpp#L111-L282",
           sha1 = "41ef4f49f68c0e08ff4d698c8cc962e392cc16ec")
 // @formatter:on

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

@@ -58,8 +58,8 @@
  */
 @Opcode("ARRAYS_FILL")
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/642816538fbaa5b74c6beb8a14d1738cdde28c10/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2389-L2498",
-          sha1 = "4ff403a9b236cce54bc806efd30d1e06e92ccde0")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2389-L2498",
+          sha1 = "d53d00d3ceaf226b75aa509da38096bccb7c0d6c")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L6350-L6420",
           sha1 = "bf8efe736d39b5dcb6aa69ac4a38b70c6ff17ffe")
 // @formatter:on

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

@@ -48,8 +48,8 @@
 
 // @formatter:off
 
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7827-L7847",
-          sha1 = "4b7c56d39d91df3d900d50ca260ff8ad04815574")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7827-L7847",
+          sha1 = "1c7cd8d5f5630955c23eee37f61e7c493cb6b04e")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L4244-L4280",
           sha1 = "33649be9177daf5f0b4817d807458a5ff8c00365")
 // @formatter:on

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

@@ -57,8 +57,8 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7750-L7788",
-          sha1 = "232bbf6f1aa4cf95182f546679b4fa7f9cfba70c")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7750-L7788",
+          sha1 = "2330d39ce8b81ede5e4433f27ca0f703d6f54d89")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L3735-L3744",
           sha1 = "376de6fbb2caccaac53c4aa934ce96f8f0dc7f18")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L3932-L4242",

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

@@ -53,8 +53,8 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7790-L7825",
-          sha1 = "4ccf6fdbe1a4dce5aedb73eb3afc26c003d81401")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L7790-L7825",
+          sha1 = "f3bb99392495d4cb539f36febfb45a25a43a2f44")
 // @formatter:on
 public final class AArch64BigIntegerSquareToLenOp extends AArch64LIRInstruction {
 

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

@@ -67,8 +67,8 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/15178aa298e43be3e27121343432f25884db4e5d/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2998-L3105",
-          sha1 = "2bfe20f6fc1eaf08fbdbb5e759006f65699cd6e5")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/b1fa1ecc988fb07f191892a459625c2c8f2de3b5/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2998-L3105",
+          sha1 = "84ae1ab445b05995baff38925310af705f7183ce")
 // @formatter:on
 public final class AArch64CipherBlockChainingAESDecryptOp extends AArch64LIRInstruction {