diff --git a/llvm/test/MC/AArch64/armv8.3a-signed-pointer.s b/llvm/test/MC/AArch64/armv8.3a-signed-pointer.s
index e13b1bf3c98d8..e95c9309a3d4d 100644
--- a/llvm/test/MC/AArch64/armv8.3a-signed-pointer.s
+++ b/llvm/test/MC/AArch64/armv8.3a-signed-pointer.s
@@ -96,84 +96,84 @@
 
 // ALL-EMPTY:
 // ALL-EMPTY:
-  hint #25
-  paciasp
-// CHECK-NEXT: paciasp        // encoding: [0x3f,0x23,0x03,0xd5]
-// CHECK-NEXT: paciasp        // encoding: [0x3f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #25        // encoding: [0x3f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #25        // encoding: [0x3f,0x23,0x03,0xd5]
-  hint #29
-  autiasp
-// CHECK-NEXT: autiasp        // encoding: [0xbf,0x23,0x03,0xd5]
-// CHECK-NEXT: autiasp        // encoding: [0xbf,0x23,0x03,0xd5]
-// NO83-NEXT: hint #29        // encoding: [0xbf,0x23,0x03,0xd5]
-// NO83-NEXT: hint #29        // encoding: [0xbf,0x23,0x03,0xd5]
-  hint #24
-  paciaz
-// CHECK-NEXT: paciaz         // encoding: [0x1f,0x23,0x03,0xd5]
-// CHECK-NEXT: paciaz         // encoding: [0x1f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #24        // encoding: [0x1f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #24        // encoding: [0x1f,0x23,0x03,0xd5]
-  hint #28
-  autiaz
-// CHECK-NEXT: autiaz         // encoding: [0x9f,0x23,0x03,0xd5]
-// CHECK-NEXT: autiaz         // encoding: [0x9f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #28        // encoding: [0x9f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #28        // encoding: [0x9f,0x23,0x03,0xd5]
+  hint #7
+  xpaclri
+// CHECK-NEXT: xpaclri        // encoding: [0xff,0x20,0x03,0xd5]
+// CHECK-NEXT: xpaclri        // encoding: [0xff,0x20,0x03,0xd5]
+// NO83-NEXT: hint #7         // encoding: [0xff,0x20,0x03,0xd5]
+// NO83-NEXT: hint #7         // encoding: [0xff,0x20,0x03,0xd5]
   hint #8
   pacia1716
 // CHECK-NEXT: pacia1716      // encoding: [0x1f,0x21,0x03,0xd5]
 // CHECK-NEXT: pacia1716      // encoding: [0x1f,0x21,0x03,0xd5]
 // NO83-NEXT: hint #8         // encoding: [0x1f,0x21,0x03,0xd5]
 // NO83-NEXT: hint #8         // encoding: [0x1f,0x21,0x03,0xd5]
+  hint #10
+  pacib1716
+// CHECK-NEXT: pacib1716      // encoding: [0x5f,0x21,0x03,0xd5]
+// CHECK-NEXT: pacib1716      // encoding: [0x5f,0x21,0x03,0xd5]
+// NO83-NEXT: hint #10        // encoding: [0x5f,0x21,0x03,0xd5]
+// NO83-NEXT: hint #10        // encoding: [0x5f,0x21,0x03,0xd5]
   hint #12
   autia1716
 // CHECK-NEXT: autia1716      // encoding: [0x9f,0x21,0x03,0xd5]
 // CHECK-NEXT: autia1716      // encoding: [0x9f,0x21,0x03,0xd5]
 // NO83-NEXT: hint #12        // encoding: [0x9f,0x21,0x03,0xd5]
 // NO83-NEXT: hint #12        // encoding: [0x9f,0x21,0x03,0xd5]
-  hint #27
-  pacibsp
-// CHECK-NEXT: pacibsp        // encoding: [0x7f,0x23,0x03,0xd5]
-// CHECK-NEXT: pacibsp        // encoding: [0x7f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #27        // encoding: [0x7f,0x23,0x03,0xd5]
-// NO83-NEXT: hint #27        // encoding: [0x7f,0x23,0x03,0xd5]
-  hint #31
-  autibsp
-// CHECK-NEXT: autibsp        // encoding: [0xff,0x23,0x03,0xd5]
-// CHECK-NEXT: autibsp        // encoding: [0xff,0x23,0x03,0xd5]
-// NO83-NEXT: hint #31        // encoding: [0xff,0x23,0x03,0xd5]
-// NO83-NEXT: hint #31        // encoding: [0xff,0x23,0x03,0xd5]
+  hint #14
+  autib1716
+// CHECK-NEXT: autib1716      // encoding: [0xdf,0x21,0x03,0xd5]
+// CHECK-NEXT: autib1716      // encoding: [0xdf,0x21,0x03,0xd5]
+// NO83-NEXT: hint #14        // encoding: [0xdf,0x21,0x03,0xd5]
+// NO83-NEXT: hint #14        // encoding: [0xdf,0x21,0x03,0xd5]
+  hint #24
+  paciaz
+// CHECK-NEXT: paciaz         // encoding: [0x1f,0x23,0x03,0xd5]
+// CHECK-NEXT: paciaz         // encoding: [0x1f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #24        // encoding: [0x1f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #24        // encoding: [0x1f,0x23,0x03,0xd5]
+  hint #25
+  paciasp
+// CHECK-NEXT: paciasp        // encoding: [0x3f,0x23,0x03,0xd5]
+// CHECK-NEXT: paciasp        // encoding: [0x3f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #25        // encoding: [0x3f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #25        // encoding: [0x3f,0x23,0x03,0xd5]
   hint #26
   pacibz
 // CHECK-NEXT: pacibz         // encoding: [0x5f,0x23,0x03,0xd5]
 // CHECK-NEXT: pacibz         // encoding: [0x5f,0x23,0x03,0xd5]
 // NO83-NEXT: hint #26        // encoding: [0x5f,0x23,0x03,0xd5]
 // NO83-NEXT: hint #26        // encoding: [0x5f,0x23,0x03,0xd5]
+  hint #27
+  pacibsp
+// CHECK-NEXT: pacibsp        // encoding: [0x7f,0x23,0x03,0xd5]
+// CHECK-NEXT: pacibsp        // encoding: [0x7f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #27        // encoding: [0x7f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #27        // encoding: [0x7f,0x23,0x03,0xd5]
+  hint #28
+  autiaz
+// CHECK-NEXT: autiaz         // encoding: [0x9f,0x23,0x03,0xd5]
+// CHECK-NEXT: autiaz         // encoding: [0x9f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #28        // encoding: [0x9f,0x23,0x03,0xd5]
+// NO83-NEXT: hint #28        // encoding: [0x9f,0x23,0x03,0xd5]
+  hint #29
+  autiasp
+// CHECK-NEXT: autiasp        // encoding: [0xbf,0x23,0x03,0xd5]
+// CHECK-NEXT: autiasp        // encoding: [0xbf,0x23,0x03,0xd5]
+// NO83-NEXT: hint #29        // encoding: [0xbf,0x23,0x03,0xd5]
+// NO83-NEXT: hint #29        // encoding: [0xbf,0x23,0x03,0xd5]
   hint #30
   autibz
 // CHECK-NEXT: autibz         // encoding: [0xdf,0x23,0x03,0xd5]
 // CHECK-NEXT: autibz         // encoding: [0xdf,0x23,0x03,0xd5]
 // NO83-NEXT: hint #30        // encoding: [0xdf,0x23,0x03,0xd5]
 // NO83-NEXT: hint #30        // encoding: [0xdf,0x23,0x03,0xd5]
-  hint #10
-  pacib1716
-// CHECK-NEXT: pacib1716      // encoding: [0x5f,0x21,0x03,0xd5]
-// CHECK-NEXT: pacib1716      // encoding: [0x5f,0x21,0x03,0xd5]
-// NO83-NEXT: hint #10        // encoding: [0x5f,0x21,0x03,0xd5]
-// NO83-NEXT: hint #10        // encoding: [0x5f,0x21,0x03,0xd5]
-  hint #14
-  autib1716
-// CHECK-NEXT: autib1716      // encoding: [0xdf,0x21,0x03,0xd5]
-// CHECK-NEXT: autib1716      // encoding: [0xdf,0x21,0x03,0xd5]
-// NO83-NEXT: hint #14        // encoding: [0xdf,0x21,0x03,0xd5]
-// NO83-NEXT: hint #14        // encoding: [0xdf,0x21,0x03,0xd5]
-  hint #7
-  xpaclri
-// CHECK-NEXT: xpaclri        // encoding: [0xff,0x20,0x03,0xd5]
-// CHECK-NEXT: xpaclri        // encoding: [0xff,0x20,0x03,0xd5]
-// NO83-NEXT: hint #7         // encoding: [0xff,0x20,0x03,0xd5]
-// NO83-NEXT: hint #7         // encoding: [0xff,0x20,0x03,0xd5]
+  hint #31
+  autibsp
+// CHECK-NEXT: autibsp        // encoding: [0xff,0x23,0x03,0xd5]
+// CHECK-NEXT: autibsp        // encoding: [0xff,0x23,0x03,0xd5]
+// NO83-NEXT: hint #31        // encoding: [0xff,0x23,0x03,0xd5]
+// NO83-NEXT: hint #31        // encoding: [0xff,0x23,0x03,0xd5]
 
 // ALL-EMPTY:
   pacia x0, x1