fixup! [AArch64][llvm] Add support for Permission Overlays Extension 2 (FEAT_S1POE2)

Properly fix `plbi alle3`

Author: jthackray

llvm/lib/Target/AArch64/AArch64SystemOperands.td

@@ -2849,24 +2849,24 @@ def lookupPLBIByName : SearchIndex {
 }
 
 multiclass PLBI<string name, bits<3> op1, bits<4> crn, bits<3> op2,
-                bit needsreg> {
+                bit needsreg, bit optreg> {
   // Entries containing "IS" or "OS" allow optional regs when +tlbid enabled
   def : PLBIEntry<op1, crn, 0b0111, op2, name,         needsreg, 0>;
-  def : PLBIEntry<op1, crn, 0b0011, op2, name#"IS",    needsreg, 1>;
-  def : PLBIEntry<op1, crn, 0b0001, op2, name#"OS",    needsreg, 1>;
+  def : PLBIEntry<op1, crn, 0b0011, op2, name#"IS",    needsreg, optreg>;
+  def : PLBIEntry<op1, crn, 0b0001, op2, name#"OS",    needsreg, optreg>;
   def : PLBIEntry<op1, crn, 0b1111, op2, name#"NXS",   needsreg, 0>;
-  def : PLBIEntry<op1, crn, 0b1011, op2, name#"ISNXS", needsreg, 1>;
-  def : PLBIEntry<op1, crn, 0b1001, op2, name#"OSNXS", needsreg, 1>;
+  def : PLBIEntry<op1, crn, 0b1011, op2, name#"ISNXS", needsreg, optreg>;
+  def : PLBIEntry<op1, crn, 0b1001, op2, name#"OSNXS", needsreg, optreg>;
 }
 
 // CRm defines above six variants of each instruction. It is omitted here.
-//                     Op1    CRn     Op2    needsreg
-defm : PLBI<"ALLE3",   0b110, 0b1010, 0b000, 1>;
-defm : PLBI<"ALLE2",   0b100, 0b1010, 0b000, 0>;
-defm : PLBI<"ALLE1",   0b100, 0b1010, 0b100, 0>;
-defm : PLBI<"VMALLE1", 0b000, 0b1010, 0b000, 0>;
-defm : PLBI<"ASIDE1",  0b000, 0b1010, 0b010, 1>;
-defm : PLBI<"PERME3",  0b110, 0b1010, 0b001, 1>;
-defm : PLBI<"PERME2",  0b100, 0b1010, 0b001, 1>;
-defm : PLBI<"PERME1",  0b000, 0b1010, 0b001, 1>;
-defm : PLBI<"PERMAE1", 0b000, 0b1010, 0b011, 1>;
+//                     Op1    CRn     Op2    nr optreg
+defm : PLBI<"ALLE3",   0b110, 0b1010, 0b000, 0, 0>;
+defm : PLBI<"ALLE2",   0b100, 0b1010, 0b000, 0, 1>;
+defm : PLBI<"ALLE1",   0b100, 0b1010, 0b100, 0, 1>;
+defm : PLBI<"VMALLE1", 0b000, 0b1010, 0b000, 0, 1>;
+defm : PLBI<"ASIDE1",  0b000, 0b1010, 0b010, 1, 0>;
+defm : PLBI<"PERME3",  0b110, 0b1010, 0b001, 1, 0>;
+defm : PLBI<"PERME2",  0b100, 0b1010, 0b001, 1, 0>;
+defm : PLBI<"PERME1",  0b000, 0b1010, 0b001, 1, 0>;
+defm : PLBI<"PERMAE1", 0b000, 0b1010, 0b011, 1, 0>;

llvm/test/MC/AArch64/arm-poe2.s

@@ -2938,22 +2938,22 @@ tchangeb x1, #9, nB
 // CHECK-ERROR: error: instruction requires: poe2
 
 
-PLBI ALLE3, x3
-// CHECK-INST:    plbi alle3, x3
-// CHECK-ENCODING: [0x03,0xa7,0x0e,0xd5]
-// CHECK-UNKNOWN: d50ea703 sys  #6, c10, c7, #0, x3
+PLBI ALLE3
+// CHECK-INST:    plbi alle3
+// CHECK-ENCODING: [0x1f,0xa7,0x0e,0xd5]
+// CHECK-UNKNOWN: d50ea71f sys  #6, c10, c7, #0
 // CHECK-ERROR: error: PLBI ALLE3 requires: poe2
 
-PLBI ALLE3IS, x3
-// CHECK-INST:    plbi alle3is, x3
-// CHECK-ENCODING: [0x03,0xa3,0x0e,0xd5]
-// CHECK-UNKNOWN: d50ea303 sys  #6, c10, c3, #0, x3
+PLBI ALLE3IS
+// CHECK-INST:    plbi alle3is
+// CHECK-ENCODING: [0x1f,0xa3,0x0e,0xd5]
+// CHECK-UNKNOWN: d50ea31f sys  #6, c10, c3, #0
 // CHECK-ERROR: error: PLBI ALLE3IS requires: poe2
 
-PLBI ALLE3OS, x3
-// CHECK-INST:    plbi alle3os, x3
-// CHECK-ENCODING: [0x03,0xa1,0x0e,0xd5]
-// CHECK-UNKNOWN: d50ea103 sys  #6, c10, c1, #0, x3
+PLBI ALLE3OS
+// CHECK-INST:    plbi alle3os
+// CHECK-ENCODING: [0x1f,0xa1,0x0e,0xd5]
+// CHECK-UNKNOWN: d50ea11f sys  #6, c10, c1, #0
 // CHECK-ERROR: error: PLBI ALLE3OS requires: poe2
 
 PLBI ALLE2
@@ -3082,22 +3082,22 @@ PLBI PERME1OS, X3
 // CHECK-UNKNOWN: d508a123 sys  #0, c10, c1, #1, x3
 // CHECK-ERROR: error: PLBI PERME1OS requires: poe2
 
-PLBI ALLE3NXS, X3
-// CHECK-INST:    plbi alle3nxs, x3
-// CHECK-ENCODING: [0x03,0xaf,0x0e,0xd5]
-// CHECK-UNKNOWN: d50eaf03 sys  #6, c10, c15, #0, x3
+PLBI ALLE3NXS
+// CHECK-INST:    plbi alle3nxs
+// CHECK-ENCODING: [0x1f,0xaf,0x0e,0xd5]
+// CHECK-UNKNOWN: d50eaf1f sys  #6, c10, c15, #0
 // CHECK-ERROR: error: PLBI ALLE3NXS requires: poe2
 
-PLBI ALLE3ISNXS, X3
-// CHECK-INST:    plbi alle3isnxs, x3
-// CHECK-ENCODING: [0x03,0xab,0x0e,0xd5]
-// CHECK-UNKNOWN: d50eab03 sys  #6, c10, c11, #0, x3
+PLBI ALLE3ISNXS
+// CHECK-INST:    plbi alle3isnxs
+// CHECK-ENCODING: [0x1f,0xab,0x0e,0xd5]
+// CHECK-UNKNOWN: d50eab1f sys  #6, c10, c11, #0
 // CHECK-ERROR: error: PLBI ALLE3ISNXS requires: poe2
 
-PLBI ALLE3OSNXS, X3
-// CHECK-INST:    plbi alle3osnxs, x3
-// CHECK-ENCODING: [0x03,0xa9,0x0e,0xd5]
-// CHECK-UNKNOWN: d50ea903 sys  #6, c10, c9, #0, x3
+PLBI ALLE3OSNXS
+// CHECK-INST:    plbi alle3osnxs
+// CHECK-ENCODING: [0x1f,0xa9,0x0e,0xd5]
+// CHECK-UNKNOWN: d50ea91f sys  #6, c10, c9, #0
 // CHECK-ERROR: error: PLBI ALLE3OSNXS requires: poe2
 
 PLBI ALLE2NXS