[GR-50816] Sync HotSpot intrinsic ports.

PullRequest: graal/16350

Author: djoooooe

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

@@ -31,6 +31,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -70,6 +71,10 @@ public class SyncPortProcessor extends AbstractProcessor {
     // Allows comparing against local files. E.g.,
     // HOTSPOT_PORT_SYNC_CHECK=true HOTSPOT_PORT_SYNC_OVERWRITE="file:///PATH/TO/JDK" mx build
     static final String SYNC_OVERWRITE_ENV_VAR = "HOTSPOT_PORT_SYNC_OVERWRITE";
+    // Allows generating a file of bash commands to update changed line numbers. E.g.:
+    // HOTSPOT_PORT_SYNC_CHECK=true HOTSPOT_PORT_SYNC_SHIFT_UPDATE_CMD_FILE="update.sh" mx build &&
+    // bash update.sh
+    static final String SYNC_SHIFT_UPDATE_COMMAND_DUMP_FILE_ENV_VAR = "HOTSPOT_PORT_SYNC_SHIFT_UPDATE_CMD_FILE";
 
     static final String JDK_LATEST = "https://raw.githubusercontent.com/openjdk/jdk/master/";
     static final String JDK_LATEST_HUMAN = "https://github.com/openjdk/jdk/blob/master/";
@@ -104,7 +109,14 @@ private void compareDigest(MessageDigest md, AnnotationMirror annotationMirror,
         int lineStart = Integer.parseInt(matcher.group("lineStart"));
         int lineEnd = Integer.parseInt(matcher.group("lineEnd"));
 
-        try {
+        String dumpUpdateCommandsEnvVar = System.getenv(SYNC_SHIFT_UPDATE_COMMAND_DUMP_FILE_ENV_VAR);
+        PrintWriter dumpUpdateCommands;
+        if (dumpUpdateCommandsEnvVar != null) {
+            dumpUpdateCommands = new PrintWriter(new FileOutputStream(dumpUpdateCommandsEnvVar, true));
+        } else {
+            dumpUpdateCommands = null;
+        }
+        try (dumpUpdateCommands) {
             String overwriteURL = System.getenv(SYNC_OVERWRITE_ENV_VAR);
             boolean isURLOverwritten = overwriteURL != null && !"".equals(overwriteURL);
 
@@ -120,23 +132,27 @@ private void compareDigest(MessageDigest md, AnnotationMirror annotationMirror,
             if (!isURLOverwritten) {
                 String urlOld = String.format("https://raw.githubusercontent.com/openjdk/jdk/%s/%s", commit, path);
                 String sha1Old = digest(proxy, md, urlOld, lineStart - 1, lineEnd);
-
                 if (sha1.equals(sha1Old)) {
                     String latestCommit = getLatestCommit(proxy);
                     int idx = find(proxy, urlOld, url, lineStart - 1, lineEnd, SEARCH_RANGE);
                     if (idx != -1) {
                         int idxInclusive = idx + 1;
                         kind = NOTE;
+                        String urlFormat = "https://github.com/openjdk/jdk/blob/%s/%s#L%d-L%d";
+                        String newUrl = String.format(urlFormat, latestCommit, path, idxInclusive, idxInclusive + (lineEnd - lineStart));
                         extraMessage = String.format("""
                                          The original code snippet is shifted. Update with:
-                                        @SyncPort(from = "https://github.com/openjdk/jdk/blob/%s/%s#L%d-L%d",
+                                        @SyncPort(from = "%s",
                                                   sha1 = "%s")
                                         """,
-                                        latestCommit,
-                                        path,
-                                        idxInclusive,
-                                        idxInclusive + (lineEnd - lineStart),
+                                        newUrl,
                                         sha1);
+                        if (dumpUpdateCommands != null) {
+                            String oldUrl = String.format(urlFormat, commit, path, lineStart, lineEnd);
+                            assert !oldUrl.contains("+");
+                            assert !newUrl.contains("+");
+                            dumpUpdateCommands.printf("sed -i s+%s+%s+g $(git grep --files-with-matches %s)%n", oldUrl, newUrl, sha1);
+                        }
                     } else {
                         extraMessage = String.format("""
                                          See also:

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompressInflateTest.java

@@ -27,20 +27,22 @@
 import static org.junit.Assume.assumeTrue;
 
 import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
 
 import jdk.graal.compiler.core.common.CompilationIdentifier;
-import jdk.graal.compiler.replacements.amd64.AMD64GraphBuilderPlugins;
 import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest;
 import jdk.graal.compiler.nodes.Invoke;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
 import jdk.graal.compiler.replacements.StringLatin1InflateNode;
 import jdk.graal.compiler.replacements.StringUTF16CompressNode;
+import jdk.graal.compiler.replacements.amd64.AMD64GraphBuilderPlugins;
 import jdk.graal.compiler.test.AddExports;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.code.InvalidInstalledCodeException;
 import jdk.vm.ci.meta.JavaConstant;
@@ -296,6 +298,27 @@ public void testStringUTF16CompressCharByte() throws ClassNotFoundException {
                 }
             }
         }
+
+        // Exhaustively check compress returning the correct index of the non-latin1 char.
+        final int size = 48;
+        final byte fillByte = 'R';
+        char[] chars = new char[size];
+        final byte[] bytes = new byte[chars.length];
+        Arrays.fill(bytes, fillByte);
+        for (int i = 0; i < size; i++) { // Every starting index
+            for (int j = i; j < size; j++) {  // Every location of non-latin1
+                Arrays.fill(chars, 'A');
+                chars[j] = 0xFF21;
+                byte[] dst = Arrays.copyOf(bytes, bytes.length);
+                byte[] dst2 = Arrays.copyOf(bytes, bytes.length);
+                int result = (int) invokeSafe(caller, null, chars, i, dst, 0, chars.length - i);
+                int result2 = (int) executeVarargsSafe(code, chars, i, dst2, 0, chars.length - i);
+                Assert.assertEquals(result, result2);
+                Assert.assertArrayEquals(dst, dst2);
+                Assert.assertEquals("compress found wrong index", j - i, result);
+                Assert.assertEquals("extra character stored", fillByte, bytes[j]);
+            }
+        }
     }
 
     public static void getCharsSnippet(String s, int srcBegin, int srcEnd, char[] dst, int dstBegin) {

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

@@ -671,7 +671,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
     }
 
     // @formatter:off
-    @SyncPort(from = "https://github.com/openjdk/jdk/blob/0d4de8a71f063e44618f43ddd862a91aed647f48/src/hotspot/share/opto/library_call.cpp#L2868-L2923",
+    @SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/share/opto/library_call.cpp#L2873-L2928",
               sha1 = "5c117a305e90a48f0a6fe86ace2c15942393c0ab")
     // @formatter:on
     private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config, GraphBuilderContext b, ResolvedJavaMethod targetMethod, ForeignCallDescriptor descriptor,

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

@@ -42,7 +42,7 @@
 import org.graalvm.word.WordFactory;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/d4c904d81970bbe5b0afe1029eae705366779839/src/hotspot/share/opto/library_call.cpp#L4480-L4604",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/share/opto/library_call.cpp#L4485-L4609",
           sha1 = "34281fb78c4f0657a704dbda3e3cc85ed56dd2ad")
 // @formatter:on
 public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {

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

@@ -329,7 +329,7 @@ private static boolean tryStackLocking(Object object, Word lock, Word mark, Word
     }
 
     // @formatter:off
-    @SyncPort(from = "https://github.com/openjdk/jdk/blob/0d4de8a71f063e44618f43ddd862a91aed647f48/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L9792-L9826",
+    @SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L9963-L9997",
               sha1 = "7a02d52b6b621959389e574984ca20b52100fe5e")
     // @formatter:on
     private static boolean tryLightweightLocking(Object object, Word lock, Word mark, Word thread, boolean trace, Counters counters, Register stackPointerRegister) {
@@ -431,7 +431,7 @@ private static boolean tryStackUnlocking(Object object, Word displacedMark, Word
     }
 
     // @formatter:off
-    @SyncPort(from = "https://github.com/openjdk/jdk/blob/0d4de8a71f063e44618f43ddd862a91aed647f48/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L9828-L9857",
+    @SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L9999-L10028",
               sha1 = "666343ea6d941f68ed863a396d9496cb3ce1b69b")
     // @formatter:on
     private static boolean tryLightweightUnlocking(Object object, Word thread, boolean trace, Counters counters) {

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

@@ -64,7 +64,7 @@
  * Snippet for updating JFR thread local data on {@code Thread#setCurrentThread} events.
  */
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/0a3a925ad88921d387aa851157f54ac0054d347b/src/hotspot/share/opto/library_call.cpp#L3453-L3579",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/share/opto/library_call.cpp#L3458-L3584",
           sha1 = "1f980401f5d7d9a363577635fd57fc1e24505d91")
 // @formatter:on
 public class VirtualThreadUpdateJFRSnippets implements Snippets {

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

@@ -56,7 +56,7 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/0a3a925ad88921d387aa851157f54ac0054d347b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2703-L2734",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2719-L2750",
           sha1 = "69b7e01dbc601afd660d5dcef88917a43613e00c")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/12358e6c94bc96e618efc3ec5299a2cfe1b4669d/src/hotspot/cpu/aarch64/macroAssembler_aarch64_aes.cpp#L34-L110",
           sha1 = "4916141cba98c26e4d98edb457161f88a8c66ffa")

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

@@ -66,7 +66,7 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/0a3a925ad88921d387aa851157f54ac0054d347b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2671-L2701",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L2687-L2717",
           sha1 = "e1333c6ab2d693fa9231a7365c568d81db63fae7")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/12358e6c94bc96e618efc3ec5299a2cfe1b4669d/src/hotspot/cpu/aarch64/macroAssembler_aarch64_aes.cpp#L112-L283",
           sha1 = "41ef4f49f68c0e08ff4d698c8cc962e392cc16ec")

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

@@ -291,11 +291,9 @@ private static void loadAndExtend(AArch64MacroAssembler asm, Stride strideDst, S
     private static void calcReturnValue(AArch64MacroAssembler asm, Register ret, Register vecArrayA, Register vecArrayB, Register vecTmp, Register vecIndex, Register vecMask, Stride strideMax) {
         // set all equal bytes to 0xff, others to 0x00
         asm.neon.cmeqVVV(FullReg, fromStride(strideMax), vecTmp, vecArrayA, vecArrayB);
-        // BIC with the ascending index mask, this will replace all non-equal bytes with their
-        // corresponding byte index
-        asm.neon.bicVVV(FullReg, vecIndex, vecMask, vecTmp);
-        // OR with the result of CMEQ, replacing all equal bytes with 0xff again
-        asm.neon.orrVVV(FullReg, vecIndex, vecIndex, vecTmp);
+        // OR with the ascending index mask, this will replace all non-equal bytes with their
+        // corresponding byte index, and all equal bytes with 0xff
+        asm.neon.orrVVV(FullReg, vecIndex, vecMask, vecTmp);
         // Get the unsigned minimum. This will yield the index of the first non-equal bytes, since
         // all equal ones are filled with 0xff
         asm.neon.uminvSV(FullReg, fromStride(strideMax), vecIndex, vecIndex);

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

@@ -48,7 +48,7 @@
 
 // @formatter:off
 
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/0a3a925ad88921d387aa851157f54ac0054d347b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L4702-L4721",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/ce8399fd6071766114f5f201b6e44a7abdba9f5a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp#L4718-L4737",
           sha1 = "57f40186d75104a5e607d6fc047bbd50ef246590")
 @SyncPort(from = "https://github.com/openjdk/jdk/blob/0a3a925ad88921d387aa851157f54ac0054d347b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp#L3622-L3658",
           sha1 = "33649be9177daf5f0b4817d807458a5ff8c00365")