From: Cullen Rhodes <cullen.rhodes@arm.com>
Date: Fri, 7 Jun 2019 08:37:00 +0000 (+0000)
Subject: [AArch64][AsmParser] Provide better diagnostics for SVE predicates
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e3aacc16132da6bcbabe9e28657fb8bb0fe60f2;p=llvm

[AArch64][AsmParser] Provide better diagnostics for SVE predicates

Patch by Sander de Smalen (sdesmalen)

Reviewed By: SjoerdMeijer

Differential Revision: https://reviews.llvm.org/D62941


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@362779 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 891331bb7d9..a51eb24cbb5 100644
--- a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -4470,11 +4470,15 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
   case Match_InvalidSVEPredicateDReg:
     return Error(Loc, "invalid predicate register.");
   case Match_InvalidSVEPredicate3bAnyReg:
+    return Error(Loc, "invalid restricted predicate register, expected p0..p7 (without element suffix)");
   case Match_InvalidSVEPredicate3bBReg:
+    return Error(Loc, "invalid restricted predicate register, expected p0.b..p7.b");
   case Match_InvalidSVEPredicate3bHReg:
+    return Error(Loc, "invalid restricted predicate register, expected p0.h..p7.h");
   case Match_InvalidSVEPredicate3bSReg:
+    return Error(Loc, "invalid restricted predicate register, expected p0.s..p7.s");
   case Match_InvalidSVEPredicate3bDReg:
-    return Error(Loc, "restricted predicate has range [0, 7].");
+    return Error(Loc, "invalid restricted predicate register, expected p0.d..p7.d");
   case Match_InvalidSVEExactFPImmOperandHalfOne:
     return Error(Loc, "Invalid floating point constant, expected 0.5 or 1.0.");
   case Match_InvalidSVEExactFPImmOperandHalfTwo:
diff --git a/test/MC/AArch64/SVE/abs-diagnostics.s b/test/MC/AArch64/SVE/abs-diagnostics.s
index d3f99e61c92..5060d8bcdba 100644
--- a/test/MC/AArch64/SVE/abs-diagnostics.s
+++ b/test/MC/AArch64/SVE/abs-diagnostics.s
@@ -13,24 +13,24 @@ abs z29.d, p7, z29.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 abs z0.b, p8/m, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: abs z0.b, p8/m, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 abs z0.h, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: abs z0.h, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 abs z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: abs z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 abs z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: abs z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/add-diagnostics.s b/test/MC/AArch64/SVE/add-diagnostics.s
index 6d95a645f06..c5b313538d5 100644
--- a/test/MC/AArch64/SVE/add-diagnostics.s
+++ b/test/MC/AArch64/SVE/add-diagnostics.s
@@ -31,25 +31,25 @@ add z29.d, p7, z29.d, z8.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 add z22.b, p8/m, z22.b, z11.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: add z22.b, p8/m, z22.b, z11.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 add z22.h, p8/m, z22.h, z6.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: add z22.h, p8/m, z22.h, z6.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 add z30.s, p8/m, z30.s, z13.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: add z30.s, p8/m, z30.s, z13.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 add z29.d, p8/m, z29.d, z8.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: add z29.d, p8/m, z29.d, z8.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/and-diagnostics.s b/test/MC/AArch64/SVE/and-diagnostics.s
index ff7332e60e7..fad064495ea 100644
--- a/test/MC/AArch64/SVE/and-diagnostics.s
+++ b/test/MC/AArch64/SVE/and-diagnostics.s
@@ -62,7 +62,7 @@ and z21.d, z5.d, z26.b
 // Predicate out of restricted predicate range
 
 and z0.d, p8/z, z0.d, z1.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: and z0.d, p8/z, z0.d, z1.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/andv-diagnostics.s b/test/MC/AArch64/SVE/andv-diagnostics.s
index 2048d77ff90..32f7f9bba2f 100644
--- a/test/MC/AArch64/SVE/andv-diagnostics.s
+++ b/test/MC/AArch64/SVE/andv-diagnostics.s
@@ -29,7 +29,7 @@ andv v0.2d, p7, z31.d
 // Invalid predicate
 
 andv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: andv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/asr-diagnostics.s b/test/MC/AArch64/SVE/asr-diagnostics.s
index 9cec835dbe2..51b39af89a1 100644
--- a/test/MC/AArch64/SVE/asr-diagnostics.s
+++ b/test/MC/AArch64/SVE/asr-diagnostics.s
@@ -118,7 +118,7 @@ asr z0.b, p0/m, z0.b, z1.h
 // Predicate not in restricted predicate range
 
 asr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: asr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/asrr-diagnostics.s b/test/MC/AArch64/SVE/asrr-diagnostics.s
index 3ee157e43bc..45b27ee31f2 100644
--- a/test/MC/AArch64/SVE/asrr-diagnostics.s
+++ b/test/MC/AArch64/SVE/asrr-diagnostics.s
@@ -1,7 +1,7 @@
 // RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve  2>&1 < %s| FileCheck %s
 
 asrr    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: asrr    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/bic-diagnostics.s b/test/MC/AArch64/SVE/bic-diagnostics.s
index abdd52028d0..099009bc6a6 100644
--- a/test/MC/AArch64/SVE/bic-diagnostics.s
+++ b/test/MC/AArch64/SVE/bic-diagnostics.s
@@ -62,7 +62,7 @@ bic z21.d, z5.d, z26.b
 // Predicate out of restricted predicate range
 
 bic z0.d, p8/z, z0.d, z1.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: bic z0.d, p8/z, z0.d, z1.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/clasta-diagnostics.s b/test/MC/AArch64/SVE/clasta-diagnostics.s
index c0924bf689c..593771d5136 100644
--- a/test/MC/AArch64/SVE/clasta-diagnostics.s
+++ b/test/MC/AArch64/SVE/clasta-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 clasta   w0, p8, w0, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: clasta   w0, p8, w0, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/clastb-diagnostics.s b/test/MC/AArch64/SVE/clastb-diagnostics.s
index 0f0f677ec22..82bf379542b 100644
--- a/test/MC/AArch64/SVE/clastb-diagnostics.s
+++ b/test/MC/AArch64/SVE/clastb-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 clastb   w0, p8, w0, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: clastb   w0, p8, w0, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cls-diagnostics.s b/test/MC/AArch64/SVE/cls-diagnostics.s
index fe5d15b42e6..8660bae1563 100644
--- a/test/MC/AArch64/SVE/cls-diagnostics.s
+++ b/test/MC/AArch64/SVE/cls-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 cls     z31.b, p8/m, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cls     z31.b, p8/m, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/clz-diagnostics.s b/test/MC/AArch64/SVE/clz-diagnostics.s
index 242b9330218..b0e6f8a45db 100644
--- a/test/MC/AArch64/SVE/clz-diagnostics.s
+++ b/test/MC/AArch64/SVE/clz-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 clz     z31.b, p8/m, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: clz     z31.b, p8/m, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmpeq-diagnostics.s b/test/MC/AArch64/SVE/cmpeq-diagnostics.s
index fbf292ec887..05e1857881b 100644
--- a/test/MC/AArch64/SVE/cmpeq-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmpeq-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmpeq p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmpeq p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmpge-diagnostics.s b/test/MC/AArch64/SVE/cmpge-diagnostics.s
index 44ab473808e..2ccf6cb7158 100644
--- a/test/MC/AArch64/SVE/cmpge-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmpge-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmpge p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmpge p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmpgt-diagnostics.s b/test/MC/AArch64/SVE/cmpgt-diagnostics.s
index 1745aab97ea..0c5b3819e01 100644
--- a/test/MC/AArch64/SVE/cmpgt-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmpgt-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmpgt p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmpgt p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmphi-diagnostics.s b/test/MC/AArch64/SVE/cmphi-diagnostics.s
index 5d7c0d82f5b..102bdb39985 100644
--- a/test/MC/AArch64/SVE/cmphi-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmphi-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmphi p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmphi p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmphs-diagnostics.s b/test/MC/AArch64/SVE/cmphs-diagnostics.s
index 5bfff46ee40..5c7eaa89f25 100644
--- a/test/MC/AArch64/SVE/cmphs-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmphs-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmphs p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmphs p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmple-diagnostics.s b/test/MC/AArch64/SVE/cmple-diagnostics.s
index d03d2153fd6..f20a90ffba1 100644
--- a/test/MC/AArch64/SVE/cmple-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmple-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmple p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmple p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmplo-diagnostics.s b/test/MC/AArch64/SVE/cmplo-diagnostics.s
index ecbed6081ac..2038657cb22 100644
--- a/test/MC/AArch64/SVE/cmplo-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmplo-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmplo p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmplo p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmpls-diagnostics.s b/test/MC/AArch64/SVE/cmpls-diagnostics.s
index c42ce36ae3c..4c420620e2b 100644
--- a/test/MC/AArch64/SVE/cmpls-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmpls-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmpls p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmpls p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmplt-diagnostics.s b/test/MC/AArch64/SVE/cmplt-diagnostics.s
index 0f023e0f866..0a76e7792f3 100644
--- a/test/MC/AArch64/SVE/cmplt-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmplt-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmplt p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmplt p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cmpne-diagnostics.s b/test/MC/AArch64/SVE/cmpne-diagnostics.s
index 74c74c7eaa7..1c886331f85 100644
--- a/test/MC/AArch64/SVE/cmpne-diagnostics.s
+++ b/test/MC/AArch64/SVE/cmpne-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 cmpne p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cmpne p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cnot-diagnostics.s b/test/MC/AArch64/SVE/cnot-diagnostics.s
index 867b6bb005a..2f9681a207e 100644
--- a/test/MC/AArch64/SVE/cnot-diagnostics.s
+++ b/test/MC/AArch64/SVE/cnot-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 cnot     z31.b, p8/m, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cnot     z31.b, p8/m, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/cnt-diagnostics.s b/test/MC/AArch64/SVE/cnt-diagnostics.s
index 8dcd62d7fbd..70e9d6c4b91 100644
--- a/test/MC/AArch64/SVE/cnt-diagnostics.s
+++ b/test/MC/AArch64/SVE/cnt-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 cnt     z31.b, p8/m, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: cnt     z31.b, p8/m, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/compact-diagnostics.s b/test/MC/AArch64/SVE/compact-diagnostics.s
index d252f60e55a..e2e5d8cd1fe 100644
--- a/test/MC/AArch64/SVE/compact-diagnostics.s
+++ b/test/MC/AArch64/SVE/compact-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 compact z23.d, p8, z13.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: compact z23.d, p8, z13.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/eor-diagnostics.s b/test/MC/AArch64/SVE/eor-diagnostics.s
index e8d28737db2..90a5de3077f 100644
--- a/test/MC/AArch64/SVE/eor-diagnostics.s
+++ b/test/MC/AArch64/SVE/eor-diagnostics.s
@@ -62,7 +62,7 @@ eor z21.d, z5.d, z26.b
 // Predicate out of restricted predicate range
 
 eor z0.d, p8/z, z0.d, z1.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: eor z0.d, p8/z, z0.d, z1.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/eorv-diagnostics.s b/test/MC/AArch64/SVE/eorv-diagnostics.s
index 6f231a8c626..7db206dcaef 100644
--- a/test/MC/AArch64/SVE/eorv-diagnostics.s
+++ b/test/MC/AArch64/SVE/eorv-diagnostics.s
@@ -29,7 +29,7 @@ eorv v0.2d, p7, z31.d
 // Invalid predicate
 
 eorv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: eorv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fabd-diagnostics.s b/test/MC/AArch64/SVE/fabd-diagnostics.s
index aadebc61830..3493205ae55 100644
--- a/test/MC/AArch64/SVE/fabd-diagnostics.s
+++ b/test/MC/AArch64/SVE/fabd-diagnostics.s
@@ -28,6 +28,6 @@ fabd    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fabd    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fabd    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fabs-diagnostics.s b/test/MC/AArch64/SVE/fabs-diagnostics.s
index 755202fd325..79db3658842 100644
--- a/test/MC/AArch64/SVE/fabs-diagnostics.s
+++ b/test/MC/AArch64/SVE/fabs-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 fabs    z31.h, p8/m, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fabs    z31.h, p8/m, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fadd-diagnostics.s b/test/MC/AArch64/SVE/fadd-diagnostics.s
index b809e2e72b2..048b9a6f0d6 100644
--- a/test/MC/AArch64/SVE/fadd-diagnostics.s
+++ b/test/MC/AArch64/SVE/fadd-diagnostics.s
@@ -65,7 +65,7 @@ fadd z0.h, z1.s, z2.s
 // Invalid predicate
 
 fadd    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fadd    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fadda-diagnostics.s b/test/MC/AArch64/SVE/fadda-diagnostics.s
index 6386707efa5..ed2a6e182a2 100644
--- a/test/MC/AArch64/SVE/fadda-diagnostics.s
+++ b/test/MC/AArch64/SVE/fadda-diagnostics.s
@@ -11,7 +11,7 @@ fadda h0, p7, h1, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 fadda h0, p8, h0, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fadda h0, p8, h0, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/faddv-diagnostics.s b/test/MC/AArch64/SVE/faddv-diagnostics.s
index f8fa774d8be..8c28cbdc190 100644
--- a/test/MC/AArch64/SVE/faddv-diagnostics.s
+++ b/test/MC/AArch64/SVE/faddv-diagnostics.s
@@ -6,7 +6,7 @@ faddv b0, p7, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 faddv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: faddv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fcadd-diagnostics.s b/test/MC/AArch64/SVE/fcadd-diagnostics.s
index b9e54d0d0b4..8be5b573156 100644
--- a/test/MC/AArch64/SVE/fcadd-diagnostics.s
+++ b/test/MC/AArch64/SVE/fcadd-diagnostics.s
@@ -13,7 +13,7 @@ fcadd z0.d, p2/m, z1.d, z2.d, #90
 // Restricted predicate out of range.
 
 fcadd z0.d, p8/m, z0.d, z1.d, #90
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcadd z0.d, p8/m, z0.d, z1.d, #90
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fcmla-diagnostics.s b/test/MC/AArch64/SVE/fcmla-diagnostics.s
index 7ad6db4f198..e9b42e04101 100644
--- a/test/MC/AArch64/SVE/fcmla-diagnostics.s
+++ b/test/MC/AArch64/SVE/fcmla-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 fcmla z0.d, p8/m, z1.d, z2.d, #0
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcmla z0.d, p8/m, z1.d, z2.d, #0
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fcvt-diagnostics.s b/test/MC/AArch64/SVE/fcvt-diagnostics.s
index 815152f4591..8b9d7df15b5 100644
--- a/test/MC/AArch64/SVE/fcvt-diagnostics.s
+++ b/test/MC/AArch64/SVE/fcvt-diagnostics.s
@@ -17,9 +17,9 @@ fcvt    z0.d, p0/m, z0.d
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 fcvt    z0.h, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcvt    z0.h, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fcvtzs-diagnostics.s b/test/MC/AArch64/SVE/fcvtzs-diagnostics.s
index 3738213099c..d0c50c61b04 100644
--- a/test/MC/AArch64/SVE/fcvtzs-diagnostics.s
+++ b/test/MC/AArch64/SVE/fcvtzs-diagnostics.s
@@ -12,9 +12,9 @@ fcvtzs    z0.h, p0/m, z0.d
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 fcvtzs    z0.h, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcvtzs    z0.h, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fcvtzu-diagnostics.s b/test/MC/AArch64/SVE/fcvtzu-diagnostics.s
index 3e0416b5c69..413e99285cf 100644
--- a/test/MC/AArch64/SVE/fcvtzu-diagnostics.s
+++ b/test/MC/AArch64/SVE/fcvtzu-diagnostics.s
@@ -12,9 +12,9 @@ fcvtzu    z0.h, p0/m, z0.d
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 fcvtzu    z0.h, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcvtzu    z0.h, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fdiv-diagnostics.s b/test/MC/AArch64/SVE/fdiv-diagnostics.s
index 48d8b693ebf..5bf7c611c5a 100644
--- a/test/MC/AArch64/SVE/fdiv-diagnostics.s
+++ b/test/MC/AArch64/SVE/fdiv-diagnostics.s
@@ -28,6 +28,6 @@ fdiv    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fdiv    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fdiv    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fdivr-diagnostics.s b/test/MC/AArch64/SVE/fdivr-diagnostics.s
index 031d6845c61..c5120083bea 100644
--- a/test/MC/AArch64/SVE/fdivr-diagnostics.s
+++ b/test/MC/AArch64/SVE/fdivr-diagnostics.s
@@ -28,6 +28,6 @@ fdivr    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fdivr    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fdivr    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fmad-diagnostics.s b/test/MC/AArch64/SVE/fmad-diagnostics.s
index ab9301c97c5..a9d27b56f2d 100644
--- a/test/MC/AArch64/SVE/fmad-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmad-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fmad z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmad z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmax-diagnostics.s b/test/MC/AArch64/SVE/fmax-diagnostics.s
index e62aeb8247c..fdaf45afbcb 100644
--- a/test/MC/AArch64/SVE/fmax-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmax-diagnostics.s
@@ -56,6 +56,6 @@ fmax    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fmax    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmax    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fmaxnm-diagnostics.s b/test/MC/AArch64/SVE/fmaxnm-diagnostics.s
index 3fe1e6ea9b5..8eeb35602da 100644
--- a/test/MC/AArch64/SVE/fmaxnm-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmaxnm-diagnostics.s
@@ -56,6 +56,6 @@ fmaxnm    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fmaxnm    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmaxnm    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fmaxnmv-diagnostics.s b/test/MC/AArch64/SVE/fmaxnmv-diagnostics.s
index 09483129655..035e0da69f8 100644
--- a/test/MC/AArch64/SVE/fmaxnmv-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmaxnmv-diagnostics.s
@@ -6,7 +6,7 @@ fmaxnmv b0, p7, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 fmaxnmv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmaxnmv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmaxv-diagnostics.s b/test/MC/AArch64/SVE/fmaxv-diagnostics.s
index 0923dc167f8..552904483f9 100644
--- a/test/MC/AArch64/SVE/fmaxv-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmaxv-diagnostics.s
@@ -6,7 +6,7 @@ fmaxv b0, p7, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 fmaxv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmaxv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmin-diagnostics.s b/test/MC/AArch64/SVE/fmin-diagnostics.s
index 0d8dc64e92f..2c92abb01b0 100644
--- a/test/MC/AArch64/SVE/fmin-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmin-diagnostics.s
@@ -56,6 +56,6 @@ fmin    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fmin    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmin    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fminnm-diagnostics.s b/test/MC/AArch64/SVE/fminnm-diagnostics.s
index d717e91b84b..b3602e2d94a 100644
--- a/test/MC/AArch64/SVE/fminnm-diagnostics.s
+++ b/test/MC/AArch64/SVE/fminnm-diagnostics.s
@@ -56,6 +56,6 @@ fminnm    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fminnm    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fminnm    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fminnmv-diagnostics.s b/test/MC/AArch64/SVE/fminnmv-diagnostics.s
index bf9062b5b66..605f4594da1 100644
--- a/test/MC/AArch64/SVE/fminnmv-diagnostics.s
+++ b/test/MC/AArch64/SVE/fminnmv-diagnostics.s
@@ -6,7 +6,7 @@ fminnmv b0, p7, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 fminnmv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fminnmv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fminv-diagnostics.s b/test/MC/AArch64/SVE/fminv-diagnostics.s
index 793d7f7562b..2d3bfd7a45c 100644
--- a/test/MC/AArch64/SVE/fminv-diagnostics.s
+++ b/test/MC/AArch64/SVE/fminv-diagnostics.s
@@ -6,7 +6,7 @@ fminv b0, p7, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 fminv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fminv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmla-diagnostics.s b/test/MC/AArch64/SVE/fmla-diagnostics.s
index e9892590c23..4c896369ba6 100644
--- a/test/MC/AArch64/SVE/fmla-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmla-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fmla z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmla z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmls-diagnostics.s b/test/MC/AArch64/SVE/fmls-diagnostics.s
index 8c2d175642c..68b069fa21e 100644
--- a/test/MC/AArch64/SVE/fmls-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmls-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fmls z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmls z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmsb-diagnostics.s b/test/MC/AArch64/SVE/fmsb-diagnostics.s
index df4dbe54fb1..bc24d8bf08a 100644
--- a/test/MC/AArch64/SVE/fmsb-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmsb-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fmsb z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmsb z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmul-diagnostics.s b/test/MC/AArch64/SVE/fmul-diagnostics.s
index be91dc312f3..0eebd897a97 100644
--- a/test/MC/AArch64/SVE/fmul-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmul-diagnostics.s
@@ -129,7 +129,7 @@ fmul z0.h, z1.s, z2.s
 // Invalid predicate
 
 fmul    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmul    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fmulx-diagnostics.s b/test/MC/AArch64/SVE/fmulx-diagnostics.s
index 9b0c6c9868e..1138cae254d 100644
--- a/test/MC/AArch64/SVE/fmulx-diagnostics.s
+++ b/test/MC/AArch64/SVE/fmulx-diagnostics.s
@@ -28,6 +28,6 @@ fmulx    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fmulx    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmulx    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fneg-diagnostics.s b/test/MC/AArch64/SVE/fneg-diagnostics.s
index 1ddcea44689..59fbc8dc29f 100644
--- a/test/MC/AArch64/SVE/fneg-diagnostics.s
+++ b/test/MC/AArch64/SVE/fneg-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 fneg    z31.h, p8/m, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fneg    z31.h, p8/m, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fnmad-diagnostics.s b/test/MC/AArch64/SVE/fnmad-diagnostics.s
index 8d12d89d631..8e34595aaac 100644
--- a/test/MC/AArch64/SVE/fnmad-diagnostics.s
+++ b/test/MC/AArch64/SVE/fnmad-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fnmad z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fnmad z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fnmla-diagnostics.s b/test/MC/AArch64/SVE/fnmla-diagnostics.s
index df9053c4b9d..884d1551c0d 100644
--- a/test/MC/AArch64/SVE/fnmla-diagnostics.s
+++ b/test/MC/AArch64/SVE/fnmla-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fnmla z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fnmla z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fnmls-diagnostics.s b/test/MC/AArch64/SVE/fnmls-diagnostics.s
index 4136cb0f50e..36b6214a011 100644
--- a/test/MC/AArch64/SVE/fnmls-diagnostics.s
+++ b/test/MC/AArch64/SVE/fnmls-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fnmls z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fnmls z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fnmsb-diagnostics.s b/test/MC/AArch64/SVE/fnmsb-diagnostics.s
index 51981dda9a4..f9e008c1b04 100644
--- a/test/MC/AArch64/SVE/fnmsb-diagnostics.s
+++ b/test/MC/AArch64/SVE/fnmsb-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 fnmsb z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fnmsb z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/frecpx-diagnostics.s b/test/MC/AArch64/SVE/frecpx-diagnostics.s
index 1daf1dbf3d1..a24f9c4a74c 100644
--- a/test/MC/AArch64/SVE/frecpx-diagnostics.s
+++ b/test/MC/AArch64/SVE/frecpx-diagnostics.s
@@ -11,6 +11,6 @@ frecpx  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frecpx  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frecpx  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/frinta-diagnostics.s b/test/MC/AArch64/SVE/frinta-diagnostics.s
index f0d1bcb117e..136e123cb7e 100644
--- a/test/MC/AArch64/SVE/frinta-diagnostics.s
+++ b/test/MC/AArch64/SVE/frinta-diagnostics.s
@@ -11,6 +11,6 @@ frinta  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frinta  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frinta  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/frinti-diagnostics.s b/test/MC/AArch64/SVE/frinti-diagnostics.s
index 8a0578a737b..8c619214c64 100644
--- a/test/MC/AArch64/SVE/frinti-diagnostics.s
+++ b/test/MC/AArch64/SVE/frinti-diagnostics.s
@@ -11,6 +11,6 @@ frinti  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frinti  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frinti  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/frintm-diagnostics.s b/test/MC/AArch64/SVE/frintm-diagnostics.s
index 47b6661a373..a8ba48d353d 100644
--- a/test/MC/AArch64/SVE/frintm-diagnostics.s
+++ b/test/MC/AArch64/SVE/frintm-diagnostics.s
@@ -11,6 +11,6 @@ frintm  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frintm  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frintm  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/frintn-diagnostics.s b/test/MC/AArch64/SVE/frintn-diagnostics.s
index a34e4d43dc1..f5fb0705243 100644
--- a/test/MC/AArch64/SVE/frintn-diagnostics.s
+++ b/test/MC/AArch64/SVE/frintn-diagnostics.s
@@ -11,6 +11,6 @@ frintn  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frintn  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frintn  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/frintp-diagnostics.s b/test/MC/AArch64/SVE/frintp-diagnostics.s
index ab4b2eb2458..2766299d4c9 100644
--- a/test/MC/AArch64/SVE/frintp-diagnostics.s
+++ b/test/MC/AArch64/SVE/frintp-diagnostics.s
@@ -11,6 +11,6 @@ frintp  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frintp  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frintp  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/frintx-diagnostics.s b/test/MC/AArch64/SVE/frintx-diagnostics.s
index 4d3edcb453b..98620898cde 100644
--- a/test/MC/AArch64/SVE/frintx-diagnostics.s
+++ b/test/MC/AArch64/SVE/frintx-diagnostics.s
@@ -11,6 +11,6 @@ frintx  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frintx  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frintx  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/frintz-diagnostics.s b/test/MC/AArch64/SVE/frintz-diagnostics.s
index 7686d701969..8bb6717ce3a 100644
--- a/test/MC/AArch64/SVE/frintz-diagnostics.s
+++ b/test/MC/AArch64/SVE/frintz-diagnostics.s
@@ -11,6 +11,6 @@ frintz  z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 frintz  z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: frintz  z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fscale-diagnostics.s b/test/MC/AArch64/SVE/fscale-diagnostics.s
index 34a3c331177..293a7a13164 100644
--- a/test/MC/AArch64/SVE/fscale-diagnostics.s
+++ b/test/MC/AArch64/SVE/fscale-diagnostics.s
@@ -28,6 +28,6 @@ fscale    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fscale    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fscale    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fsqrt-diagnostics.s b/test/MC/AArch64/SVE/fsqrt-diagnostics.s
index c958f37a257..8b1abedb752 100644
--- a/test/MC/AArch64/SVE/fsqrt-diagnostics.s
+++ b/test/MC/AArch64/SVE/fsqrt-diagnostics.s
@@ -11,6 +11,6 @@ fsqrt   z0.s, p0/z, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 fsqrt   z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fsqrt   z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/fsub-diagnostics.s b/test/MC/AArch64/SVE/fsub-diagnostics.s
index 41b36bdbea4..4f857b50d7b 100644
--- a/test/MC/AArch64/SVE/fsub-diagnostics.s
+++ b/test/MC/AArch64/SVE/fsub-diagnostics.s
@@ -65,7 +65,7 @@ fsub z0.h, z1.s, z2.s
 // Invalid predicate
 
 fsub    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fsub    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/fsubr-diagnostics.s b/test/MC/AArch64/SVE/fsubr-diagnostics.s
index 0e751f42e3f..268f6bd05cb 100644
--- a/test/MC/AArch64/SVE/fsubr-diagnostics.s
+++ b/test/MC/AArch64/SVE/fsubr-diagnostics.s
@@ -56,6 +56,6 @@ fsubr    z0.h, p7/m, z0.h, z31.s
 // Invalid predicate
 
 fsubr    z0.h, p8/m, z0.h, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fsubr    z0.h, p8/m, z0.h, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/lasta-diagnostics.s b/test/MC/AArch64/SVE/lasta-diagnostics.s
index b153a67f35f..00041e15f3b 100644
--- a/test/MC/AArch64/SVE/lasta-diagnostics.s
+++ b/test/MC/AArch64/SVE/lasta-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 lasta   w0, p8, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: lasta   w0, p8, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/lastb-diagnostics.s b/test/MC/AArch64/SVE/lastb-diagnostics.s
index b86654ffc12..a8da795ed6f 100644
--- a/test/MC/AArch64/SVE/lastb-diagnostics.s
+++ b/test/MC/AArch64/SVE/lastb-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 lastb   w0, p8, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: lastb   w0, p8, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1b-diagnostics.s b/test/MC/AArch64/SVE/ld1b-diagnostics.s
index 70fecbf5805..145d7607355 100644
--- a/test/MC/AArch64/SVE/ld1b-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1b-diagnostics.s
@@ -48,22 +48,22 @@ ld1b z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ld1b z27.b, p8/z, [x29, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1b z27.b, p8/z, [x29, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1b z9.h, p8/z, [x25, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1b z9.h, p8/z, [x25, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1b z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1b z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1b z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1b z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1d-diagnostics.s b/test/MC/AArch64/SVE/ld1d-diagnostics.s
index 2ba54069956..601cb56b4fd 100644
--- a/test/MC/AArch64/SVE/ld1d-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1d-diagnostics.s
@@ -18,7 +18,7 @@ ld1d z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ld1d z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1d z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1h-diagnostics.s b/test/MC/AArch64/SVE/ld1h-diagnostics.s
index 8643a051fe9..095b5c7cf80 100644
--- a/test/MC/AArch64/SVE/ld1h-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1h-diagnostics.s
@@ -38,17 +38,17 @@ ld1h z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ld1h z9.h, p8/z, [x25, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1h z9.h, p8/z, [x25, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1h z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1h z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1h z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1h z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1rb-diagnostics.s b/test/MC/AArch64/SVE/ld1rb-diagnostics.s
index c862eb5cdb1..ba4e289b8d7 100644
--- a/test/MC/AArch64/SVE/ld1rb-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1rb-diagnostics.s
@@ -18,7 +18,7 @@ ld1rb z0.b, p1/z, [x0, #64]
 // restricted predicate has range [0, 7].
 
 ld1rb z0.b, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1rb z0.b, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1rd-diagnostics.s b/test/MC/AArch64/SVE/ld1rd-diagnostics.s
index e85ffa16ef5..312dcdca816 100644
--- a/test/MC/AArch64/SVE/ld1rd-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1rd-diagnostics.s
@@ -52,7 +52,7 @@ ld1rd z0.s, p1/z, [x0]
 // restricted predicate has range [0, 7].
 
 ld1rd z0.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1rd z0.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1rh-diagnostics.s b/test/MC/AArch64/SVE/ld1rh-diagnostics.s
index 2665e859d81..1766920ea5c 100644
--- a/test/MC/AArch64/SVE/ld1rh-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1rh-diagnostics.s
@@ -42,7 +42,7 @@ ld1rh z0.b, p1/z, [x0]
 // restricted predicate has range [0, 7].
 
 ld1rh z0.h, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1rh z0.h, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1rsb-diagnostics.s b/test/MC/AArch64/SVE/ld1rsb-diagnostics.s
index 28c6ecd9013..5da5dee3e2a 100644
--- a/test/MC/AArch64/SVE/ld1rsb-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1rsb-diagnostics.s
@@ -27,7 +27,7 @@ ld1rsb z0.b, p1/z, [x0]
 // restricted predicate has range [0, 7].
 
 ld1rsb z0.h, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1rsb z0.h, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1rsh-diagnostics.s b/test/MC/AArch64/SVE/ld1rsh-diagnostics.s
index ae13b87b61e..8911ba18bc2 100644
--- a/test/MC/AArch64/SVE/ld1rsh-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1rsh-diagnostics.s
@@ -37,7 +37,7 @@ ld1rsh z0.h, p1/z, [x0]
 // restricted predicate has range [0, 7].
 
 ld1rsh z0.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1rsh z0.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1rsw-diagnostics.s b/test/MC/AArch64/SVE/ld1rsw-diagnostics.s
index 02da02d5cf5..57c09aa66ee 100644
--- a/test/MC/AArch64/SVE/ld1rsw-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1rsw-diagnostics.s
@@ -42,7 +42,7 @@ ld1rsw z0.s, p1/z, [x0]
 // restricted predicate has range [0, 7].
 
 ld1rsw z0.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1rsw z0.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1rw-diagnostics.s b/test/MC/AArch64/SVE/ld1rw-diagnostics.s
index c4bc362d7d0..afc36ef3c20 100644
--- a/test/MC/AArch64/SVE/ld1rw-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1rw-diagnostics.s
@@ -47,7 +47,7 @@ ld1rw z0.h, p1/z, [x0]
 // restricted predicate has range [0, 7].
 
 ld1rw z0.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1rw z0.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1sb-diagnostics.s b/test/MC/AArch64/SVE/ld1sb-diagnostics.s
index 0bbccfc0c95..bd67e297238 100644
--- a/test/MC/AArch64/SVE/ld1sb-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1sb-diagnostics.s
@@ -52,17 +52,17 @@ ld1sb z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ld1sb z9.h, p8/z, [x25, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1sb z9.h, p8/z, [x25, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1sb z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1sb z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1sb z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1sb z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1sh-diagnostics.s b/test/MC/AArch64/SVE/ld1sh-diagnostics.s
index d423480a284..ca5516924f6 100644
--- a/test/MC/AArch64/SVE/ld1sh-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1sh-diagnostics.s
@@ -42,12 +42,12 @@ ld1sh z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ld1sh z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1sh z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1sh z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1sh z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1sw-diagnostics.s b/test/MC/AArch64/SVE/ld1sw-diagnostics.s
index 1061e87301d..1454cf3502d 100644
--- a/test/MC/AArch64/SVE/ld1sw-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1sw-diagnostics.s
@@ -32,7 +32,7 @@ ld1sw z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ld1sw z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1sw z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld1w-diagnostics.s b/test/MC/AArch64/SVE/ld1w-diagnostics.s
index 1aafc27f858..766233fb055 100644
--- a/test/MC/AArch64/SVE/ld1w-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld1w-diagnostics.s
@@ -28,12 +28,12 @@ ld1w z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ld1w z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1w z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ld1w z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld1w z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld2b-diagnostics.s b/test/MC/AArch64/SVE/ld2b-diagnostics.s
index 3eae31f363d..f3c41d691ba 100644
--- a/test/MC/AArch64/SVE/ld2b-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld2b-diagnostics.s
@@ -54,10 +54,10 @@ ld2b { z0.b, z1.b }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld2b {z2.b, z3.b}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld2b {z2.b, z3.b}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld2d-diagnostics.s b/test/MC/AArch64/SVE/ld2d-diagnostics.s
index 7b64621635d..7bd408e9e10 100644
--- a/test/MC/AArch64/SVE/ld2d-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld2d-diagnostics.s
@@ -59,10 +59,10 @@ ld2d { z0.d, z1.d }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld2d {z2.d, z3.d}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld2d {z2.d, z3.d}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld2h-diagnostics.s b/test/MC/AArch64/SVE/ld2h-diagnostics.s
index 4568fe396ee..1c6fb59e29c 100644
--- a/test/MC/AArch64/SVE/ld2h-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld2h-diagnostics.s
@@ -59,10 +59,10 @@ ld2h { z0.h, z1.h }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld2h {z2.h, z3.h}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld2h {z2.h, z3.h}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld2w-diagnostics.s b/test/MC/AArch64/SVE/ld2w-diagnostics.s
index 66acedab1e9..910b40f701b 100644
--- a/test/MC/AArch64/SVE/ld2w-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld2w-diagnostics.s
@@ -59,10 +59,10 @@ ld2w { z0.s, z1.s }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld2w {z2.s, z3.s}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld2w {z2.s, z3.s}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld3b-diagnostics.s b/test/MC/AArch64/SVE/ld3b-diagnostics.s
index 388545258bc..a550ed6b97f 100644
--- a/test/MC/AArch64/SVE/ld3b-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld3b-diagnostics.s
@@ -54,10 +54,10 @@ ld3b { z0.b, z1.b, z2.b }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld3b {z2.b, z3.b, z4.b}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld3b {z2.b, z3.b, z4.b}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld3d-diagnostics.s b/test/MC/AArch64/SVE/ld3d-diagnostics.s
index f672fb83200..280e196ecb6 100644
--- a/test/MC/AArch64/SVE/ld3d-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld3d-diagnostics.s
@@ -59,10 +59,10 @@ ld3d { z0.d, z1.d, z2.d }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld3d {z2.d, z3.d, z4.d}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld3d {z2.d, z3.d, z4.d}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld3h-diagnostics.s b/test/MC/AArch64/SVE/ld3h-diagnostics.s
index c5ae5dfcda5..acab33a56a1 100644
--- a/test/MC/AArch64/SVE/ld3h-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld3h-diagnostics.s
@@ -59,10 +59,10 @@ ld3h { z0.h, z1.h, z2.h }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld3h {z2.h, z3.h, z4.h}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld3h {z2.h, z3.h, z4.h}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld3w-diagnostics.s b/test/MC/AArch64/SVE/ld3w-diagnostics.s
index d3082c14b8f..f0a8c6770b5 100644
--- a/test/MC/AArch64/SVE/ld3w-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld3w-diagnostics.s
@@ -59,10 +59,10 @@ ld3w { z0.s, z1.s, z2.s }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld3w {z2.s, z3.s, z4.s}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld3w {z2.s, z3.s, z4.s}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld4b-diagnostics.s b/test/MC/AArch64/SVE/ld4b-diagnostics.s
index 65c5bcd26fc..d288b9156fa 100644
--- a/test/MC/AArch64/SVE/ld4b-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld4b-diagnostics.s
@@ -54,10 +54,10 @@ ld4b { z0.b, z1.b, z2.b, z3.b }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld4b {z2.b, z3.b, z4.b, z5.b}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld4b {z2.b, z3.b, z4.b, z5.b}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld4d-diagnostics.s b/test/MC/AArch64/SVE/ld4d-diagnostics.s
index ea70ea03701..f96bc360d3b 100644
--- a/test/MC/AArch64/SVE/ld4d-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld4d-diagnostics.s
@@ -59,10 +59,10 @@ ld4d { z0.d, z1.d, z2.d, z3.d }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld4d {z2.d, z3.d, z4.d, z5.d}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld4d {z2.d, z3.d, z4.d, z5.d}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld4h-diagnostics.s b/test/MC/AArch64/SVE/ld4h-diagnostics.s
index dc5485484f7..c0ba772eb28 100644
--- a/test/MC/AArch64/SVE/ld4h-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld4h-diagnostics.s
@@ -59,10 +59,10 @@ ld4h { z0.h, z1.h, z2.h, z3.h }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld4h {z2.h, z3.h, z4.h, z5.h}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld4h {z2.h, z3.h, z4.h, z5.h}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ld4w-diagnostics.s b/test/MC/AArch64/SVE/ld4w-diagnostics.s
index d4633dd4d55..44f799173ec 100644
--- a/test/MC/AArch64/SVE/ld4w-diagnostics.s
+++ b/test/MC/AArch64/SVE/ld4w-diagnostics.s
@@ -59,10 +59,10 @@ ld4w { z0.s, z1.s, z2.s, z3.s }, p0/z, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ld4w {z2.s, z3.s, z4.s, z5.s}, p8/z, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ld4w {z2.s, z3.s, z4.s, z5.s}, p8/z, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldff1b-diagnostics.s b/test/MC/AArch64/SVE/ldff1b-diagnostics.s
index 8de73ef3e6f..df4091b1a43 100644
--- a/test/MC/AArch64/SVE/ldff1b-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldff1b-diagnostics.s
@@ -4,22 +4,22 @@
 // restricted predicate has range [0, 7].
 
 ldff1b z27.b, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1b z27.b, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1b z9.h, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1b z9.h, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1b z12.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1b z12.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1b z4.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1b z4.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldff1d-diagnostics.s b/test/MC/AArch64/SVE/ldff1d-diagnostics.s
index 29978c7303b..152edf342c2 100644
--- a/test/MC/AArch64/SVE/ldff1d-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldff1d-diagnostics.s
@@ -22,7 +22,7 @@ ldff1d z4.s, p7/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldff1d z4.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1d z4.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldff1h-diagnostics.s b/test/MC/AArch64/SVE/ldff1h-diagnostics.s
index 8674d095351..6a8a1f51ea8 100644
--- a/test/MC/AArch64/SVE/ldff1h-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldff1h-diagnostics.s
@@ -12,17 +12,17 @@ ldff1h z9.b, p7/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldff1h z9.h, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1h z9.h, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1h z12.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1h z12.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1h z4.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1h z4.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldff1sb-diagnostics.s b/test/MC/AArch64/SVE/ldff1sb-diagnostics.s
index 23cca8c1454..8efb0805434 100644
--- a/test/MC/AArch64/SVE/ldff1sb-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldff1sb-diagnostics.s
@@ -12,17 +12,17 @@ ldff1sb z27.b, p7/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldff1sb z9.h, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1sb z9.h, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1sb z12.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1sb z12.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1sb z4.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1sb z4.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldff1sh-diagnostics.s b/test/MC/AArch64/SVE/ldff1sh-diagnostics.s
index 4a8d329f973..7d10c655d5e 100644
--- a/test/MC/AArch64/SVE/ldff1sh-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldff1sh-diagnostics.s
@@ -12,12 +12,12 @@ ldff1sh z9.h, p7/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldff1sh z12.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1sh z12.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1sh z4.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1sh z4.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldff1sw-diagnostics.s b/test/MC/AArch64/SVE/ldff1sw-diagnostics.s
index ab096f36b8c..1beae2007bd 100644
--- a/test/MC/AArch64/SVE/ldff1sw-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldff1sw-diagnostics.s
@@ -12,7 +12,7 @@ ldff1sw z12.s, p7/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldff1sw z4.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1sw z4.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldff1w-diagnostics.s b/test/MC/AArch64/SVE/ldff1w-diagnostics.s
index e2cec7c7710..da542c9e4cd 100644
--- a/test/MC/AArch64/SVE/ldff1w-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldff1w-diagnostics.s
@@ -17,12 +17,12 @@ ldff1w z4.h, p7/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldff1w z12.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1w z12.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldff1w z4.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldff1w z4.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnf1b-diagnostics.s b/test/MC/AArch64/SVE/ldnf1b-diagnostics.s
index b24c15308f4..1b641282fbd 100644
--- a/test/MC/AArch64/SVE/ldnf1b-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnf1b-diagnostics.s
@@ -48,22 +48,22 @@ ldnf1b z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ldnf1b z27.b, p8/z, [x29, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1b z27.b, p8/z, [x29, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1b z9.h, p8/z, [x25, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1b z9.h, p8/z, [x25, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1b z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1b z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1b z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1b z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnf1d-diagnostics.s b/test/MC/AArch64/SVE/ldnf1d-diagnostics.s
index 8c29bddea0c..9037913f929 100644
--- a/test/MC/AArch64/SVE/ldnf1d-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnf1d-diagnostics.s
@@ -18,7 +18,7 @@ ldnf1d z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ldnf1d z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1d z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnf1h-diagnostics.s b/test/MC/AArch64/SVE/ldnf1h-diagnostics.s
index 6d61423f999..344826415a2 100644
--- a/test/MC/AArch64/SVE/ldnf1h-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnf1h-diagnostics.s
@@ -38,17 +38,17 @@ ldnf1h z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ldnf1h z9.h, p8/z, [x25, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1h z9.h, p8/z, [x25, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1h z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1h z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1h z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1h z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s b/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s
index 23e816425c5..b34419cc585 100644
--- a/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s
@@ -52,17 +52,17 @@ ldnf1sb z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ldnf1sb z9.h, p8/z, [x25, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1sb z9.h, p8/z, [x25, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1sb z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1sb z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1sb z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1sb z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s b/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s
index 3071cc6e469..c3a50699abe 100644
--- a/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s
@@ -42,12 +42,12 @@ ldnf1sh z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ldnf1sh z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1sh z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1sh z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1sh z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s b/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s
index 5c133f7a009..c4a25efd44a 100644
--- a/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s
@@ -32,7 +32,7 @@ ldnf1sw z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ldnf1sw z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1sw z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnf1w-diagnostics.s b/test/MC/AArch64/SVE/ldnf1w-diagnostics.s
index 2fd7123b492..829af248ea9 100644
--- a/test/MC/AArch64/SVE/ldnf1w-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnf1w-diagnostics.s
@@ -28,12 +28,12 @@ ldnf1w z27.d, p1/z, [x26, #8, MUL VL]
 // restricted predicate has range [0, 7].
 
 ldnf1w z12.s, p8/z, [x13, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1w z12.s, p8/z, [x13, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ldnf1w z4.d, p8/z, [x11, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnf1w z4.d, p8/z, [x11, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnt1b-diagnostics.s b/test/MC/AArch64/SVE/ldnt1b-diagnostics.s
index 0379bb27e1c..9771d689792 100644
--- a/test/MC/AArch64/SVE/ldnt1b-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnt1b-diagnostics.s
@@ -37,7 +37,7 @@ ldnt1b z0.d, p0/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldnt1b z27.b, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1b z27.b, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnt1d-diagnostics.s b/test/MC/AArch64/SVE/ldnt1d-diagnostics.s
index 2aba4dc2e94..7f458132aef 100644
--- a/test/MC/AArch64/SVE/ldnt1d-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnt1d-diagnostics.s
@@ -37,7 +37,7 @@ ldnt1d z0.s, p0/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldnt1d z27.d, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1d z27.d, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnt1h-diagnostics.s b/test/MC/AArch64/SVE/ldnt1h-diagnostics.s
index fce1fb5ae5b..ec6f1a9c934 100644
--- a/test/MC/AArch64/SVE/ldnt1h-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnt1h-diagnostics.s
@@ -37,7 +37,7 @@ ldnt1h z0.d, p0/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldnt1h z27.h, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1h z27.h, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ldnt1w-diagnostics.s b/test/MC/AArch64/SVE/ldnt1w-diagnostics.s
index 23ba16a0315..ae1e4cef1ac 100644
--- a/test/MC/AArch64/SVE/ldnt1w-diagnostics.s
+++ b/test/MC/AArch64/SVE/ldnt1w-diagnostics.s
@@ -37,7 +37,7 @@ ldnt1w z0.d, p0/z, [x0]
 // restricted predicate has range [0, 7].
 
 ldnt1w z27.s, p8/z, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1w z27.s, p8/z, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/lsl-diagnostics.s b/test/MC/AArch64/SVE/lsl-diagnostics.s
index 517384896c1..d2e3c4f42cc 100644
--- a/test/MC/AArch64/SVE/lsl-diagnostics.s
+++ b/test/MC/AArch64/SVE/lsl-diagnostics.s
@@ -117,7 +117,7 @@ lsl z0.b, p0/m, z0.b, z1.h
 // Predicate not in restricted predicate range
 
 lsl z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: lsl z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/lslr-diagnostics.s b/test/MC/AArch64/SVE/lslr-diagnostics.s
index 431b3ab0a06..0b6037b1a67 100644
--- a/test/MC/AArch64/SVE/lslr-diagnostics.s
+++ b/test/MC/AArch64/SVE/lslr-diagnostics.s
@@ -1,7 +1,7 @@
 // RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve  2>&1 < %s| FileCheck %s
 
 lslr    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: lslr    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/lsr-diagnostics.s b/test/MC/AArch64/SVE/lsr-diagnostics.s
index 0de5bcd522c..d31e33f6115 100644
--- a/test/MC/AArch64/SVE/lsr-diagnostics.s
+++ b/test/MC/AArch64/SVE/lsr-diagnostics.s
@@ -118,7 +118,7 @@ lsr z0.b, p0/m, z0.b, z1.h
 // Predicate not in restricted predicate range
 
 lsr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: lsr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/lsrr-diagnostics.s b/test/MC/AArch64/SVE/lsrr-diagnostics.s
index 8aaf464feda..154c8474e27 100644
--- a/test/MC/AArch64/SVE/lsrr-diagnostics.s
+++ b/test/MC/AArch64/SVE/lsrr-diagnostics.s
@@ -1,7 +1,7 @@
 // RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve  2>&1 < %s| FileCheck %s
 
 lsrr    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: lsrr    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/mad-diagnostics.s b/test/MC/AArch64/SVE/mad-diagnostics.s
index e320933605f..8a137cb36a2 100644
--- a/test/MC/AArch64/SVE/mad-diagnostics.s
+++ b/test/MC/AArch64/SVE/mad-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 mad z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: mad z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/mla-diagnostics.s b/test/MC/AArch64/SVE/mla-diagnostics.s
index 03cb471ba25..dfe43f33254 100644
--- a/test/MC/AArch64/SVE/mla-diagnostics.s
+++ b/test/MC/AArch64/SVE/mla-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 mla z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: mla z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/mls-diagnostics.s b/test/MC/AArch64/SVE/mls-diagnostics.s
index 711518c5f49..fc6fc82813b 100644
--- a/test/MC/AArch64/SVE/mls-diagnostics.s
+++ b/test/MC/AArch64/SVE/mls-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 mls z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: mls z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/msb-diagnostics.s b/test/MC/AArch64/SVE/msb-diagnostics.s
index a2bde879683..713123e9bf7 100644
--- a/test/MC/AArch64/SVE/msb-diagnostics.s
+++ b/test/MC/AArch64/SVE/msb-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 msb z0.h, p8/m, z1.h, z2.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: msb z0.h, p8/m, z1.h, z2.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/mul-diagnostics.s b/test/MC/AArch64/SVE/mul-diagnostics.s
index de08aff0fd5..8254bbd7b3a 100644
--- a/test/MC/AArch64/SVE/mul-diagnostics.s
+++ b/test/MC/AArch64/SVE/mul-diagnostics.s
@@ -33,7 +33,7 @@ mul z0.b, p7/m, z1.b, z2.b
 // Invalid predicate
 
 mul z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: mul z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/neg-diagnostics.s b/test/MC/AArch64/SVE/neg-diagnostics.s
index 34381ef38a0..ae69ef65553 100644
--- a/test/MC/AArch64/SVE/neg-diagnostics.s
+++ b/test/MC/AArch64/SVE/neg-diagnostics.s
@@ -13,24 +13,24 @@ neg z29.d, p7, z29.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 neg z0.b, p8/m, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: neg z0.b, p8/m, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 neg z0.h, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: neg z0.h, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 neg z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: neg z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 neg z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: neg z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/not-diagnostics.s b/test/MC/AArch64/SVE/not-diagnostics.s
index e95066bcbfe..917f7350219 100644
--- a/test/MC/AArch64/SVE/not-diagnostics.s
+++ b/test/MC/AArch64/SVE/not-diagnostics.s
@@ -4,7 +4,7 @@
 // Invalid predicate
 
 not     z31.b, p8/m, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: not     z31.b, p8/m, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/orr-diagnostics.s b/test/MC/AArch64/SVE/orr-diagnostics.s
index 7038ea41f47..8a91e08545a 100644
--- a/test/MC/AArch64/SVE/orr-diagnostics.s
+++ b/test/MC/AArch64/SVE/orr-diagnostics.s
@@ -62,7 +62,7 @@ orr z21.d, z5.d, z26.b
 // Predicate out of restricted predicate range
 
 orr z0.d, p8/z, z0.d, z1.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: orr z0.d, p8/z, z0.d, z1.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/orv-diagnostics.s b/test/MC/AArch64/SVE/orv-diagnostics.s
index 1892321be28..04e498e1e28 100644
--- a/test/MC/AArch64/SVE/orv-diagnostics.s
+++ b/test/MC/AArch64/SVE/orv-diagnostics.s
@@ -29,7 +29,7 @@ orv v0.2d, p7, z31.d
 // Invalid predicate
 
 orv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: orv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/prfb-diagnostics.s b/test/MC/AArch64/SVE/prfb-diagnostics.s
index 24466ed7948..d6451c76357 100644
--- a/test/MC/AArch64/SVE/prfb-diagnostics.s
+++ b/test/MC/AArch64/SVE/prfb-diagnostics.s
@@ -125,7 +125,7 @@ prfb #0, p0, [z0.d, #32]
 // invalid predicate
 
 prfb #0, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: prfb #0, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/prfd-diagnostics.s b/test/MC/AArch64/SVE/prfd-diagnostics.s
index 2fb6a296576..538ce06e450 100644
--- a/test/MC/AArch64/SVE/prfd-diagnostics.s
+++ b/test/MC/AArch64/SVE/prfd-diagnostics.s
@@ -111,7 +111,7 @@ prfd #0, p0, [z0.d, #3]
 // invalid predicate
 
 prfd #0, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: prfd #0, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/prfh-diagnostics.s b/test/MC/AArch64/SVE/prfh-diagnostics.s
index a9f8ad84c65..5396be54709 100644
--- a/test/MC/AArch64/SVE/prfh-diagnostics.s
+++ b/test/MC/AArch64/SVE/prfh-diagnostics.s
@@ -150,7 +150,7 @@ prfh #0, p0, [z0.d, #3]
 // invalid predicate
 
 prfh #0, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: prfh #0, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/prfw-diagnostics.s b/test/MC/AArch64/SVE/prfw-diagnostics.s
index 510c383f535..891004e0558 100644
--- a/test/MC/AArch64/SVE/prfw-diagnostics.s
+++ b/test/MC/AArch64/SVE/prfw-diagnostics.s
@@ -151,7 +151,7 @@ prfw #0, p0, [z0.d, #3]
 // invalid predicate
 
 prfw #0, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: prfw #0, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/rbit-diagnostics.s b/test/MC/AArch64/SVE/rbit-diagnostics.s
index 0ee9e3e60b9..e1f33b7b7fd 100644
--- a/test/MC/AArch64/SVE/rbit-diagnostics.s
+++ b/test/MC/AArch64/SVE/rbit-diagnostics.s
@@ -5,6 +5,6 @@
 // Invalid predicate
 
 rbit  z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: rbit  z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/revb-diagnostics.s b/test/MC/AArch64/SVE/revb-diagnostics.s
index 9b201e0c1f1..f03f3b4f4d0 100644
--- a/test/MC/AArch64/SVE/revb-diagnostics.s
+++ b/test/MC/AArch64/SVE/revb-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 revb  z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: revb  z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/revh-diagnostics.s b/test/MC/AArch64/SVE/revh-diagnostics.s
index 8795b239fac..082e50beaf8 100644
--- a/test/MC/AArch64/SVE/revh-diagnostics.s
+++ b/test/MC/AArch64/SVE/revh-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 revh  z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: revh  z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/revw-diagnostics.s b/test/MC/AArch64/SVE/revw-diagnostics.s
index 95f3cbba1b8..e149eec61a0 100644
--- a/test/MC/AArch64/SVE/revw-diagnostics.s
+++ b/test/MC/AArch64/SVE/revw-diagnostics.s
@@ -5,7 +5,7 @@
 // Invalid predicate
 
 revw  z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: revw  z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/sabd-diagnostics.s b/test/MC/AArch64/SVE/sabd-diagnostics.s
index 4f8edaf4c31..4c6a1504e17 100644
--- a/test/MC/AArch64/SVE/sabd-diagnostics.s
+++ b/test/MC/AArch64/SVE/sabd-diagnostics.s
@@ -1,6 +1,6 @@
 // RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve  2>&1 < %s| FileCheck %s
 
 sabd    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sabd    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/saddv-diagnostics.s b/test/MC/AArch64/SVE/saddv-diagnostics.s
index d99433222e3..fbb9f78ac6c 100644
--- a/test/MC/AArch64/SVE/saddv-diagnostics.s
+++ b/test/MC/AArch64/SVE/saddv-diagnostics.s
@@ -29,7 +29,7 @@ saddv d0, p7, z31.d
 // Invalid predicate
 
 saddv d0, p8, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: saddv d0, p8, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/scvtf-diagnostics.s b/test/MC/AArch64/SVE/scvtf-diagnostics.s
index 2296856e486..5bd5184cb54 100644
--- a/test/MC/AArch64/SVE/scvtf-diagnostics.s
+++ b/test/MC/AArch64/SVE/scvtf-diagnostics.s
@@ -12,9 +12,9 @@ scvtf    z0.d, p0/m, z0.h
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 scvtf    z0.h, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: scvtf    z0.h, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/sdiv-diagnostics.s b/test/MC/AArch64/SVE/sdiv-diagnostics.s
index 038b268b8a0..9dea3246c78 100644
--- a/test/MC/AArch64/SVE/sdiv-diagnostics.s
+++ b/test/MC/AArch64/SVE/sdiv-diagnostics.s
@@ -28,6 +28,6 @@ sdiv   z0.s, p7/m, z1.s, z2.s
 // Invalid predicate
 
 sdiv   z0.s, p8/m, z0.s, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sdiv   z0.s, p8/m, z0.s, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/sdivr-diagnostics.s b/test/MC/AArch64/SVE/sdivr-diagnostics.s
index 6a109d0f093..ec9d46d17cf 100644
--- a/test/MC/AArch64/SVE/sdivr-diagnostics.s
+++ b/test/MC/AArch64/SVE/sdivr-diagnostics.s
@@ -28,6 +28,6 @@ sdivr  z0.s, p7/m, z1.s, z2.s
 // Invalid predicate
 
 sdivr  z0.s, p8/m, z0.s, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sdivr  z0.s, p8/m, z0.s, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/smax-diagnostics.s b/test/MC/AArch64/SVE/smax-diagnostics.s
index 77825e013c3..e61aadcf58c 100644
--- a/test/MC/AArch64/SVE/smax-diagnostics.s
+++ b/test/MC/AArch64/SVE/smax-diagnostics.s
@@ -11,7 +11,7 @@ smax    z31.b, z31.b, #128
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 smax    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: smax    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/smaxv-diagnostics.s b/test/MC/AArch64/SVE/smaxv-diagnostics.s
index 7486eb67d13..b686df51ff8 100644
--- a/test/MC/AArch64/SVE/smaxv-diagnostics.s
+++ b/test/MC/AArch64/SVE/smaxv-diagnostics.s
@@ -29,7 +29,7 @@ smaxv v0.2d, p7, z31.d
 // Invalid predicate
 
 smaxv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: smaxv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/smin-diagnostics.s b/test/MC/AArch64/SVE/smin-diagnostics.s
index 987650901ea..5f62a2c69b1 100644
--- a/test/MC/AArch64/SVE/smin-diagnostics.s
+++ b/test/MC/AArch64/SVE/smin-diagnostics.s
@@ -11,7 +11,7 @@ smin    z31.b, z31.b, #128
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 smin    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: smin    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/sminv-diagnostics.s b/test/MC/AArch64/SVE/sminv-diagnostics.s
index 5f8a4e011e0..cfb897ce239 100644
--- a/test/MC/AArch64/SVE/sminv-diagnostics.s
+++ b/test/MC/AArch64/SVE/sminv-diagnostics.s
@@ -29,7 +29,7 @@ sminv v0.2d, p7, z31.d
 // Invalid predicate
 
 sminv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sminv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/smulh-diagnostics.s b/test/MC/AArch64/SVE/smulh-diagnostics.s
index a856d32965d..47ac44aa892 100644
--- a/test/MC/AArch64/SVE/smulh-diagnostics.s
+++ b/test/MC/AArch64/SVE/smulh-diagnostics.s
@@ -14,6 +14,6 @@ smulh z0.b, p7/m, z1.b, z2.b
 // Invalid predicate
 
 smulh z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: smulh z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/splice-diagnostics.s b/test/MC/AArch64/SVE/splice-diagnostics.s
index 3cd659caad9..717e889ae8f 100644
--- a/test/MC/AArch64/SVE/splice-diagnostics.s
+++ b/test/MC/AArch64/SVE/splice-diagnostics.s
@@ -22,7 +22,7 @@ splice  z0.b, p0, z0.b, z2.h
 // Invalid predicate
 
 splice  z0.b, p8, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: splice  z0.b, p8, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st1b-diagnostics.s b/test/MC/AArch64/SVE/st1b-diagnostics.s
index 25f153c78ce..084df54bf1f 100644
--- a/test/MC/AArch64/SVE/st1b-diagnostics.s
+++ b/test/MC/AArch64/SVE/st1b-diagnostics.s
@@ -47,22 +47,22 @@ st1b z27.d, p1, [x12, #8, MUL VL]
 // Restricted predicate has range [0, 7].
 
 st1b z12.b, p8, [x27, #6, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1b z12.b, p8, [x27, #6, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 st1b z23.h, p8, [x20, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1b z23.h, p8, [x20, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 st1b z6.s, p8, [x0, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1b z6.s, p8, [x0, #8, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 st1b z14.d, p8, [x6, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1b z14.d, p8, [x6, #5, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st1d-diagnostics.s b/test/MC/AArch64/SVE/st1d-diagnostics.s
index 82f52ce5678..79a47e7bccd 100644
--- a/test/MC/AArch64/SVE/st1d-diagnostics.s
+++ b/test/MC/AArch64/SVE/st1d-diagnostics.s
@@ -18,7 +18,7 @@ st1d z16.d, p4, [x2, #8, MUL VL]
 // Restricted predicate has range [0, 7].
 
 st1d z12.d, p8, [x4, #14, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1d z12.d, p8, [x4, #14, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st1h-diagnostics.s b/test/MC/AArch64/SVE/st1h-diagnostics.s
index e58cd52c785..138ca47a44e 100644
--- a/test/MC/AArch64/SVE/st1h-diagnostics.s
+++ b/test/MC/AArch64/SVE/st1h-diagnostics.s
@@ -37,17 +37,17 @@ st1h z24.d, p3, [x16, #8, MUL VL]
 // Restricted predicate has range [0, 7].
 
 st1h z15.h, p8, [x0, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1h z15.h, p8, [x0, #8, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 st1h z17.s, p8, [x20, #2, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1h z17.s, p8, [x20, #2, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 st1h z15.d, p8, [x0, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1h z15.d, p8, [x0, #8, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st1w-diagnostics.s b/test/MC/AArch64/SVE/st1w-diagnostics.s
index a5c0f0517ec..7632922fb60 100644
--- a/test/MC/AArch64/SVE/st1w-diagnostics.s
+++ b/test/MC/AArch64/SVE/st1w-diagnostics.s
@@ -30,12 +30,12 @@ st1w z10.d, p5, [x26, #8, MUL VL]
 // Restricted predicate has range [0, 7].
 
 st1w z1.s, p8, [x3, #1, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1w z1.s, p8, [x3, #1, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 st1w z12.d, p8, [x26, #3, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st1w z12.d, p8, [x26, #3, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st2b-diagnostics.s b/test/MC/AArch64/SVE/st2b-diagnostics.s
index ac30bb47192..6e609514c41 100644
--- a/test/MC/AArch64/SVE/st2b-diagnostics.s
+++ b/test/MC/AArch64/SVE/st2b-diagnostics.s
@@ -54,10 +54,10 @@ st2b { z0.b, z1.b }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st2b {z2.b, z3.b}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st2b {z2.b, z3.b}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st2d-diagnostics.s b/test/MC/AArch64/SVE/st2d-diagnostics.s
index 301849f2ee0..019e0ca8fc2 100644
--- a/test/MC/AArch64/SVE/st2d-diagnostics.s
+++ b/test/MC/AArch64/SVE/st2d-diagnostics.s
@@ -59,10 +59,10 @@ st2d { z0.d, z1.d }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st2d {z2.d, z3.d}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st2d {z2.d, z3.d}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st2h-diagnostics.s b/test/MC/AArch64/SVE/st2h-diagnostics.s
index b22ae30c09c..ff5c23ea214 100644
--- a/test/MC/AArch64/SVE/st2h-diagnostics.s
+++ b/test/MC/AArch64/SVE/st2h-diagnostics.s
@@ -59,10 +59,10 @@ st2h { z0.h, z1.h }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st2h {z2.h, z3.h}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st2h {z2.h, z3.h}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st2w-diagnostics.s b/test/MC/AArch64/SVE/st2w-diagnostics.s
index 1e40d0a054c..96d3942189a 100644
--- a/test/MC/AArch64/SVE/st2w-diagnostics.s
+++ b/test/MC/AArch64/SVE/st2w-diagnostics.s
@@ -59,10 +59,10 @@ st2w { z0.s, z1.s }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st2w {z2.s, z3.s}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st2w {z2.s, z3.s}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st3b-diagnostics.s b/test/MC/AArch64/SVE/st3b-diagnostics.s
index 43016c0c314..8d1d2541614 100644
--- a/test/MC/AArch64/SVE/st3b-diagnostics.s
+++ b/test/MC/AArch64/SVE/st3b-diagnostics.s
@@ -54,10 +54,10 @@ st3b { z0.b, z1.b, z2.b }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st3b {z2.b, z3.b, z4.b}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st3b {z2.b, z3.b, z4.b}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st3d-diagnostics.s b/test/MC/AArch64/SVE/st3d-diagnostics.s
index ad089b2ceff..a129cf64777 100644
--- a/test/MC/AArch64/SVE/st3d-diagnostics.s
+++ b/test/MC/AArch64/SVE/st3d-diagnostics.s
@@ -59,10 +59,10 @@ st3d { z0.d, z1.d, z2.d }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st3d {z2.d, z3.d, z4.d}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st3d {z2.d, z3.d, z4.d}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st3h-diagnostics.s b/test/MC/AArch64/SVE/st3h-diagnostics.s
index aba5215defe..81ad8e582e6 100644
--- a/test/MC/AArch64/SVE/st3h-diagnostics.s
+++ b/test/MC/AArch64/SVE/st3h-diagnostics.s
@@ -59,10 +59,10 @@ st3h { z0.h, z1.h, z2.h }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st3h {z2.h, z3.h, z4.h}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st3h {z2.h, z3.h, z4.h}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st3w-diagnostics.s b/test/MC/AArch64/SVE/st3w-diagnostics.s
index 2e89901b6e1..5b21f224f36 100644
--- a/test/MC/AArch64/SVE/st3w-diagnostics.s
+++ b/test/MC/AArch64/SVE/st3w-diagnostics.s
@@ -59,10 +59,10 @@ st3w { z0.s, z1.s, z2.s }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st3w {z2.s, z3.s, z4.s}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st3w {z2.s, z3.s, z4.s}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st4b-diagnostics.s b/test/MC/AArch64/SVE/st4b-diagnostics.s
index dcd31b78a28..b5c8ce53b92 100644
--- a/test/MC/AArch64/SVE/st4b-diagnostics.s
+++ b/test/MC/AArch64/SVE/st4b-diagnostics.s
@@ -54,10 +54,10 @@ st4b { z0.b, z1.b, z2.b, z3.b }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st4b {z2.b, z3.b, z4.b, z5.b}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st4b {z2.b, z3.b, z4.b, z5.b}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st4d-diagnostics.s b/test/MC/AArch64/SVE/st4d-diagnostics.s
index e63c0c553b5..0073444778d 100644
--- a/test/MC/AArch64/SVE/st4d-diagnostics.s
+++ b/test/MC/AArch64/SVE/st4d-diagnostics.s
@@ -60,10 +60,10 @@ st4d { z0.d, z1.d, z2.d, z3.d }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st4d {z2.d, z3.d, z4.d, z5.d}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st4d {z2.d, z3.d, z4.d, z5.d}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st4h-diagnostics.s b/test/MC/AArch64/SVE/st4h-diagnostics.s
index 8d80eb2248c..2b012d0f9a7 100644
--- a/test/MC/AArch64/SVE/st4h-diagnostics.s
+++ b/test/MC/AArch64/SVE/st4h-diagnostics.s
@@ -59,10 +59,10 @@ st4h { z0.h, z1.h, z2.h, z3.h }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st4h {z2.h, z3.h, z4.h, z5.h}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st4h {z2.h, z3.h, z4.h, z5.h}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/st4w-diagnostics.s b/test/MC/AArch64/SVE/st4w-diagnostics.s
index 8c3816538b7..f3dba763024 100644
--- a/test/MC/AArch64/SVE/st4w-diagnostics.s
+++ b/test/MC/AArch64/SVE/st4w-diagnostics.s
@@ -59,10 +59,10 @@ st4w { z0.s, z1.s, z2.s, z3.s }, p0, [x0, w0, uxtw]
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 st4w {z2.s, z3.s, z4.s, z5.s}, p8, [x15, #10, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: st4w {z2.s, z3.s, z4.s, z5.s}, p8, [x15, #10, MUL VL]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/stnt1b-diagnostics.s b/test/MC/AArch64/SVE/stnt1b-diagnostics.s
index 0d0488d810e..fa67f299e44 100644
--- a/test/MC/AArch64/SVE/stnt1b-diagnostics.s
+++ b/test/MC/AArch64/SVE/stnt1b-diagnostics.s
@@ -37,7 +37,7 @@ stnt1b z0.d, p0, [x0]
 // invalid predicate
 
 stnt1b z27.b, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1b z27.b, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/stnt1d-diagnostics.s b/test/MC/AArch64/SVE/stnt1d-diagnostics.s
index a5cbfe1a934..2e0f2164323 100644
--- a/test/MC/AArch64/SVE/stnt1d-diagnostics.s
+++ b/test/MC/AArch64/SVE/stnt1d-diagnostics.s
@@ -37,7 +37,7 @@ stnt1d z0.s, p0, [x0]
 // invalid predicate
 
 stnt1d z27.d, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1d z27.d, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/stnt1h-diagnostics.s b/test/MC/AArch64/SVE/stnt1h-diagnostics.s
index 22fe5cb7dee..9999916f653 100644
--- a/test/MC/AArch64/SVE/stnt1h-diagnostics.s
+++ b/test/MC/AArch64/SVE/stnt1h-diagnostics.s
@@ -37,7 +37,7 @@ stnt1h z0.d, p0, [x0]
 // invalid predicate
 
 stnt1h z27.h, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1h z27.h, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/stnt1w-diagnostics.s b/test/MC/AArch64/SVE/stnt1w-diagnostics.s
index 339ea25c448..8d2173cd983 100644
--- a/test/MC/AArch64/SVE/stnt1w-diagnostics.s
+++ b/test/MC/AArch64/SVE/stnt1w-diagnostics.s
@@ -37,7 +37,7 @@ stnt1w z0.d, p0, [x0]
 // invalid predicate
 
 stnt1w z27.s, p8, [x0]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1w z27.s, p8, [x0]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/sub-diagnostics.s b/test/MC/AArch64/SVE/sub-diagnostics.s
index 2bd933735bb..31e91047cdd 100644
--- a/test/MC/AArch64/SVE/sub-diagnostics.s
+++ b/test/MC/AArch64/SVE/sub-diagnostics.s
@@ -31,25 +31,25 @@ sub z29.d, p7, z29.d, z8.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 sub z26.b, p8/m, z26.b, z27.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sub z26.b, p8/m, z26.b, z27.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sub z14.h, p8/m, z14.h, z18.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sub z14.h, p8/m, z14.h, z18.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sub z30.s, p8/m, z30.s, z23.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sub z30.s, p8/m, z30.s, z23.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sub z29.d, p8/m, z29.d, z3.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sub z29.d, p8/m, z29.d, z3.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/subr-diagnostics.s b/test/MC/AArch64/SVE/subr-diagnostics.s
index cf259ce17dd..102128af70c 100644
--- a/test/MC/AArch64/SVE/subr-diagnostics.s
+++ b/test/MC/AArch64/SVE/subr-diagnostics.s
@@ -25,25 +25,25 @@ subr z0.d, p7, z0.d, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 subr z26.b, p8/m, z26.b, z27.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: subr z26.b, p8/m, z26.b, z27.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 subr z14.h, p8/m, z14.h, z18.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: subr z14.h, p8/m, z14.h, z18.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 subr z30.s, p8/m, z30.s, z23.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: subr z30.s, p8/m, z30.s, z23.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 subr z29.d, p8/m, z29.d, z3.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: subr z29.d, p8/m, z29.d, z3.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/sxtb-diagnostics.s b/test/MC/AArch64/SVE/sxtb-diagnostics.s
index 4b951e0ea4a..0e8de5e5023 100644
--- a/test/MC/AArch64/SVE/sxtb-diagnostics.s
+++ b/test/MC/AArch64/SVE/sxtb-diagnostics.s
@@ -23,19 +23,19 @@ sxtb z0.b, p0/m, z0.b
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 sxtb z0.h, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sxtb z0.h, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sxtb z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sxtb z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sxtb z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sxtb z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/sxth-diagnostics.s b/test/MC/AArch64/SVE/sxth-diagnostics.s
index 63e22a386fc..7a48bbde3f4 100644
--- a/test/MC/AArch64/SVE/sxth-diagnostics.s
+++ b/test/MC/AArch64/SVE/sxth-diagnostics.s
@@ -28,14 +28,14 @@ sxth z0.h, p0/m, z0.h
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 sxth z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sxth z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sxth z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sxth z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/sxtw-diagnostics.s b/test/MC/AArch64/SVE/sxtw-diagnostics.s
index 33825a3f67a..277fdfa0477 100644
--- a/test/MC/AArch64/SVE/sxtw-diagnostics.s
+++ b/test/MC/AArch64/SVE/sxtw-diagnostics.s
@@ -33,10 +33,10 @@ sxtw z0.s, p0/m, z0.s
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 sxtw z0.d, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sxtw z0.d, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/uabd-diagnostics.s b/test/MC/AArch64/SVE/uabd-diagnostics.s
index a7dabc3483c..b374034c1e0 100644
--- a/test/MC/AArch64/SVE/uabd-diagnostics.s
+++ b/test/MC/AArch64/SVE/uabd-diagnostics.s
@@ -1,6 +1,6 @@
 // RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve  2>&1 < %s| FileCheck %s
 
 uabd    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uabd    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/uaddv-diagnostics.s b/test/MC/AArch64/SVE/uaddv-diagnostics.s
index 55ffc607582..adcf7e108eb 100644
--- a/test/MC/AArch64/SVE/uaddv-diagnostics.s
+++ b/test/MC/AArch64/SVE/uaddv-diagnostics.s
@@ -24,7 +24,7 @@ uaddv s0, p7, z31.s
 // Invalid predicate
 
 uaddv d0, p8, z31.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uaddv d0, p8, z31.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/ucvtf-diagnostics.s b/test/MC/AArch64/SVE/ucvtf-diagnostics.s
index 2025fc0f237..0cc91cf1a15 100644
--- a/test/MC/AArch64/SVE/ucvtf-diagnostics.s
+++ b/test/MC/AArch64/SVE/ucvtf-diagnostics.s
@@ -12,9 +12,9 @@ ucvtf    z0.d, p0/m, z0.h
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 ucvtf    z0.h, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ucvtf    z0.h, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/udiv-diagnostics.s b/test/MC/AArch64/SVE/udiv-diagnostics.s
index 8a5f6ec2b73..e1cd7126f13 100644
--- a/test/MC/AArch64/SVE/udiv-diagnostics.s
+++ b/test/MC/AArch64/SVE/udiv-diagnostics.s
@@ -28,6 +28,6 @@ udiv   z0.s, p7/m, z1.s, z2.s
 // Invalid predicate
 
 udiv   z0.s, p8/m, z0.s, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: udiv   z0.s, p8/m, z0.s, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/udivr-diagnostics.s b/test/MC/AArch64/SVE/udivr-diagnostics.s
index 07628682e72..de1c7e3e3a4 100644
--- a/test/MC/AArch64/SVE/udivr-diagnostics.s
+++ b/test/MC/AArch64/SVE/udivr-diagnostics.s
@@ -28,6 +28,6 @@ udivr  z0.s, p7/m, z1.s, z2.s
 // Invalid predicate
 
 udivr  z0.s, p8/m, z0.s, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: udivr  z0.s, p8/m, z0.s, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE/umax-diagnostics.s b/test/MC/AArch64/SVE/umax-diagnostics.s
index 628b8b2a7e5..38818ea006f 100644
--- a/test/MC/AArch64/SVE/umax-diagnostics.s
+++ b/test/MC/AArch64/SVE/umax-diagnostics.s
@@ -11,7 +11,7 @@ umax    z31.b, z31.b, #256
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 umax    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: umax    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/umaxv-diagnostics.s b/test/MC/AArch64/SVE/umaxv-diagnostics.s
index 36512f7568d..c8f82f29f35 100644
--- a/test/MC/AArch64/SVE/umaxv-diagnostics.s
+++ b/test/MC/AArch64/SVE/umaxv-diagnostics.s
@@ -29,7 +29,7 @@ umaxv v0.2d, p7, z31.d
 // Invalid predicate
 
 umaxv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: umaxv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/umin-diagnostics.s b/test/MC/AArch64/SVE/umin-diagnostics.s
index ce60edf4557..d9249ee980b 100644
--- a/test/MC/AArch64/SVE/umin-diagnostics.s
+++ b/test/MC/AArch64/SVE/umin-diagnostics.s
@@ -11,7 +11,7 @@ umin    z31.b, z31.b, #256
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 umin    z0.b, p8/m, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: umin    z0.b, p8/m, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/uminv-diagnostics.s b/test/MC/AArch64/SVE/uminv-diagnostics.s
index f6898352a93..22298b0cb69 100644
--- a/test/MC/AArch64/SVE/uminv-diagnostics.s
+++ b/test/MC/AArch64/SVE/uminv-diagnostics.s
@@ -29,7 +29,7 @@ uminv v0.2d, p7, z31.d
 // Invalid predicate
 
 uminv h0, p8, z31.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uminv h0, p8, z31.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE/umulh-diagnostics.s b/test/MC/AArch64/SVE/umulh-diagnostics.s
index b2cf7457cf5..e263a6d4420 100644
--- a/test/MC/AArch64/SVE/umulh-diagnostics.s
+++ b/test/MC/AArch64/SVE/umulh-diagnostics.s
@@ -14,6 +14,6 @@ umulh z0.b, p7/m, z1.b, z2.b
 // Invalid predicate
 
 umulh z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: umulh z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/addp-diagnostics.s b/test/MC/AArch64/SVE2/addp-diagnostics.s
index 98538a1c043..9c6f0a9ebbf 100644
--- a/test/MC/AArch64/SVE2/addp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/addp-diagnostics.s
@@ -32,6 +32,6 @@ addp z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 addp z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: addp z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/faddp-diagnostics.s b/test/MC/AArch64/SVE2/faddp-diagnostics.s
index 99d4f5eefe4..cc98dd691f7 100644
--- a/test/MC/AArch64/SVE2/faddp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/faddp-diagnostics.s
@@ -45,6 +45,6 @@ faddp z0.h, p0/z, z0.h, z1.h
 // Predicate not in restricted predicate range
 
 faddp z0.h, p8/m, z0.h, z1.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: faddp z0.h, p8/m, z0.h, z1.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/fcvtlt-diagnostics.s b/test/MC/AArch64/SVE2/fcvtlt-diagnostics.s
index de9a1b9c947..01ff152191f 100644
--- a/test/MC/AArch64/SVE2/fcvtlt-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fcvtlt-diagnostics.s
@@ -48,7 +48,7 @@ fcvtlt z0.s, p0/z, z0.h
 // Predicate not in restricted predicate range
 
 fcvtlt z0.s, p8/m, z0.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcvtlt z0.s, p8/m, z0.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/fcvtnt-diagnostics.s b/test/MC/AArch64/SVE2/fcvtnt-diagnostics.s
index b01caf00590..abfdea8c485 100644
--- a/test/MC/AArch64/SVE2/fcvtnt-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fcvtnt-diagnostics.s
@@ -48,7 +48,7 @@ fcvtnt z0.h, p0/z, z0.s
 // Predicate not in restricted predicate range
 
 fcvtnt z0.h, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcvtnt z0.h, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/fcvtx-diagnostics.s b/test/MC/AArch64/SVE2/fcvtx-diagnostics.s
index 4c6ee7ad4c2..5f365496033 100644
--- a/test/MC/AArch64/SVE2/fcvtx-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fcvtx-diagnostics.s
@@ -35,9 +35,9 @@ fcvtx   z0.s, p0/z, z0.d
 
 
 // --------------------------------------------------------------------------//
-// error: restricted predicate has range [0, 7].
+// error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 
 fcvtx    z0.s, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcvtx    z0.s, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/fcvtxnt-diagnostics.s b/test/MC/AArch64/SVE2/fcvtxnt-diagnostics.s
index 60f85f4df68..e5903fdd379 100644
--- a/test/MC/AArch64/SVE2/fcvtxnt-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fcvtxnt-diagnostics.s
@@ -53,7 +53,7 @@ fcvtxnt z0.s, p0/z, z0.d
 // Predicate not in restricted predicate range
 
 fcvtxnt z0.s, p8/m, z0.d
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fcvtxnt z0.s, p8/m, z0.d
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/flogb-diagnostics.s b/test/MC/AArch64/SVE2/flogb-diagnostics.s
index 76608787c37..ddb8c4ff35b 100644
--- a/test/MC/AArch64/SVE2/flogb-diagnostics.s
+++ b/test/MC/AArch64/SVE2/flogb-diagnostics.s
@@ -23,6 +23,6 @@ flogb   z0.s, p0/z, z0.s
 // Predicate not in restricted predicate range
 
 flogb   z0.s, p8/m, z0.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: flogb   z0.s, p8/m, z0.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/fmaxnmp-diagnostics.s b/test/MC/AArch64/SVE2/fmaxnmp-diagnostics.s
index 2d51333416a..a25202796c2 100644
--- a/test/MC/AArch64/SVE2/fmaxnmp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fmaxnmp-diagnostics.s
@@ -45,6 +45,6 @@ fmaxnmp z0.h, p0/z, z0.h, z1.h
 // Predicate not in restricted predicate range
 
 fmaxnmp z0.h, p8/m, z0.h, z1.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmaxnmp z0.h, p8/m, z0.h, z1.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/fmaxp-diagnostics.s b/test/MC/AArch64/SVE2/fmaxp-diagnostics.s
index 6165e74878b..d68f296575a 100644
--- a/test/MC/AArch64/SVE2/fmaxp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fmaxp-diagnostics.s
@@ -45,6 +45,6 @@ fmaxp z0.h, p0/z, z0.h, z1.h
 // Predicate not in restricted predicate range
 
 fmaxp z0.h, p8/m, z0.h, z1.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fmaxp z0.h, p8/m, z0.h, z1.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/fminnmp-diagnostics.s b/test/MC/AArch64/SVE2/fminnmp-diagnostics.s
index 2338816d06d..5784de1e6f7 100644
--- a/test/MC/AArch64/SVE2/fminnmp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fminnmp-diagnostics.s
@@ -45,6 +45,6 @@ fminnmp z0.h, p0/z, z0.h, z1.h
 // Predicate not in restricted predicate range
 
 fminnmp z0.h, p8/m, z0.h, z1.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fminnmp z0.h, p8/m, z0.h, z1.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/fminp-diagnostics.s b/test/MC/AArch64/SVE2/fminp-diagnostics.s
index cc55a2652fb..d397a4a0d1c 100644
--- a/test/MC/AArch64/SVE2/fminp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/fminp-diagnostics.s
@@ -45,6 +45,6 @@ fminp z0.h, p0/z, z0.h, z1.h
 // Predicate not in restricted predicate range
 
 fminp z0.h, p8/m, z0.h, z1.h
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: fminp z0.h, p8/m, z0.h, z1.h
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/histcnt-diagnostics.s b/test/MC/AArch64/SVE2/histcnt-diagnostics.s
index 9bbbd6b927c..59bffa608d2 100644
--- a/test/MC/AArch64/SVE2/histcnt-diagnostics.s
+++ b/test/MC/AArch64/SVE2/histcnt-diagnostics.s
@@ -28,7 +28,7 @@ histcnt z0.s, p0/m, z1.s, z2.s
 // Predicate not in restricted predicate range
 
 histcnt z0.s, p8/z, z1.s, z2.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: histcnt z0.s, p8/z, z1.s, z2.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/ldnt1b-diagnostics.s b/test/MC/AArch64/SVE2/ldnt1b-diagnostics.s
index 6f50516a6e8..bd4cf647a03 100644
--- a/test/MC/AArch64/SVE2/ldnt1b-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ldnt1b-diagnostics.s
@@ -51,7 +51,7 @@ ldnt1b { z0.d }, p0/m, [z0.d]
 // restricted predicate has range [0, 7].
 
 ldnt1b { z27.d }, p8/z, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1b { z27.d }, p8/z, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/ldnt1d-diagnostics.s b/test/MC/AArch64/SVE2/ldnt1d-diagnostics.s
index 15381a64f86..92e7577c873 100644
--- a/test/MC/AArch64/SVE2/ldnt1d-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ldnt1d-diagnostics.s
@@ -51,7 +51,7 @@ ldnt1d { z0.d }, p0/m, [z0.d]
 // restricted predicate has range [0, 7].
 
 ldnt1d { z27.d }, p8/z, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1d { z27.d }, p8/z, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/ldnt1h-diagnostics.s b/test/MC/AArch64/SVE2/ldnt1h-diagnostics.s
index f73d6a344e6..c8f11d98588 100644
--- a/test/MC/AArch64/SVE2/ldnt1h-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ldnt1h-diagnostics.s
@@ -51,7 +51,7 @@ ldnt1h { z0.d }, p0/m, [z0.d]
 // restricted predicate has range [0, 7].
 
 ldnt1h { z27.d }, p8/z, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1h { z27.d }, p8/z, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/ldnt1sb-diagnostics.s b/test/MC/AArch64/SVE2/ldnt1sb-diagnostics.s
index a679e407986..7d23d983823 100644
--- a/test/MC/AArch64/SVE2/ldnt1sb-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ldnt1sb-diagnostics.s
@@ -51,7 +51,7 @@ ldnt1sb { z0.d }, p0/m, [z0.d]
 // restricted predicate has range [0, 7].
 
 ldnt1sb { z27.d }, p8/z, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1sb { z27.d }, p8/z, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/ldnt1sh-diagnostics.s b/test/MC/AArch64/SVE2/ldnt1sh-diagnostics.s
index 07b1f69236f..a59bd47fa25 100644
--- a/test/MC/AArch64/SVE2/ldnt1sh-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ldnt1sh-diagnostics.s
@@ -51,7 +51,7 @@ ldnt1sh { z0.d }, p0/m, [z0.d]
 // restricted predicate has range [0, 7].
 
 ldnt1sh { z27.d }, p8/z, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1sh { z27.d }, p8/z, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/ldnt1sw-diagnostics.s b/test/MC/AArch64/SVE2/ldnt1sw-diagnostics.s
index a86bc5a8d9f..5fa2c697e5d 100644
--- a/test/MC/AArch64/SVE2/ldnt1sw-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ldnt1sw-diagnostics.s
@@ -51,7 +51,7 @@ ldnt1sw { z0.d }, p0/m, [z0.d]
 // restricted predicate has range [0, 7].
 
 ldnt1sw { z27.d }, p8/z, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1sw { z27.d }, p8/z, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/ldnt1w-diagnostics.s b/test/MC/AArch64/SVE2/ldnt1w-diagnostics.s
index b393f40520d..42ea691ce35 100644
--- a/test/MC/AArch64/SVE2/ldnt1w-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ldnt1w-diagnostics.s
@@ -51,7 +51,7 @@ ldnt1w { z0.d }, p0/m, [z0.d]
 // restricted predicate has range [0, 7].
 
 ldnt1w { z27.d }, p8/z, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ldnt1w { z27.d }, p8/z, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/match-diagnostics.s b/test/MC/AArch64/SVE2/match-diagnostics.s
index 349747fdeb4..d123d2ef25d 100644
--- a/test/MC/AArch64/SVE2/match-diagnostics.s
+++ b/test/MC/AArch64/SVE2/match-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 match p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: match p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/nmatch-diagnostics.s b/test/MC/AArch64/SVE2/nmatch-diagnostics.s
index e53b9e62998..06f9f9f8a2f 100644
--- a/test/MC/AArch64/SVE2/nmatch-diagnostics.s
+++ b/test/MC/AArch64/SVE2/nmatch-diagnostics.s
@@ -4,7 +4,7 @@
 // Restricted predicate out of range.
 
 nmatch p0.b, p8/z, z0.b, z0.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: nmatch p0.b, p8/z, z0.b, z0.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/sadalp-diagnostics.s b/test/MC/AArch64/SVE2/sadalp-diagnostics.s
index bc3a78ce36f..c7615ef87da 100644
--- a/test/MC/AArch64/SVE2/sadalp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sadalp-diagnostics.s
@@ -28,7 +28,7 @@ sadalp z0.d, p0/m, z1.d
 // Predicate not in restricted predicate range
 
 sadalp z0.h, p8/m, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sadalp z0.h, p8/m, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/shadd-diagnostics.s b/test/MC/AArch64/SVE2/shadd-diagnostics.s
index 065c366b532..4cbedaed4b5 100644
--- a/test/MC/AArch64/SVE2/shadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/shadd-diagnostics.s
@@ -32,6 +32,6 @@ shadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 shadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: shadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/shsub-diagnostics.s b/test/MC/AArch64/SVE2/shsub-diagnostics.s
index d1b0a18b1fa..0894fea24f8 100644
--- a/test/MC/AArch64/SVE2/shsub-diagnostics.s
+++ b/test/MC/AArch64/SVE2/shsub-diagnostics.s
@@ -32,6 +32,6 @@ shsub z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 shsub z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: shsub z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/shsubr-diagnostics.s b/test/MC/AArch64/SVE2/shsubr-diagnostics.s
index f5f9ba3f524..d1acf787ebd 100644
--- a/test/MC/AArch64/SVE2/shsubr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/shsubr-diagnostics.s
@@ -32,6 +32,6 @@ shsubr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 shsubr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: shsubr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/smaxp-diagnostics.s b/test/MC/AArch64/SVE2/smaxp-diagnostics.s
index 93c824ed654..1b2b7c75f51 100644
--- a/test/MC/AArch64/SVE2/smaxp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/smaxp-diagnostics.s
@@ -32,6 +32,6 @@ smaxp z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 smaxp z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: smaxp z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sminp-diagnostics.s b/test/MC/AArch64/SVE2/sminp-diagnostics.s
index 3a2152ae073..4407994f6b5 100644
--- a/test/MC/AArch64/SVE2/sminp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sminp-diagnostics.s
@@ -32,6 +32,6 @@ sminp z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sminp z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sminp z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/splice-diagnostics.s b/test/MC/AArch64/SVE2/splice-diagnostics.s
index caab6e1d03e..70666b3d969 100644
--- a/test/MC/AArch64/SVE2/splice-diagnostics.s
+++ b/test/MC/AArch64/SVE2/splice-diagnostics.s
@@ -62,7 +62,7 @@ splice z0.b, p0/m, { z1.b, z2.b }
 // Predicate not in restricted predicate range
 
 splice z0.b, p8, { z1.b, z2.b }
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: splice z0.b, p8, { z1.b, z2.b }
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/sqabs-diagnostics.s b/test/MC/AArch64/SVE2/sqabs-diagnostics.s
index 2b51870061a..8b3a136a7d7 100644
--- a/test/MC/AArch64/SVE2/sqabs-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqabs-diagnostics.s
@@ -9,7 +9,7 @@ sqabs z0.s, p0/z, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqabs z0.s, p8/m, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqabs z0.s, p8/m, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/sqadd-diagnostics.s b/test/MC/AArch64/SVE2/sqadd-diagnostics.s
index 4ba83c1e42e..cc13479b958 100644
--- a/test/MC/AArch64/SVE2/sqadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqadd-diagnostics.s
@@ -32,6 +32,6 @@ sqadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sqneg-diagnostics.s b/test/MC/AArch64/SVE2/sqneg-diagnostics.s
index a078a139aae..7b0f5722b94 100644
--- a/test/MC/AArch64/SVE2/sqneg-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqneg-diagnostics.s
@@ -9,7 +9,7 @@ sqneg z0.s, p0/z, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqneg z0.s, p8/m, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqneg z0.s, p8/m, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/sqrshl-diagnostics.s b/test/MC/AArch64/SVE2/sqrshl-diagnostics.s
index b56264a3cf0..39a980d614c 100644
--- a/test/MC/AArch64/SVE2/sqrshl-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqrshl-diagnostics.s
@@ -32,6 +32,6 @@ sqrshl z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqrshl z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqrshl z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sqrshlr-diagnostics.s b/test/MC/AArch64/SVE2/sqrshlr-diagnostics.s
index 76f7d155f3d..6444e4d6b64 100644
--- a/test/MC/AArch64/SVE2/sqrshlr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqrshlr-diagnostics.s
@@ -32,6 +32,6 @@ sqrshlr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqrshlr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqrshlr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sqshl-diagnostics.s b/test/MC/AArch64/SVE2/sqshl-diagnostics.s
index 565cbf19c77..1f78eaf0846 100644
--- a/test/MC/AArch64/SVE2/sqshl-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqshl-diagnostics.s
@@ -88,11 +88,11 @@ sqshl z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqshl z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqshl z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqshl z0.b, p8/m, z0.b, #0
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqshl z0.b, p8/m, z0.b, #0
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sqshlr-diagnostics.s b/test/MC/AArch64/SVE2/sqshlr-diagnostics.s
index a33ea84e548..20588f58cbb 100644
--- a/test/MC/AArch64/SVE2/sqshlr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqshlr-diagnostics.s
@@ -32,6 +32,6 @@ sqshlr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqshlr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqshlr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sqshlu-diagnostics.s b/test/MC/AArch64/SVE2/sqshlu-diagnostics.s
index 0c2601a598a..3158d91e7e5 100644
--- a/test/MC/AArch64/SVE2/sqshlu-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqshlu-diagnostics.s
@@ -73,6 +73,6 @@ sqshlu z0.b, p0/z, z0.b, #0
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqshlu z0.b, p8/m, z0.b, #0
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqshlu z0.b, p8/m, z0.b, #0
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sqsub-diagnostics.s b/test/MC/AArch64/SVE2/sqsub-diagnostics.s
index 9960dde0201..9fe7a1836a3 100644
--- a/test/MC/AArch64/SVE2/sqsub-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqsub-diagnostics.s
@@ -32,6 +32,6 @@ sqsub z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqsub z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqsub z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/sqsubr-diagnostics.s b/test/MC/AArch64/SVE2/sqsubr-diagnostics.s
index af7caaa67ab..89cae5874a1 100644
--- a/test/MC/AArch64/SVE2/sqsubr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/sqsubr-diagnostics.s
@@ -32,6 +32,6 @@ sqsubr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 sqsubr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: sqsubr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/srhadd-diagnostics.s b/test/MC/AArch64/SVE2/srhadd-diagnostics.s
index 60fafa11b5b..14d687f756f 100644
--- a/test/MC/AArch64/SVE2/srhadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/srhadd-diagnostics.s
@@ -32,6 +32,6 @@ srhadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 srhadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: srhadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/srshl-diagnostics.s b/test/MC/AArch64/SVE2/srshl-diagnostics.s
index 6d599aa08df..0377d1fabcb 100644
--- a/test/MC/AArch64/SVE2/srshl-diagnostics.s
+++ b/test/MC/AArch64/SVE2/srshl-diagnostics.s
@@ -32,6 +32,6 @@ srshl z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 srshl z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: srshl z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/srshlr-diagnostics.s b/test/MC/AArch64/SVE2/srshlr-diagnostics.s
index f1f760da9c6..abc218d1b5c 100644
--- a/test/MC/AArch64/SVE2/srshlr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/srshlr-diagnostics.s
@@ -32,6 +32,6 @@ srshlr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 srshlr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: srshlr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/srshr-diagnostics.s b/test/MC/AArch64/SVE2/srshr-diagnostics.s
index 0440f08a364..3bc067ae31d 100644
--- a/test/MC/AArch64/SVE2/srshr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/srshr-diagnostics.s
@@ -73,6 +73,6 @@ srshr z0.b, p0/z, z0.b, #1
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 srshr z0.b, p8/m, z0.b, #1
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: srshr z0.b, p8/m, z0.b, #1
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/stnt1b-diagnostics.s b/test/MC/AArch64/SVE2/stnt1b-diagnostics.s
index dbf30a6cc0f..659c8f5f3bd 100644
--- a/test/MC/AArch64/SVE2/stnt1b-diagnostics.s
+++ b/test/MC/AArch64/SVE2/stnt1b-diagnostics.s
@@ -42,7 +42,7 @@ stnt1b { z0.d }, p0, [z0.d, z1.d]
 // restricted predicate has range [0, 7].
 
 stnt1b { z27.d }, p8, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1b { z27.d }, p8, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/stnt1d-diagnostics.s b/test/MC/AArch64/SVE2/stnt1d-diagnostics.s
index c5be82611c5..b94824f4e49 100644
--- a/test/MC/AArch64/SVE2/stnt1d-diagnostics.s
+++ b/test/MC/AArch64/SVE2/stnt1d-diagnostics.s
@@ -42,7 +42,7 @@ stnt1d { z0.d }, p0, [z0.d, z1.d]
 // restricted predicate has range [0, 7].
 
 stnt1d { z27.d }, p8, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1d { z27.d }, p8, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/stnt1h-diagnostics.s b/test/MC/AArch64/SVE2/stnt1h-diagnostics.s
index db60d05b7c7..bfb52ab81b9 100644
--- a/test/MC/AArch64/SVE2/stnt1h-diagnostics.s
+++ b/test/MC/AArch64/SVE2/stnt1h-diagnostics.s
@@ -42,7 +42,7 @@ stnt1h { z0.d }, p0, [z0.d, z1.d]
 // restricted predicate has range [0, 7].
 
 stnt1h { z27.d }, p8, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1h { z27.d }, p8, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/stnt1w-diagnostics.s b/test/MC/AArch64/SVE2/stnt1w-diagnostics.s
index c552e36edce..51a3c458c60 100644
--- a/test/MC/AArch64/SVE2/stnt1w-diagnostics.s
+++ b/test/MC/AArch64/SVE2/stnt1w-diagnostics.s
@@ -42,7 +42,7 @@ stnt1w { z0.d }, p0, [z0.d, z1.d]
 // restricted predicate has range [0, 7].
 
 stnt1w { z27.d }, p8, [z0.d]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: stnt1w { z27.d }, p8, [z0.d]
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/suqadd-diagnostics.s b/test/MC/AArch64/SVE2/suqadd-diagnostics.s
index 9faa706b69c..66dc11a536f 100644
--- a/test/MC/AArch64/SVE2/suqadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/suqadd-diagnostics.s
@@ -32,6 +32,6 @@ suqadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 suqadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: suqadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uadalp-diagnostics.s b/test/MC/AArch64/SVE2/uadalp-diagnostics.s
index 8b44cfa0239..3307d3519a9 100644
--- a/test/MC/AArch64/SVE2/uadalp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uadalp-diagnostics.s
@@ -28,7 +28,7 @@ uadalp z0.d, p0/m, z1.d
 // Predicate not in restricted predicate range
 
 uadalp z0.h, p8/m, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uadalp z0.h, p8/m, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/uhadd-diagnostics.s b/test/MC/AArch64/SVE2/uhadd-diagnostics.s
index 9f5b6208c93..c99b86312e9 100644
--- a/test/MC/AArch64/SVE2/uhadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uhadd-diagnostics.s
@@ -32,6 +32,6 @@ uhadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uhadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uhadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uhsub-diagnostics.s b/test/MC/AArch64/SVE2/uhsub-diagnostics.s
index 293e206bf9f..614bc44edc1 100644
--- a/test/MC/AArch64/SVE2/uhsub-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uhsub-diagnostics.s
@@ -32,6 +32,6 @@ uhsub z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uhsub z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uhsub z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uhsubr-diagnostics.s b/test/MC/AArch64/SVE2/uhsubr-diagnostics.s
index 75b3c3b625c..ccad82a60ce 100644
--- a/test/MC/AArch64/SVE2/uhsubr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uhsubr-diagnostics.s
@@ -32,6 +32,6 @@ uhsubr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uhsubr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uhsubr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/umaxp-diagnostics.s b/test/MC/AArch64/SVE2/umaxp-diagnostics.s
index 80f59b93b1d..751efa37db0 100644
--- a/test/MC/AArch64/SVE2/umaxp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/umaxp-diagnostics.s
@@ -32,6 +32,6 @@ umaxp z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 umaxp z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: umaxp z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uminp-diagnostics.s b/test/MC/AArch64/SVE2/uminp-diagnostics.s
index fe0f102c77d..46a887fc078 100644
--- a/test/MC/AArch64/SVE2/uminp-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uminp-diagnostics.s
@@ -32,6 +32,6 @@ uminp z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uminp z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uminp z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uqadd-diagnostics.s b/test/MC/AArch64/SVE2/uqadd-diagnostics.s
index c08a0cc4b46..1697bbebddf 100644
--- a/test/MC/AArch64/SVE2/uqadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uqadd-diagnostics.s
@@ -32,6 +32,6 @@ uqadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uqrshl-diagnostics.s b/test/MC/AArch64/SVE2/uqrshl-diagnostics.s
index 120ad54deb0..0a42d53c22f 100644
--- a/test/MC/AArch64/SVE2/uqrshl-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uqrshl-diagnostics.s
@@ -32,6 +32,6 @@ uqrshl z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqrshl z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqrshl z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uqrshlr-diagnostics.s b/test/MC/AArch64/SVE2/uqrshlr-diagnostics.s
index b235ae8aaa5..84ecdfa4264 100644
--- a/test/MC/AArch64/SVE2/uqrshlr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uqrshlr-diagnostics.s
@@ -32,6 +32,6 @@ uqrshlr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqrshlr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqrshlr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uqshl-diagnostics.s b/test/MC/AArch64/SVE2/uqshl-diagnostics.s
index e3a44cb05b9..96fa1ec510c 100644
--- a/test/MC/AArch64/SVE2/uqshl-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uqshl-diagnostics.s
@@ -88,11 +88,11 @@ uqshl z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqshl z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqshl z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqshl z0.b, p8/m, z0.b, #0
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqshl z0.b, p8/m, z0.b, #0
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uqshlr-diagnostics.s b/test/MC/AArch64/SVE2/uqshlr-diagnostics.s
index c8006eab6f1..d08f2ceb489 100644
--- a/test/MC/AArch64/SVE2/uqshlr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uqshlr-diagnostics.s
@@ -32,6 +32,6 @@ uqshlr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqshlr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqshlr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uqsub-diagnostics.s b/test/MC/AArch64/SVE2/uqsub-diagnostics.s
index 486c458d43e..453fec05d23 100644
--- a/test/MC/AArch64/SVE2/uqsub-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uqsub-diagnostics.s
@@ -32,6 +32,6 @@ uqsub z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqsub z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqsub z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/uqsubr-diagnostics.s b/test/MC/AArch64/SVE2/uqsubr-diagnostics.s
index e6300a2e54b..8d56faae74c 100644
--- a/test/MC/AArch64/SVE2/uqsubr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/uqsubr-diagnostics.s
@@ -32,6 +32,6 @@ uqsubr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 uqsubr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: uqsubr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/urecpe-diagnostics.s b/test/MC/AArch64/SVE2/urecpe-diagnostics.s
index 71bece5ea46..f04538494cd 100644
--- a/test/MC/AArch64/SVE2/urecpe-diagnostics.s
+++ b/test/MC/AArch64/SVE2/urecpe-diagnostics.s
@@ -9,7 +9,7 @@ urecpe z0.s, p0/z, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 urecpe z0.s, p8/m, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: urecpe z0.s, p8/m, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/urhadd-diagnostics.s b/test/MC/AArch64/SVE2/urhadd-diagnostics.s
index b350f532827..b466615c460 100644
--- a/test/MC/AArch64/SVE2/urhadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/urhadd-diagnostics.s
@@ -32,6 +32,6 @@ urhadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 urhadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: urhadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/urshl-diagnostics.s b/test/MC/AArch64/SVE2/urshl-diagnostics.s
index d1ec794871d..143f56a9801 100644
--- a/test/MC/AArch64/SVE2/urshl-diagnostics.s
+++ b/test/MC/AArch64/SVE2/urshl-diagnostics.s
@@ -32,6 +32,6 @@ urshl z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 urshl z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: urshl z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/urshlr-diagnostics.s b/test/MC/AArch64/SVE2/urshlr-diagnostics.s
index 2241eb3885d..bde46a9f260 100644
--- a/test/MC/AArch64/SVE2/urshlr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/urshlr-diagnostics.s
@@ -32,6 +32,6 @@ urshlr z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 urshlr z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: urshlr z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/urshr-diagnostics.s b/test/MC/AArch64/SVE2/urshr-diagnostics.s
index f021bb9de7a..203d153d671 100644
--- a/test/MC/AArch64/SVE2/urshr-diagnostics.s
+++ b/test/MC/AArch64/SVE2/urshr-diagnostics.s
@@ -73,6 +73,6 @@ urshr z0.b, p0/z, z0.b, #1
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 urshr z0.b, p8/m, z0.b, #1
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: urshr z0.b, p8/m, z0.b, #1
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/test/MC/AArch64/SVE2/ursqrte-diagnostics.s b/test/MC/AArch64/SVE2/ursqrte-diagnostics.s
index 43cdefe4d23..2190ff1ebd8 100644
--- a/test/MC/AArch64/SVE2/ursqrte-diagnostics.s
+++ b/test/MC/AArch64/SVE2/ursqrte-diagnostics.s
@@ -9,7 +9,7 @@ ursqrte z0.s, p0/z, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 ursqrte z0.s, p8/m, z1.s
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: ursqrte z0.s, p8/m, z1.s
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
diff --git a/test/MC/AArch64/SVE2/usqadd-diagnostics.s b/test/MC/AArch64/SVE2/usqadd-diagnostics.s
index 4c7271f9830..491faf5e679 100644
--- a/test/MC/AArch64/SVE2/usqadd-diagnostics.s
+++ b/test/MC/AArch64/SVE2/usqadd-diagnostics.s
@@ -32,6 +32,6 @@ usqadd z0.b, p0/z, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
 
 usqadd z0.b, p8/m, z0.b, z1.b
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: restricted predicate has range [0, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid restricted predicate register, expected p0..p7 (without element suffix)
 // CHECK-NEXT: usqadd z0.b, p8/m, z0.b, z1.b
 // CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: