Adopt JDK-8359435 AArch64: add support for SB instruction to MacroAssembler::spin_wait

Author: mur47x111

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

@@ -137,6 +137,7 @@
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.REVW;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.REVX;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.RORV;
+import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SB;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBC;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBCS;
 import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBFM;
@@ -1055,6 +1056,7 @@ public enum Instruction {
         MSR(0xD5100000),
         DC(0xD5087000),
         ISB(0x000000C0),
+        SB(0x000000E0),
 
         PACIA(0b00001 << 16 | 0b000000 << 10),
         AUTIA(0b00001 << 16 | 0b000100 << 10),
@@ -4020,6 +4022,15 @@ public enum BarrierKind {
         }
     }
 
+    /**
+     * C6.2.75 Data Cache operation.
+     */
+    public void dc(DataCacheOperationType type, Register src) {
+        assert verifyRegistersR(src);
+
+        emitInt(DC.encoding | type.encoding() | rt(src));
+    }
+
     /**
      * C6.2.80 Data Memory Barrier.
      *
@@ -4068,12 +4079,10 @@ public void msr(SystemRegister systemRegister, Register src) {
     }
 
     /**
-     * C6.2.75 Data Cache operation.
+     * C6.2.230 Speculation barrier.
      */
-    public void dc(DataCacheOperationType type, Register src) {
-        assert verifyRegistersR(src);
-
-        emitInt(DC.encoding | type.encoding() | rt(src));
+    public void 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/aarch64/AArch64HotSpotLIRGenerator.java

@@ -40,6 +40,7 @@
 
 import jdk.graal.compiler.asm.Label;
 import jdk.graal.compiler.asm.aarch64.AArch64Address;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler;
 import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag;
 import jdk.graal.compiler.asm.aarch64.AArch64Assembler.PrefetchMode;
 import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
@@ -481,6 +482,7 @@ private Consumer<AArch64MacroAssembler> onSpinWaitInst() {
             case "nop" -> AArch64MacroAssembler::nop;
             case "isb" -> AArch64MacroAssembler::isb;
             case "yield" -> AArch64MacroAssembler::pause;
+            case "sb" -> AArch64Assembler::sb;
             default -> throw GraalError.shouldNotReachHere("Unknown OnSpinWaitInst " + config.onSpinWaitInst);
         };
     }

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

@@ -37,8 +37,8 @@
  * Emits spin wait instruction(s).
  */
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/98a93e115137a305aed6b7dbf1d4a7d5906fe77c/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp#L53-L69",
-          sha1 = "92f81ed500658553a2ef2e7c48633094d95ba974")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/ecd2d83096a1fea7d5086736306770bcffa4fdb6/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp#L53-L74",
+          sha1 = "6bd5ba27c0b3a8416ee5d8d495a55d86cfe1fad1")
 // @formatter:on
 @Opcode("SPIN_WAIT")
 public final class AArch64SpinWaitOp extends AArch64LIRInstruction {