[llvm-branch-commits] [llvm] [AArch64][llvm] Fix incorrect diagnostic (index/immediate in simm9) (PR #229563)
Jonathan Thackray via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Oct 12 01:56:42 PDT 2026
https://github.com/jthackray updated https://github.com/llvm/llvm-project/pull/229563
>From 9ddcac8432a52c166fa60cf11e081be55e88c7eb Mon Sep 17 00:00:00 2001
From: Jonathan Thackray <jonathan.thackray at arm.com>
Date: Tue, 6 Oct 2026 20:33:36 +0100
Subject: [PATCH 1/3] [AArch64][llvm] Fix incorrect diagnostic (index/immediate
in simm9)
Improve the error message in the simm9 diagnostics and use the word
'immediate' instead of 'index'. This was noticed when creating the
CFLT instructions for Armv9.8-A, but would have caused a lot of
unrelated churn if merged as part of that change.
Co-authored-by: Martin Wehking <martin.wehking at arm.com>
---
.../AArch64/AsmParser/AArch64AsmParser.cpp | 2 +-
llvm/test/MC/AArch64/SVE/ldr-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/str-diagnostics.s | 8 +-
llvm/test/MC/AArch64/arm64-diags.s | 10 +-
llvm/test/MC/AArch64/armv8.4a-ldst-error.s | 78 ++++-----
.../MC/AArch64/armv9.8a-cflt-diagnostics.s | 4 +-
llvm/test/MC/AArch64/basic-a64-diagnostics.s | 164 +++++++++---------
7 files changed, 137 insertions(+), 137 deletions(-)
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 14c85dc7547cb..2af084e3c8377 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -6017,7 +6017,7 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
case Match_InvalidMemoryIndexedSImm8:
return Error(Loc, "index must be an integer in range [-128, 127].");
case Match_InvalidMemoryIndexedSImm9:
- return Error(Loc, "index must be an integer in range [-256, 255].");
+ return Error(Loc, "immediate must be an integer in range [-256, 255].");
case Match_InvalidMemoryIndexed16SImm9:
return Error(Loc, "index must be a multiple of 16 in range [-4096, 4080].");
case Match_InvalidMemoryIndexed8SImm10:
diff --git a/llvm/test/MC/AArch64/SVE/ldr-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldr-diagnostics.s
index b025465f6e638..add3b6af8abea 100644
--- a/llvm/test/MC/AArch64/SVE/ldr-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldr-diagnostics.s
@@ -4,22 +4,22 @@
// Immediate out of upper bound [-256, 255].
ldr p0, [x0, #-257, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: ldr p0, [x0, #-257, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldr p0, [x0, #256, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: ldr p0, [x0, #256, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldr z0, [x0, #-257, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: ldr z0, [x0, #-257, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldr z0, [x0, #256, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: ldr z0, [x0, #256, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/str-diagnostics.s b/llvm/test/MC/AArch64/SVE/str-diagnostics.s
index f49eb01642ffc..61fc99084448b 100644
--- a/llvm/test/MC/AArch64/SVE/str-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/str-diagnostics.s
@@ -4,22 +4,22 @@
// Immediate out of upper bound [-256, 255].
str p0, [x0, #-257, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: str p0, [x0, #-257, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
str p0, [x0, #256, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: str p0, [x0, #256, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
str z0, [x0, #-257, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: str z0, [x0, #-257, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
str z0, [x0, #256, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-256, 255].
// CHECK-NEXT: str z0, [x0, #256, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/arm64-diags.s b/llvm/test/MC/AArch64/arm64-diags.s
index 0581703b2f9bf..d364f71ce8c6f 100644
--- a/llvm/test/MC/AArch64/arm64-diags.s
+++ b/llvm/test/MC/AArch64/arm64-diags.s
@@ -33,19 +33,19 @@ foo:
ldur x0, [x1, #-257]
-; CHECK-ERRORS: error: index must be an integer in range [-256, 255].
+; CHECK-ERRORS: error: immediate must be an integer in range [-256, 255].
; CHECK-ERRORS: ldr x0, [x0, #804]
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be an integer in range [-256, 255].
+; CHECK-ERRORS: error: immediate must be an integer in range [-256, 255].
; CHECK-ERRORS: ldr w0, [x0, #802]
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be an integer in range [-256, 255].
+; CHECK-ERRORS: error: immediate must be an integer in range [-256, 255].
; CHECK-ERRORS: ldr x0, [x0, #804]!
; CHECK-ERRORS: ^
; CHECK-ERRORS: error: invalid operand for instruction
; CHECK-ERRORS: ldr w0, [w0, #301]!
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be an integer in range [-256, 255].
+; CHECK-ERRORS: error: immediate must be an integer in range [-256, 255].
; CHECK-ERRORS: ldr x0, [x0], #804
; CHECK-ERRORS: ^
; CHECK-ERRORS: error: invalid operand for instruction
@@ -69,7 +69,7 @@ foo:
; CHECK-ERRORS: error: index must be a multiple of 16 in range [-1024, 1008].
; CHECK-ERRORS: ldp q3, q4, [x5], #12
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be an integer in range [-256, 255].
+; CHECK-ERRORS: error: immediate must be an integer in range [-256, 255].
; CHECK-ERRORS: ldur x0, [x1, #-257]
; CHECK-ERRORS: ^
diff --git a/llvm/test/MC/AArch64/armv8.4a-ldst-error.s b/llvm/test/MC/AArch64/armv8.4a-ldst-error.s
index 3dbfc63e9fa8f..ae817f651e624 100644
--- a/llvm/test/MC/AArch64/armv8.4a-ldst-error.s
+++ b/llvm/test/MC/AArch64/armv8.4a-ldst-error.s
@@ -69,120 +69,120 @@ ldapur x14, [sp, #-257]
//CHECK-ERROR-NEXT: error: invalid operand for instruction
//CHECK-ERROR-NEXT: STLURB W1, [XZR, #1]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLURB W1, [X10, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: stlurb w2, [x11, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLURB W3, [SP, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapurb w4, [x12, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURB W5, [X13, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURB W6, [SP, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSB W7, [X14, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapursb w8, [x15, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapursb w9, [sp, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSB X0, [X16, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSB X1, [X17, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapursb x2, [sp, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: stlurh w10, [x18, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLURH W11, [X19, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLURH W12, [SP, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURH W13, [X20, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapurh w14, [x21, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURH W15, [SP, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSH W16, [X22, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSH W17, [X23, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapursh w18, [sp, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapursh x3, [x24, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSH X4, [X25, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSH X5, [SP, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLUR W19, [X26, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: stlur w20, [x27, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLUR W21, [SP, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPUR W22, [X28, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPUR W23, [X29, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapur w24, [sp, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapursw x6, [x30, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSW X7, [X0, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPURSW X8, [SP, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLUR X9, [X1, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: stlur x10, [x2, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: STLUR X11, [SP, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPUR X12, [X3, #-257]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: LDAPUR X13, [X4, #256]
//CHECK-ERROR-NEXT: ^
-//CHECK-ERROR-NEXT: error: index must be an integer in range [-256, 255].
+//CHECK-ERROR-NEXT: error: immediate must be an integer in range [-256, 255].
//CHECK-ERROR-NEXT: ldapur x14, [sp, #-257]
//CHECK-ERROR-NEXT: ^
diff --git a/llvm/test/MC/AArch64/armv9.8a-cflt-diagnostics.s b/llvm/test/MC/AArch64/armv9.8a-cflt-diagnostics.s
index d27cc5d41ce03..b3d2aedf5fd5d 100644
--- a/llvm/test/MC/AArch64/armv9.8a-cflt-diagnostics.s
+++ b/llvm/test/MC/AArch64/armv9.8a-cflt-diagnostics.s
@@ -17,10 +17,10 @@ cflteq #4, w0, #1
// CHECK: [[@LINE-1]]:8: error: immediate must be an integer in range [0, 3].
cfltgt #0, w0, #-257
-// CHECK: [[@LINE-1]]:16: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:16: error: immediate must be an integer in range [-256, 255].
cfltgt #0, w0, #256
-// CHECK: [[@LINE-1]]:16: error: index must be an integer in range [-256, 255].
+// CHECK: [[@LINE-1]]:16: error: immediate must be an integer in range [-256, 255].
cflthi #0, w0, #-1
// CHECK: [[@LINE-1]]:16: error: immediate must be an integer in range [0, 511].
diff --git a/llvm/test/MC/AArch64/basic-a64-diagnostics.s b/llvm/test/MC/AArch64/basic-a64-diagnostics.s
index 7fd65f9b38d36..f9e3fb1eb6fdf 100644
--- a/llvm/test/MC/AArch64/basic-a64-diagnostics.s
+++ b/llvm/test/MC/AArch64/basic-a64-diagnostics.s
@@ -1984,16 +1984,16 @@ cbz w1, lsl
sturh w17, [x1, #256]
ldursw x20, [x1, #256]
ldur x12, [sp, #256]
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldurb w2, [sp, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: sturh w17, [x1, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldursw x20, [x1, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldur x12, [sp, #256]
// CHECK-ERROR-NEXT: ^
@@ -2002,19 +2002,19 @@ cbz w1, lsl
ldursb x9, [sp, #-257]
ldur w2, [x30, #-257]
stur q9, [x20, #-257]
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: stur h2, [x2, #-257]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: stur b2, [x2, #-257]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldursb x9, [sp, #-257]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldur w2, [x30, #-257]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: stur q9, [x20, #-257]
// CHECK-ERROR-NEXT: ^
@@ -2051,22 +2051,22 @@ cbz w1, lsl
strh w9, [sp], #-257
str w1, [x19], #256
str w9, [sp], #-257
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: strb w1, [x19], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: strb w9, [sp], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: strh w1, [x19], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: strh w9, [sp], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str w1, [x19], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str w9, [sp], #-257
// CHECK-ERROR-NEXT: ^
@@ -2076,22 +2076,22 @@ cbz w1, lsl
ldrh w9, [sp], #-257
ldr w1, [x19], #256
ldr w9, [sp], #-257
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrb w1, [x19], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrb w9, [sp], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrh w1, [x19], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrh w9, [sp], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr w1, [x19], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr w9, [sp], #-257
// CHECK-ERROR-NEXT: ^
@@ -2101,22 +2101,22 @@ cbz w1, lsl
ldrsh x22, [x13], #-257
ldrsw x2, [x3], #256
ldrsw x22, [x13], #-257
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsb x2, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsb x22, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsh x2, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsh x22, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsw x2, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsw x22, [x13], #-257
// CHECK-ERROR-NEXT: ^
@@ -2124,16 +2124,16 @@ cbz w1, lsl
ldrsb w22, [x13], #-257
ldrsh w2, [x3], #256
ldrsh w22, [x13], #-257
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsb w2, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsb w22, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsh w2, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsh w22, [x13], #-257
// CHECK-ERROR-NEXT: ^
@@ -2147,34 +2147,34 @@ cbz w1, lsl
str d3, [x13], #-257
str q3, [x3], #256
str q3, [x13], #-257
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str b3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str b3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str h3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str h3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str s3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str s3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str d3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str d3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str q3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str q3, [x13], #-257
// CHECK-ERROR-NEXT: ^
@@ -2188,34 +2188,34 @@ cbz w1, lsl
ldr d3, [x13], #-257
ldr q3, [x3], #256
ldr q3, [x13], #-257
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr b3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr b3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr h3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr h3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr s3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr s3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr d3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr d3, [x13], #-257
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr q3, [x3], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr q3, [x13], #-257
// CHECK-ERROR-NEXT: ^
@@ -2245,19 +2245,19 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: strb w1, [x19, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: strb w9, [sp, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: strh w1, [x19, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: strh w9, [sp, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: str w1, [x19, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str w9, [sp, #-257]!
// CHECK-ERROR-NEXT: ^
@@ -2270,19 +2270,19 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldrb w1, [x19, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrb w9, [sp, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldrh w1, [x19, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrh w9, [sp, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldr w1, [x19, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr w9, [sp, #-257]!
// CHECK-ERROR-NEXT: ^
@@ -2295,19 +2295,19 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldrsb x2, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsb x22, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldrsh x2, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsh x22, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldrsw x2, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsw x22, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
@@ -2318,13 +2318,13 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldrsb w2, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsb w22, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldrsh w2, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrsh w22, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
@@ -2339,25 +2339,25 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: str b3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str b3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: str h3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str h3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: str s3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str s3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: str d3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str d3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
@@ -2372,25 +2372,25 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldr b3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr b3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldr h3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr h3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldr s3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr s3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldr d3, [x3, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr d3, [x13, #-257]!
// CHECK-ERROR-NEXT: ^
@@ -2402,16 +2402,16 @@ cbz w1, lsl
sttrh w17, [x1, #256]
ldtrsw x20, [x1, #256]
ldtr x12, [sp, #256]
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldtrb w2, [sp, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: sttrh w17, [x1, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldtrsw x20, [x1, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldtr x12, [sp, #256]
// CHECK-ERROR-NEXT: ^
@@ -2426,10 +2426,10 @@ cbz w1, lsl
// CHECK-ERROR-NEXT: error: invalid operand for instruction
// CHECK-ERROR-NEXT: sttr b2, [x2, #-257]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldtrsb x9, [sp, #-257]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldtr w2, [x30, #-257]
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
@@ -2455,19 +2455,19 @@ cbz w1, lsl
ldr w0, [x4, #16384]
ldrh w2, [x21, #8192]
ldrb w3, [x12, #4096]
-// CHECK-ERROR: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr q0, [x11, #65536]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr x0, [sp, #32768]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldr w0, [x4, #16384]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrh w2, [x21, #8192]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: ldrb w3, [x12, #4096]
// CHECK-ERROR-NEXT: ^
@@ -2509,7 +2509,7 @@ cbz w1, lsl
// CHECK-ERROR-AARCH64-NEXT: error: too few operands for instruction
// CHECK-ERROR-AARCH64-NEXT: str x5, [x22, #12]
// CHECK-ERROR-AARCH64-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected|index must be an}} integer in range [-256, 255]
+// CHECK-ERROR-NEXT: error: {{expected|immediate must be an}} integer in range [-256, 255]
// CHECK-ERROR-NEXT: str w7, [x12, #16384]
// CHECK-ERROR-NEXT: ^
>From 174a1a240cd76e65c6c76c38053dd21db188d8fa Mon Sep 17 00:00:00 2001
From: Jonathan Thackray <jonathan.thackray at arm.com>
Date: Fri, 9 Oct 2026 00:13:45 +0100
Subject: [PATCH 2/3] fixup! And fix all the other cases
---
.../AArch64/AsmParser/AArch64AsmParser.cpp | 66 +++++----
llvm/test/MC/AArch64/SME/addspl-diagnostics.s | 2 +-
llvm/test/MC/AArch64/SME/addsvl-diagnostics.s | 2 +-
llvm/test/MC/AArch64/SME/rdsvl-diagnostics.s | 2 +-
llvm/test/MC/AArch64/SME2/movt-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/addpl-diagnostics.s | 2 +-
llvm/test/MC/AArch64/SVE/addvl-diagnostics.s | 2 +-
llvm/test/MC/AArch64/SVE/cmpeq-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/cmpge-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/cmpgt-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/cmple-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/cmplt-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/cmpne-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/index-diagnostics.s | 16 +-
llvm/test/MC/AArch64/SVE/ld1b-diagnostics.s | 16 +-
llvm/test/MC/AArch64/SVE/ld1d-diagnostics.s | 14 +-
llvm/test/MC/AArch64/SVE/ld1h-diagnostics.s | 32 ++--
llvm/test/MC/AArch64/SVE/ld1rb-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/ld1rd-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ld1rh-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ld1rqb-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ld1rqd-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ld1rqh-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ld1rqw-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ld1rsb-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/ld1rsh-diagnostics.s | 6 +-
llvm/test/MC/AArch64/SVE/ld1rsw-diagnostics.s | 6 +-
llvm/test/MC/AArch64/SVE/ld1rw-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ld1sb-diagnostics.s | 12 +-
llvm/test/MC/AArch64/SVE/ld1sh-diagnostics.s | 28 ++--
llvm/test/MC/AArch64/SVE/ld1sw-diagnostics.s | 14 +-
llvm/test/MC/AArch64/SVE/ld1w-diagnostics.s | 28 ++--
llvm/test/MC/AArch64/SVE/ld2b-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld2d-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld2h-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld2w-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld3b-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld3d-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld3h-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld3w-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld4b-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld4d-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld4h-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ld4w-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ldff1d-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ldff1h-diagnostics.s | 20 +--
.../test/MC/AArch64/SVE/ldff1sh-diagnostics.s | 20 +--
.../test/MC/AArch64/SVE/ldff1sw-diagnostics.s | 10 +-
llvm/test/MC/AArch64/SVE/ldff1w-diagnostics.s | 20 +--
llvm/test/MC/AArch64/SVE/ldnf1b-diagnostics.s | 16 +-
llvm/test/MC/AArch64/SVE/ldnf1d-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/ldnf1h-diagnostics.s | 12 +-
.../test/MC/AArch64/SVE/ldnf1sb-diagnostics.s | 12 +-
.../test/MC/AArch64/SVE/ldnf1sh-diagnostics.s | 8 +-
.../test/MC/AArch64/SVE/ldnf1sw-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/ldnf1w-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/ldnt1b-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/ldnt1d-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/ldnt1h-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/ldnt1w-diagnostics.s | 4 +-
.../SVE/matrix-multiply-fp-diagnostics.s | 24 +--
llvm/test/MC/AArch64/SVE/mul-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/prfb-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/prfd-diagnostics.s | 14 +-
llvm/test/MC/AArch64/SVE/prfh-diagnostics.s | 24 +--
llvm/test/MC/AArch64/SVE/prfw-diagnostics.s | 24 +--
llvm/test/MC/AArch64/SVE/rdvl-diagnostics.s | 2 +-
llvm/test/MC/AArch64/SVE/smax-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/smin-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/st1b-diagnostics.s | 16 +-
llvm/test/MC/AArch64/SVE/st1d-diagnostics.s | 14 +-
llvm/test/MC/AArch64/SVE/st1h-diagnostics.s | 32 ++--
llvm/test/MC/AArch64/SVE/st1w-diagnostics.s | 28 ++--
llvm/test/MC/AArch64/SVE/st2b-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st2d-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st2h-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st2w-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st3b-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st3d-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st3h-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st3w-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st4b-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st4d-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st4h-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/st4w-diagnostics.s | 8 +-
llvm/test/MC/AArch64/SVE/stnt1b-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/stnt1d-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/stnt1h-diagnostics.s | 4 +-
llvm/test/MC/AArch64/SVE/stnt1w-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/ld1b-diagnostics.s | 6 +-
.../test/MC/AArch64/SVE2p1/ld1d-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/ld1d_q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/ld1h-diagnostics.s | 6 +-
.../test/MC/AArch64/SVE2p1/ld1w-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/ld1w_q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/ld2q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/ld3q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/ld4q-diagnostics.s | 4 +-
.../MC/AArch64/SVE2p1/ldnt1b-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/ldnt1d-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/ldnt1h-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/ldnt1w-diagnostics.s | 6 +-
.../test/MC/AArch64/SVE2p1/st1b-diagnostics.s | 6 +-
.../test/MC/AArch64/SVE2p1/st1d-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/st1d_q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/st1h-diagnostics.s | 6 +-
.../test/MC/AArch64/SVE2p1/st1w-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/st1w_q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/st2q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/st3q-diagnostics.s | 4 +-
.../test/MC/AArch64/SVE2p1/st4q-diagnostics.s | 4 +-
.../MC/AArch64/SVE2p1/stnt1b-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/stnt1d-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/stnt1h-diagnostics.s | 6 +-
.../MC/AArch64/SVE2p1/stnt1w-diagnostics.s | 6 +-
llvm/test/MC/AArch64/arm64-diags.s | 12 +-
llvm/test/MC/AArch64/armv8.3a-diagnostics.s | 12 +-
llvm/test/MC/AArch64/armv8.5a-mte-error.s | 106 +++++++-------
llvm/test/MC/AArch64/basic-a64-diagnostics.s | 138 +++++++++---------
119 files changed, 667 insertions(+), 659 deletions(-)
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 2af084e3c8377..2e3d8be87cf2a 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -5997,55 +5997,62 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
return Error(Loc,
"expected compatible register or floating-point constant");
case Match_InvalidMemoryIndexedSImm6:
- return Error(Loc, "index must be an integer in range [-32, 31].");
+ return Error(Loc, "immediate must be an integer in range [-32, 31].");
case Match_InvalidMemoryIndexedSImm5:
- return Error(Loc, "index must be an integer in range [-16, 15].");
+ return Error(Loc, "immediate must be an integer in range [-16, 15].");
case Match_InvalidMemoryIndexed1SImm4:
- return Error(Loc, "index must be an integer in range [-8, 7].");
+ return Error(Loc, "immediate must be an integer in range [-8, 7].");
case Match_InvalidMemoryIndexed2SImm4:
- return Error(Loc, "index must be a multiple of 2 in range [-16, 14].");
+ return Error(Loc, "immediate must be a multiple of 2 in range [-16, 14].");
case Match_InvalidMemoryIndexed3SImm4:
- return Error(Loc, "index must be a multiple of 3 in range [-24, 21].");
+ return Error(Loc, "immediate must be a multiple of 3 in range [-24, 21].");
case Match_InvalidMemoryIndexed4SImm4:
- return Error(Loc, "index must be a multiple of 4 in range [-32, 28].");
+ return Error(Loc, "immediate must be a multiple of 4 in range [-32, 28].");
case Match_InvalidMemoryIndexed16SImm4:
- return Error(Loc, "index must be a multiple of 16 in range [-128, 112].");
+ return Error(Loc,
+ "immediate must be a multiple of 16 in range [-128, 112].");
case Match_InvalidMemoryIndexed32SImm4:
- return Error(Loc, "index must be a multiple of 32 in range [-256, 224].");
+ return Error(Loc,
+ "immediate must be a multiple of 32 in range [-256, 224].");
case Match_InvalidMemoryIndexed1SImm6:
- return Error(Loc, "index must be an integer in range [-32, 31].");
+ return Error(Loc, "immediate must be an integer in range [-32, 31].");
case Match_InvalidMemoryIndexedSImm8:
- return Error(Loc, "index must be an integer in range [-128, 127].");
+ return Error(Loc, "immediate must be an integer in range [-128, 127].");
case Match_InvalidMemoryIndexedSImm9:
return Error(Loc, "immediate must be an integer in range [-256, 255].");
case Match_InvalidMemoryIndexed16SImm9:
- return Error(Loc, "index must be a multiple of 16 in range [-4096, 4080].");
+ return Error(Loc,
+ "immediate must be a multiple of 16 in range [-4096, 4080].");
case Match_InvalidMemoryIndexed8SImm10:
- return Error(Loc, "index must be a multiple of 8 in range [-4096, 4088].");
+ return Error(Loc,
+ "immediate must be a multiple of 8 in range [-4096, 4088].");
case Match_InvalidMemoryIndexed4SImm7:
- return Error(Loc, "index must be a multiple of 4 in range [-256, 252].");
+ return Error(Loc,
+ "immediate must be a multiple of 4 in range [-256, 252].");
case Match_InvalidMemoryIndexed8SImm7:
- return Error(Loc, "index must be a multiple of 8 in range [-512, 504].");
+ return Error(Loc,
+ "immediate must be a multiple of 8 in range [-512, 504].");
case Match_InvalidMemoryIndexed16SImm7:
- return Error(Loc, "index must be a multiple of 16 in range [-1024, 1008].");
+ return Error(Loc,
+ "immediate must be a multiple of 16 in range [-1024, 1008].");
case Match_InvalidMemoryIndexed8UImm5:
- return Error(Loc, "index must be a multiple of 8 in range [0, 248].");
+ return Error(Loc, "immediate must be a multiple of 8 in range [0, 248].");
case Match_InvalidMemoryIndexed8UImm3:
- return Error(Loc, "index must be a multiple of 8 in range [0, 56].");
+ return Error(Loc, "immediate must be a multiple of 8 in range [0, 56].");
case Match_InvalidMemoryIndexed4UImm5:
- return Error(Loc, "index must be a multiple of 4 in range [0, 124].");
+ return Error(Loc, "immediate must be a multiple of 4 in range [0, 124].");
case Match_InvalidMemoryIndexed2UImm5:
- return Error(Loc, "index must be a multiple of 2 in range [0, 62].");
+ return Error(Loc, "immediate must be a multiple of 2 in range [0, 62].");
case Match_InvalidMemoryIndexed8UImm6:
- return Error(Loc, "index must be a multiple of 8 in range [0, 504].");
+ return Error(Loc, "immediate must be a multiple of 8 in range [0, 504].");
case Match_InvalidMemoryIndexed16UImm6:
- return Error(Loc, "index must be a multiple of 16 in range [0, 1008].");
+ return Error(Loc, "immediate must be a multiple of 16 in range [0, 1008].");
case Match_InvalidMemoryIndexed4UImm6:
- return Error(Loc, "index must be a multiple of 4 in range [0, 252].");
+ return Error(Loc, "immediate must be a multiple of 4 in range [0, 252].");
case Match_InvalidMemoryIndexed2UImm6:
- return Error(Loc, "index must be a multiple of 2 in range [0, 126].");
+ return Error(Loc, "immediate must be a multiple of 2 in range [0, 126].");
case Match_InvalidMemoryIndexed1UImm6:
- return Error(Loc, "index must be in range [0, 63].");
+ return Error(Loc, "immediate must be in range [0, 63].");
case Match_InvalidMemoryWExtend8:
return Error(Loc,
"expected 'uxtw' or 'sxtw' with optional shift of #0");
@@ -6077,15 +6084,16 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
return Error(Loc,
"expected 'lsl' or 'sxtx' with optional shift of #0 or #4");
case Match_InvalidMemoryIndexed1:
- return Error(Loc, "index must be an integer in range [0, 4095].");
+ return Error(Loc, "immediate must be an integer in range [0, 4095].");
case Match_InvalidMemoryIndexed2:
- return Error(Loc, "index must be a multiple of 2 in range [0, 8190].");
+ return Error(Loc, "immediate must be a multiple of 2 in range [0, 8190].");
case Match_InvalidMemoryIndexed4:
- return Error(Loc, "index must be a multiple of 4 in range [0, 16380].");
+ return Error(Loc, "immediate must be a multiple of 4 in range [0, 16380].");
case Match_InvalidMemoryIndexed8:
- return Error(Loc, "index must be a multiple of 8 in range [0, 32760].");
+ return Error(Loc, "immediate must be a multiple of 8 in range [0, 32760].");
case Match_InvalidMemoryIndexed16:
- return Error(Loc, "index must be a multiple of 16 in range [0, 65520].");
+ return Error(Loc,
+ "immediate must be a multiple of 16 in range [0, 65520].");
case Match_InvalidImm0_0:
return Error(Loc, "immediate must be 0.");
case Match_InvalidImm0_1:
diff --git a/llvm/test/MC/AArch64/SME/addspl-diagnostics.s b/llvm/test/MC/AArch64/SME/addspl-diagnostics.s
index 96e926e327b36..1bf8e1d54dcb0 100644
--- a/llvm/test/MC/AArch64/SME/addspl-diagnostics.s
+++ b/llvm/test/MC/AArch64/SME/addspl-diagnostics.s
@@ -2,7 +2,7 @@
// Immediate out of upper bound [-32, 31].
addspl x19, x14, #32
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: addspl x19, x14, #32
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SME/addsvl-diagnostics.s b/llvm/test/MC/AArch64/SME/addsvl-diagnostics.s
index 0a3867952fc25..c4977c08cb8a6 100644
--- a/llvm/test/MC/AArch64/SME/addsvl-diagnostics.s
+++ b/llvm/test/MC/AArch64/SME/addsvl-diagnostics.s
@@ -2,7 +2,7 @@
// Immediate out of upper bound [-32, 31].
addsvl x3, x5, #32
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: addsvl x3, x5, #32
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SME/rdsvl-diagnostics.s b/llvm/test/MC/AArch64/SME/rdsvl-diagnostics.s
index 8e5e85b089102..69f381dad8da7 100644
--- a/llvm/test/MC/AArch64/SME/rdsvl-diagnostics.s
+++ b/llvm/test/MC/AArch64/SME/rdsvl-diagnostics.s
@@ -2,7 +2,7 @@
// Immediate out of upper bound [-32, 31].
rdsvl x9, #32
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: rdsvl x9, #32
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SME2/movt-diagnostics.s b/llvm/test/MC/AArch64/SME2/movt-diagnostics.s
index d3696bf114623..80f787958a873 100644
--- a/llvm/test/MC/AArch64/SME2/movt-diagnostics.s
+++ b/llvm/test/MC/AArch64/SME2/movt-diagnostics.s
@@ -1,25 +1,25 @@
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sme2 2>&1 < %s| FileCheck %s
-// index must be a multiple of 8 in range [0, 56].
+// immediate must be a multiple of 8 in range [0, 56].
// --------------------------------------------------------------------------//
movt x0, zt0[57]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 56].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 56].
// CHECK-NEXT: movt x0, zt0[57]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
movt x0, zt0[58]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 56].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 56].
// CHECK-NEXT: movt x0, zt0[58]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
movt x0, zt0[64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 56].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 56].
// CHECK-NEXT: movt x0, zt0[64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
movt x0, zt0[72]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 56].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 56].
// CHECK-NEXT: movt x0, zt0[72]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/addpl-diagnostics.s b/llvm/test/MC/AArch64/SVE/addpl-diagnostics.s
index 266d58abdca33..4017285126f47 100644
--- a/llvm/test/MC/AArch64/SVE/addpl-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/addpl-diagnostics.s
@@ -2,7 +2,7 @@
// Immediate out of upper bound [-32, 31].
addpl x19, x14, #32
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: addpl x19, x14, #32
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/addvl-diagnostics.s b/llvm/test/MC/AArch64/SVE/addvl-diagnostics.s
index 1dc540f501e43..5392cd0e7605b 100644
--- a/llvm/test/MC/AArch64/SVE/addvl-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/addvl-diagnostics.s
@@ -2,7 +2,7 @@
// Immediate out of upper bound [-32, 31].
addvl x3, x5, #32
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: addvl x3, x5, #32
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/cmpeq-diagnostics.s b/llvm/test/MC/AArch64/SVE/cmpeq-diagnostics.s
index 05e1857881b8d..bd20c9a07c8a8 100644
--- a/llvm/test/MC/AArch64/SVE/cmpeq-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/cmpeq-diagnostics.s
@@ -66,12 +66,12 @@ cmpeq p0.d, p0/z, z0.s, z0.s
// Invalid immediate range
cmpeq p0.s, p0/z, z0.s, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpeq p0.s, p0/z, z0.s, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
cmpeq p0.s, p0/z, z0.s, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpeq p0.s, p0/z, z0.s, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/cmpge-diagnostics.s b/llvm/test/MC/AArch64/SVE/cmpge-diagnostics.s
index 2ccf6cb71581b..b36d9f8a3ecb6 100644
--- a/llvm/test/MC/AArch64/SVE/cmpge-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/cmpge-diagnostics.s
@@ -66,12 +66,12 @@ cmpge p0.d, p0/z, z0.s, z0.s
// Invalid immediate range
cmpge p0.s, p0/z, z0.s, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpge p0.s, p0/z, z0.s, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
cmpge p0.s, p0/z, z0.s, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpge p0.s, p0/z, z0.s, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/cmpgt-diagnostics.s b/llvm/test/MC/AArch64/SVE/cmpgt-diagnostics.s
index 0c5b3819e01f5..71de46e770d3c 100644
--- a/llvm/test/MC/AArch64/SVE/cmpgt-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/cmpgt-diagnostics.s
@@ -66,12 +66,12 @@ cmpgt p0.d, p0/z, z0.s, z0.s
// Invalid immediate range
cmpgt p0.s, p0/z, z0.s, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpgt p0.s, p0/z, z0.s, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
cmpgt p0.s, p0/z, z0.s, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpgt p0.s, p0/z, z0.s, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/cmple-diagnostics.s b/llvm/test/MC/AArch64/SVE/cmple-diagnostics.s
index f20a90ffba12e..5e14953fcd1cc 100644
--- a/llvm/test/MC/AArch64/SVE/cmple-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/cmple-diagnostics.s
@@ -66,12 +66,12 @@ cmple p0.d, p0/z, z0.s, z0.s
// Invalid immediate range
cmple p0.s, p0/z, z0.s, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmple p0.s, p0/z, z0.s, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
cmple p0.s, p0/z, z0.s, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmple p0.s, p0/z, z0.s, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/cmplt-diagnostics.s b/llvm/test/MC/AArch64/SVE/cmplt-diagnostics.s
index 0a76e7792f391..3232f601898f7 100644
--- a/llvm/test/MC/AArch64/SVE/cmplt-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/cmplt-diagnostics.s
@@ -66,12 +66,12 @@ cmplt p0.d, p0/z, z0.s, z0.s
// Invalid immediate range
cmplt p0.s, p0/z, z0.s, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmplt p0.s, p0/z, z0.s, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
cmplt p0.s, p0/z, z0.s, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmplt p0.s, p0/z, z0.s, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/cmpne-diagnostics.s b/llvm/test/MC/AArch64/SVE/cmpne-diagnostics.s
index 1c886331f8550..86094fbc4a908 100644
--- a/llvm/test/MC/AArch64/SVE/cmpne-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/cmpne-diagnostics.s
@@ -66,12 +66,12 @@ cmpne p0.d, p0/z, z0.s, z0.s
// Invalid immediate range
cmpne p0.s, p0/z, z0.s, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpne p0.s, p0/z, z0.s, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
cmpne p0.s, p0/z, z0.s, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: cmpne p0.s, p0/z, z0.s, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/index-diagnostics.s b/llvm/test/MC/AArch64/SVE/index-diagnostics.s
index 2600089cd01c0..1f75e52eefc5c 100644
--- a/llvm/test/MC/AArch64/SVE/index-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/index-diagnostics.s
@@ -4,42 +4,42 @@
// Immediate out of lower bound [-16, 15].
index z27.b, #-17, #-16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z27.b, #-17, #-16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
index z11.h, #-16, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z11.h, #-16, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
index z2.s, #16, #-16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z2.s, #16, #-16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
index z2.d, #-16, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z2.d, #-16, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
index z4.b, #-17, w28
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z4.b, #-17, w28
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
index z9.h, #16, w23
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z9.h, #16, w23
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
index z3.s, w10, #-17
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z3.s, w10, #-17
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
index z17.d, x9, #16
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-16, 15].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-16, 15].
// CHECK-NEXT: index z17.d, x9, #16
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1b-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1b-diagnostics.s
index 145d760735577..9ccc587ac58bf 100644
--- a/llvm/test/MC/AArch64/SVE/ld1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1b-diagnostics.s
@@ -4,42 +4,42 @@
// Immediate out of lower bound [-8, 7].
ld1b z23.b, p0/z, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z23.b, p0/z, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b z29.b, p0/z, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z29.b, p0/z, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b z21.h, p4/z, [x17, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z21.h, p4/z, [x17, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b z10.h, p5/z, [x16, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z10.h, p5/z, [x16, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1b z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1d-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1d-diagnostics.s
index 601cb56b4fdb3..03380f4a74c41 100644
--- a/llvm/test/MC/AArch64/SVE/ld1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1d-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
ld1d z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1d z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1d z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -109,27 +109,27 @@ ld1d z0.s, p0/z, [z0.s, #8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d z0.d, p0/z, [z0.d, #-8]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ld1d z0.d, p0/z, [z0.d, #-8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ld1d z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d z0.d, p0/z, [z0.d, #249]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ld1d z0.d, p0/z, [z0.d, #249]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d z0.d, p0/z, [z0.d, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ld1d z0.d, p0/z, [z0.d, #256]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ld1d z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1h-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1h-diagnostics.s
index 095b5c7cf807a..3260aede2fb07 100644
--- a/llvm/test/MC/AArch64/SVE/ld1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1h-diagnostics.s
@@ -4,32 +4,32 @@
// Immediate out of lower bound [-8, 7].
ld1h z21.h, p4/z, [x17, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1h z21.h, p4/z, [x17, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z10.h, p5/z, [x16, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1h z10.h, p5/z, [x16, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1h z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1h z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1h z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1h z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -144,52 +144,52 @@ ld1h z0.d, p0/z, [x0, z0.d, sxtw #2]
// Invalid vector + immediate addressing modes
ld1h z0.s, p0/z, [z0.s, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.s, p0/z, [z0.s, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.s, p0/z, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.s, p0/z, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.s, p0/z, [z0.s, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.s, p0/z, [z0.s, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.s, p0/z, [z0.s, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.s, p0/z, [z0.s, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.s, p0/z, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.s, p0/z, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.d, p0/z, [z0.d, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.d, p0/z, [z0.d, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.d, p0/z, [z0.d, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.d, p0/z, [z0.d, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.d, p0/z, [z0.d, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.d, p0/z, [z0.d, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1h z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rb-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rb-diagnostics.s
index ba4e289b8d7b3..a420a6ac7fd7d 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rb-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rb-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [0, 63].
ld1rb z0.b, p1/z, [x0, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be in range [0, 63].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be in range [0, 63].
// CHECK-NEXT: ld1rb z0.b, p1/z, [x0, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rb z0.b, p1/z, [x0, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be in range [0, 63].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be in range [0, 63].
// CHECK-NEXT: ld1rb z0.b, p1/z, [x0, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rd-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rd-diagnostics.s
index 312dcdca81630..52a9b76f522e7 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rd-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rd-diagnostics.s
@@ -4,27 +4,27 @@
// Invalid immediate (multiple of 4 in range [0, 252]).
ld1rd z0.d, p1/z, [x0, #-8]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 504].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 504].
// CHECK-NEXT: ld1rd z0.d, p1/z, [x0, #-8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rd z0.d, p1/z, [x0, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 504].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 504].
// CHECK-NEXT: ld1rd z0.d, p1/z, [x0, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rd z0.d, p1/z, [x0, #505]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 504].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 504].
// CHECK-NEXT: ld1rd z0.d, p1/z, [x0, #505]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rd z0.d, p1/z, [x0, #512]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 504].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 504].
// CHECK-NEXT: ld1rd z0.d, p1/z, [x0, #512]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rd z0.d, p1/z, [x0, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 504].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 504].
// CHECK-NEXT: ld1rd z0.d, p1/z, [x0, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rh-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rh-diagnostics.s
index 1766920ea5c46..70cb3c23ccc52 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rh-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rh-diagnostics.s
@@ -4,27 +4,27 @@
// Invalid immediate (multiple of 2 in range [0, 126]).
ld1rh z0.h, p1/z, [x0, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rh z0.h, p1/z, [x0, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rh z0.h, p1/z, [x0, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rh z0.h, p1/z, [x0, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rh z0.h, p1/z, [x0, #127]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rh z0.h, p1/z, [x0, #127]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rh z0.h, p1/z, [x0, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rh z0.h, p1/z, [x0, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rh z0.h, p1/z, [x0, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rh z0.h, p1/z, [x0, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rqb-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rqb-diagnostics.s
index 94a8d5c3f5c81..df7ae63d56f90 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rqb-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rqb-diagnostics.s
@@ -4,27 +4,27 @@
// Immediate out of lower bound [-128, 112].
ld1rqb z0.b, p0/z, [x0, #-144]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqb z0.b, p0/z, [x0, #-144]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqb z0.b, p0/z, [x0, #-129]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqb z0.b, p0/z, [x0, #-129]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqb z0.b, p0/z, [x0, #113]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqb z0.b, p0/z, [x0, #113]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqb z0.b, p0/z, [x0, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqb z0.b, p0/z, [x0, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqb z0.b, p0/z, [x0, #12]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqb z0.b, p0/z, [x0, #12]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rqd-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rqd-diagnostics.s
index 8c4ac3ecad6d0..796561f3870ee 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rqd-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rqd-diagnostics.s
@@ -4,27 +4,27 @@
// Immediate out of lower bound [-128, 112].
ld1rqd z0.d, p0/z, [x0, #-144]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqd z0.d, p0/z, [x0, #-144]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqd z0.d, p0/z, [x0, #-129]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqd z0.d, p0/z, [x0, #-129]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqd z0.d, p0/z, [x0, #113]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqd z0.d, p0/z, [x0, #113]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqd z0.d, p0/z, [x0, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqd z0.d, p0/z, [x0, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqd z0.d, p0/z, [x0, #12]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqd z0.d, p0/z, [x0, #12]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rqh-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rqh-diagnostics.s
index 960dda35db6ed..96b05a9a99e04 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rqh-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rqh-diagnostics.s
@@ -4,27 +4,27 @@
// Immediate out of lower bound [-128, 112].
ld1rqh z0.h, p0/z, [x0, #-144]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqh z0.h, p0/z, [x0, #-144]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqh z0.h, p0/z, [x0, #-129]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqh z0.h, p0/z, [x0, #-129]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqh z0.h, p0/z, [x0, #113]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqh z0.h, p0/z, [x0, #113]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqh z0.h, p0/z, [x0, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqh z0.h, p0/z, [x0, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqh z0.h, p0/z, [x0, #12]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqh z0.h, p0/z, [x0, #12]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rqw-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rqw-diagnostics.s
index b4d45e5ceb6d1..3cb29a23ec7d9 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rqw-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rqw-diagnostics.s
@@ -4,27 +4,27 @@
// Immediate out of lower bound [-128, 112].
ld1rqw z0.s, p0/z, [x0, #-144]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqw z0.s, p0/z, [x0, #-144]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqw z0.s, p0/z, [x0, #-129]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqw z0.s, p0/z, [x0, #-129]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqw z0.s, p0/z, [x0, #113]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqw z0.s, p0/z, [x0, #113]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqw z0.s, p0/z, [x0, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqw z0.s, p0/z, [x0, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rqw z0.s, p0/z, [x0, #12]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 16 in range [-128, 112].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 16 in range [-128, 112].
// CHECK-NEXT: ld1rqw z0.s, p0/z, [x0, #12]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rsb-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rsb-diagnostics.s
index 5da5dee3e2a66..c86e7457458e6 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rsb-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rsb-diagnostics.s
@@ -4,12 +4,12 @@
// Invalid immediate (in range [0, 63]).
ld1rsb z0.h, p1/z, [x0, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be in range [0, 63].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be in range [0, 63].
// CHECK-NEXT: ld1rsb z0.h, p1/z, [x0, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rsb z0.h, p1/z, [x0, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be in range [0, 63].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be in range [0, 63].
// CHECK-NEXT: ld1rsb z0.h, p1/z, [x0, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rsh-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rsh-diagnostics.s
index 8911ba18bc289..9823ad4202782 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rsh-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rsh-diagnostics.s
@@ -4,17 +4,17 @@
// Invalid immediate (multiple of 2 in range [0, 126]).
ld1rsh z0.s, p1/z, [x0, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rsh z0.s, p1/z, [x0, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rsh z0.s, p1/z, [x0, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rsh z0.s, p1/z, [x0, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rsh z0.s, p1/z, [x0, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 126].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 126].
// CHECK-NEXT: ld1rsh z0.s, p1/z, [x0, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rsw-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rsw-diagnostics.s
index 57c09aa66eecb..46ca95d3caf6c 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rsw-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rsw-diagnostics.s
@@ -4,17 +4,17 @@
// Invalid immediate (multiple of 4 in range [0, 252]).
ld1rsw z0.d, p1/z, [x0, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rsw z0.d, p1/z, [x0, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rsw z0.d, p1/z, [x0, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rsw z0.d, p1/z, [x0, #256]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rsw z0.d, p1/z, [x0, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rsw z0.d, p1/z, [x0, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1rw-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1rw-diagnostics.s
index afc36ef3c2091..1a7cf83075354 100644
--- a/llvm/test/MC/AArch64/SVE/ld1rw-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1rw-diagnostics.s
@@ -4,27 +4,27 @@
// Invalid immediate (multiple of 4 in range [0, 252]).
ld1rw z0.s, p1/z, [x0, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rw z0.s, p1/z, [x0, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rw z0.s, p1/z, [x0, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rw z0.s, p1/z, [x0, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rw z0.s, p1/z, [x0, #253]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rw z0.s, p1/z, [x0, #253]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rw z0.s, p1/z, [x0, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rw z0.s, p1/z, [x0, #256]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1rw z0.s, p1/z, [x0, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 252].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 252].
// CHECK-NEXT: ld1rw z0.s, p1/z, [x0, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1sb-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1sb-diagnostics.s
index bd67e29723843..19487c1898768 100644
--- a/llvm/test/MC/AArch64/SVE/ld1sb-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1sb-diagnostics.s
@@ -18,32 +18,32 @@ ld1sb z29.b, p0/z, [x3, #1, MUL VL]
// Immediate out of lower bound [-8, 7].
ld1sb z21.h, p4/z, [x17, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sb z21.h, p4/z, [x17, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sb z10.h, p5/z, [x16, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sb z10.h, p5/z, [x16, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sb z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sb z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sb z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sb z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sb z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sb z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sb z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sb z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1sh-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1sh-diagnostics.s
index ca5516924f601..c4e4538e56df1 100644
--- a/llvm/test/MC/AArch64/SVE/ld1sh-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1sh-diagnostics.s
@@ -18,22 +18,22 @@ ld1sh z29.h, p0/z, [x3, #1, MUL VL]
// Immediate out of lower bound [-8, 7].
ld1sh z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sh z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sh z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sh z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sh z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -143,52 +143,52 @@ ld1sh z0.d, p0/z, [x0, z0.d, sxtw #2]
// Invalid vector + immediate addressing modes
ld1sh z0.s, p0/z, [z0.s, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.s, p0/z, [z0.s, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.s, p0/z, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.s, p0/z, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.s, p0/z, [z0.s, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.s, p0/z, [z0.s, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.s, p0/z, [z0.s, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.s, p0/z, [z0.s, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.s, p0/z, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.s, p0/z, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.d, p0/z, [z0.d, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.d, p0/z, [z0.d, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.d, p0/z, [z0.d, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.d, p0/z, [z0.d, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.d, p0/z, [z0.d, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.d, p0/z, [z0.d, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sh z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ld1sh z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1sw-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1sw-diagnostics.s
index 1454cf3502dcd..674f0e820e746 100644
--- a/llvm/test/MC/AArch64/SVE/ld1sw-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1sw-diagnostics.s
@@ -18,12 +18,12 @@ ld1sw z29.s, p0/z, [x3, #1, MUL VL]
// Immediate out of lower bound [-8, 7].
ld1sw z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sw z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sw z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1sw z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -138,27 +138,27 @@ ld1sw z0.s, p0/z, [z0.s, #4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sw z0.d, p0/z, [z0.d, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1sw z0.d, p0/z, [z0.d, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sw z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1sw z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sw z0.d, p0/z, [z0.d, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1sw z0.d, p0/z, [z0.d, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sw z0.d, p0/z, [z0.d, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1sw z0.d, p0/z, [z0.d, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1sw z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1sw z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld1w-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld1w-diagnostics.s
index 766233fb05531..300ef5707b7e5 100644
--- a/llvm/test/MC/AArch64/SVE/ld1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld1w-diagnostics.s
@@ -4,22 +4,22 @@
// Immediate out of lower bound [-8, 7].
ld1w z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1w z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1w z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1w z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1w z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -129,52 +129,52 @@ ld1w z0.d, p0/z, [x0, z0.d, sxtw #3]
// Invalid vector + immediate addressing modes
ld1w z0.s, p0/z, [z0.s, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.s, p0/z, [z0.s, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.s, p0/z, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.s, p0/z, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.s, p0/z, [z0.s, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.s, p0/z, [z0.s, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.s, p0/z, [z0.s, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.s, p0/z, [z0.s, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.s, p0/z, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.s, p0/z, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.d, p0/z, [z0.d, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.d, p0/z, [z0.d, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.d, p0/z, [z0.d, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.d, p0/z, [z0.d, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.d, p0/z, [z0.d, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.d, p0/z, [z0.d, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ld1w z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld2b-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld2b-diagnostics.s
index bd62fac315468..d7587e31eec81 100644
--- a/llvm/test/MC/AArch64/SVE/ld2b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld2b-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
ld2b {z12.b, z13.b}, p4/z, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2b {z12.b, z13.b}, p4/z, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2b {z7.b, z8.b}, p3/z, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2b {z7.b, z8.b}, p3/z, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld2b {z7.b, z8.b}, p3/z, [x1, #16, MUL VL]
// Immediate not a multiple of two.
ld2b {z12.b, z13.b}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2b {z12.b, z13.b}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2b {z7.b, z8.b}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2b {z7.b, z8.b}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld2d-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld2d-diagnostics.s
index 24252ec133c1b..c4ebac82dacf6 100644
--- a/llvm/test/MC/AArch64/SVE/ld2d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld2d-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
ld2d {z12.d, z13.d}, p4/z, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2d {z12.d, z13.d}, p4/z, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2d {z7.d, z8.d}, p3/z, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2d {z7.d, z8.d}, p3/z, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld2d {z7.d, z8.d}, p3/z, [x1, #16, MUL VL]
// Immediate not a multiple of two.
ld2d {z12.d, z13.d}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2d {z12.d, z13.d}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2d {z7.d, z8.d}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2d {z7.d, z8.d}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld2h-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld2h-diagnostics.s
index 90b73dfecbc62..3615eb2e29947 100644
--- a/llvm/test/MC/AArch64/SVE/ld2h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld2h-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
ld2h {z12.h, z13.h}, p4/z, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2h {z12.h, z13.h}, p4/z, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2h {z7.h, z8.h}, p3/z, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2h {z7.h, z8.h}, p3/z, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld2h {z7.h, z8.h}, p3/z, [x1, #16, MUL VL]
// Immediate not a multiple of two.
ld2h {z12.h, z13.h}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2h {z12.h, z13.h}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2h {z7.h, z8.h}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2h {z7.h, z8.h}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld2w-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld2w-diagnostics.s
index 3c36dc4636dd5..98768ff014913 100644
--- a/llvm/test/MC/AArch64/SVE/ld2w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld2w-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
ld2w {z12.s, z13.s}, p4/z, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2w {z12.s, z13.s}, p4/z, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2w {z7.s, z8.s}, p3/z, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2w {z7.s, z8.s}, p3/z, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld2w {z7.s, z8.s}, p3/z, [x1, #16, MUL VL]
// Immediate not a multiple of two.
ld2w {z12.s, z13.s}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2w {z12.s, z13.s}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2w {z7.s, z8.s}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2w {z7.s, z8.s}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld3b-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld3b-diagnostics.s
index bcfa91280d566..cf8b0e6f072a0 100644
--- a/llvm/test/MC/AArch64/SVE/ld3b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld3b-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
ld3b {z12.b, z13.b, z14.b}, p4/z, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3b {z12.b, z13.b, z14.b}, p4/z, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3b {z7.b, z8.b, z9.b}, p3/z, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3b {z7.b, z8.b, z9.b}, p3/z, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld3b {z7.b, z8.b, z9.b}, p3/z, [x1, #24, MUL VL]
// Immediate not a multiple of three.
ld3b {z12.b, z13.b, z14.b}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3b {z12.b, z13.b, z14.b}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3b {z7.b, z8.b, z9.b}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3b {z7.b, z8.b, z9.b}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld3d-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld3d-diagnostics.s
index 4c2085c6d3b96..6d1a04abaa176 100644
--- a/llvm/test/MC/AArch64/SVE/ld3d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld3d-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
ld3d {z12.d, z13.d, z14.d}, p4/z, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3d {z12.d, z13.d, z14.d}, p4/z, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3d {z7.d, z8.d, z9.d}, p3/z, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3d {z7.d, z8.d, z9.d}, p3/z, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld3d {z7.d, z8.d, z9.d}, p3/z, [x1, #24, MUL VL]
// Immediate not a multiple of three.
ld3d {z12.d, z13.d, z14.d}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3d {z12.d, z13.d, z14.d}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3d {z7.d, z8.d, z9.d}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3d {z7.d, z8.d, z9.d}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld3h-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld3h-diagnostics.s
index 2ed72cdd4ba56..770e51bcd1c87 100644
--- a/llvm/test/MC/AArch64/SVE/ld3h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld3h-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
ld3h {z12.h, z13.h, z14.h}, p4/z, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3h {z12.h, z13.h, z14.h}, p4/z, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3h {z7.h, z8.h, z9.h}, p3/z, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3h {z7.h, z8.h, z9.h}, p3/z, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld3h {z7.h, z8.h, z9.h}, p3/z, [x1, #24, MUL VL]
// Immediate not a multiple of three.
ld3h {z12.h, z13.h, z14.h}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3h {z12.h, z13.h, z14.h}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3h {z7.h, z8.h, z9.h}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3h {z7.h, z8.h, z9.h}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld3w-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld3w-diagnostics.s
index 0cfcd93dde6f5..38c4d09a2de98 100644
--- a/llvm/test/MC/AArch64/SVE/ld3w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld3w-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
ld3w {z12.s, z13.s, z14.s}, p4/z, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3w {z12.s, z13.s, z14.s}, p4/z, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3w {z7.s, z8.s, z9.s}, p3/z, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3w {z7.s, z8.s, z9.s}, p3/z, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld3w {z7.s, z8.s, z9.s}, p3/z, [x1, #24, MUL VL]
// Immediate not a multiple of three.
ld3w {z12.s, z13.s, z14.s}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3w {z12.s, z13.s, z14.s}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3w {z7.s, z8.s, z9.s}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3w {z7.s, z8.s, z9.s}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld4b-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld4b-diagnostics.s
index 9b5242f1dd27c..086482ab25317 100644
--- a/llvm/test/MC/AArch64/SVE/ld4b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld4b-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
ld4b {z12.b, z13.b, z14.b, z15.b}, p4/z, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4b {z12.b, z13.b, z14.b, z15.b}, p4/z, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4b {z7.b, z8.b, z9.b, z10.b}, p3/z, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4b {z7.b, z8.b, z9.b, z10.b}, p3/z, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld4b {z7.b, z8.b, z9.b, z10.b}, p3/z, [x1, #32, MUL VL]
// Immediate not a multiple of four.
ld4b {z12.b, z13.b, z14.b, z15.b}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4b {z12.b, z13.b, z14.b, z15.b}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4b {z7.b, z8.b, z9.b, z10.b}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4b {z7.b, z8.b, z9.b, z10.b}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld4d-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld4d-diagnostics.s
index 533b01f2081f8..08998ef416f3d 100644
--- a/llvm/test/MC/AArch64/SVE/ld4d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld4d-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
ld4d {z12.d, z13.d, z14.d, z15.d}, p4/z, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4d {z12.d, z13.d, z14.d, z15.d}, p4/z, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4d {z7.d, z8.d, z9.d, z10.d}, p3/z, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4d {z7.d, z8.d, z9.d, z10.d}, p3/z, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld4d {z7.d, z8.d, z9.d, z10.d}, p3/z, [x1, #32, MUL VL]
// Immediate not a multiple of four.
ld4d {z12.d, z13.d, z14.d, z15.d}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4d {z12.d, z13.d, z14.d, z15.d}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4d {z7.d, z8.d, z9.d, z10.d}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4d {z7.d, z8.d, z9.d, z10.d}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld4h-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld4h-diagnostics.s
index 41d1b95dccb31..6795937895ed8 100644
--- a/llvm/test/MC/AArch64/SVE/ld4h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld4h-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
ld4h {z12.h, z13.h, z14.h, z15.h}, p4/z, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4h {z12.h, z13.h, z14.h, z15.h}, p4/z, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4h {z7.h, z8.h, z9.h, z10.h}, p3/z, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4h {z7.h, z8.h, z9.h, z10.h}, p3/z, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld4h {z7.h, z8.h, z9.h, z10.h}, p3/z, [x1, #32, MUL VL]
// Immediate not a multiple of four.
ld4h {z12.h, z13.h, z14.h, z15.h}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4h {z12.h, z13.h, z14.h, z15.h}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4h {z7.h, z8.h, z9.h, z10.h}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4h {z7.h, z8.h, z9.h, z10.h}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ld4w-diagnostics.s b/llvm/test/MC/AArch64/SVE/ld4w-diagnostics.s
index 2e9e14b81cf33..0ce0b053ae802 100644
--- a/llvm/test/MC/AArch64/SVE/ld4w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ld4w-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
ld4w {z12.s, z13.s, z14.s, z15.s}, p4/z, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4w {z12.s, z13.s, z14.s, z15.s}, p4/z, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4w {z7.s, z8.s, z9.s, z10.s}, p3/z, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4w {z7.s, z8.s, z9.s, z10.s}, p3/z, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ ld4w {z7.s, z8.s, z9.s, z10.s}, p3/z, [x1, #32, MUL VL]
// Immediate not a multiple of four.
ld4w {z12.s, z13.s, z14.s, z15.s}, p4/z, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4w {z12.s, z13.s, z14.s, z15.s}, p4/z, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4w {z7.s, z8.s, z9.s, z10.s}, p3/z, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4w {z7.s, z8.s, z9.s, z10.s}, p3/z, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldff1d-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldff1d-diagnostics.s
index 152edf342c26c..d2f8d24c2e210 100644
--- a/llvm/test/MC/AArch64/SVE/ldff1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldff1d-diagnostics.s
@@ -88,27 +88,27 @@ ldff1d z0.s, p0/z, [z0.s, #8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1d z0.d, p0/z, [z0.d, #-8]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ldff1d z0.d, p0/z, [z0.d, #-8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1d z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ldff1d z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1d z0.d, p0/z, [z0.d, #249]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ldff1d z0.d, p0/z, [z0.d, #249]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1d z0.d, p0/z, [z0.d, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ldff1d z0.d, p0/z, [z0.d, #256]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1d z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: ldff1d z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldff1h-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldff1h-diagnostics.s
index 6a8a1f51ea82e..34d13d76fd22e 100644
--- a/llvm/test/MC/AArch64/SVE/ldff1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldff1h-diagnostics.s
@@ -93,52 +93,52 @@ ldff1h z0.d, p0/z, [x0, z0.d, sxtw #2]
// Invalid vector + immediate addressing modes
ldff1h z0.s, p0/z, [z0.s, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.s, p0/z, [z0.s, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.s, p0/z, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.s, p0/z, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.s, p0/z, [z0.s, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.s, p0/z, [z0.s, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.s, p0/z, [z0.s, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.s, p0/z, [z0.s, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.s, p0/z, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.s, p0/z, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.d, p0/z, [z0.d, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.d, p0/z, [z0.d, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.d, p0/z, [z0.d, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.d, p0/z, [z0.d, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.d, p0/z, [z0.d, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.d, p0/z, [z0.d, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1h z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1h z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldff1sh-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldff1sh-diagnostics.s
index 7d10c655d5e7a..b0e0ed4e50c56 100644
--- a/llvm/test/MC/AArch64/SVE/ldff1sh-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldff1sh-diagnostics.s
@@ -87,52 +87,52 @@ ldff1sh z0.d, p0/z, [x0, z0.d, sxtw #2]
// Invalid vector + immediate addressing modes
ldff1sh z0.s, p0/z, [z0.s, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.s, p0/z, [z0.s, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.s, p0/z, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.s, p0/z, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.s, p0/z, [z0.s, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.s, p0/z, [z0.s, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.s, p0/z, [z0.s, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.s, p0/z, [z0.s, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.s, p0/z, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.s, p0/z, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.d, p0/z, [z0.d, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.d, p0/z, [z0.d, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.d, p0/z, [z0.d, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.d, p0/z, [z0.d, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.d, p0/z, [z0.d, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.d, p0/z, [z0.d, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sh z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: ldff1sh z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldff1sw-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldff1sw-diagnostics.s
index 1beae2007bd15..98a9c760030d5 100644
--- a/llvm/test/MC/AArch64/SVE/ldff1sw-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldff1sw-diagnostics.s
@@ -93,27 +93,27 @@ ldff1sw z0.s, p0/z, [z0.s, #4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sw z0.d, p0/z, [z0.d, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1sw z0.d, p0/z, [z0.d, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sw z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1sw z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sw z0.d, p0/z, [z0.d, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1sw z0.d, p0/z, [z0.d, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sw z0.d, p0/z, [z0.d, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1sw z0.d, p0/z, [z0.d, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1sw z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1sw z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldff1w-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldff1w-diagnostics.s
index da542c9e4cd17..6f56fd1ea0bb2 100644
--- a/llvm/test/MC/AArch64/SVE/ldff1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldff1w-diagnostics.s
@@ -93,52 +93,52 @@ ldff1w z0.d, p0/z, [x0, z0.d, sxtw #3]
// Invalid vector + immediate addressing modes
ldff1w z0.s, p0/z, [z0.s, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.s, p0/z, [z0.s, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.s, p0/z, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.s, p0/z, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.s, p0/z, [z0.s, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.s, p0/z, [z0.s, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.s, p0/z, [z0.s, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.s, p0/z, [z0.s, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.s, p0/z, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.s, p0/z, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.d, p0/z, [z0.d, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.d, p0/z, [z0.d, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.d, p0/z, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.d, p0/z, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.d, p0/z, [z0.d, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.d, p0/z, [z0.d, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.d, p0/z, [z0.d, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.d, p0/z, [z0.d, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldff1w z0.d, p0/z, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: ldff1w z0.d, p0/z, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnf1b-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnf1b-diagnostics.s
index 1b641282fbde2..c52354a985f47 100644
--- a/llvm/test/MC/AArch64/SVE/ldnf1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnf1b-diagnostics.s
@@ -4,42 +4,42 @@
// Immediate out of lower bound [-8, 7].
ldnf1b z23.b, p0/z, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z23.b, p0/z, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1b z29.b, p0/z, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z29.b, p0/z, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1b z21.h, p4/z, [x17, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z21.h, p4/z, [x17, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1b z10.h, p5/z, [x16, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z10.h, p5/z, [x16, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1b z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1b z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1b z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1b z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1b z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnf1d-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnf1d-diagnostics.s
index 9037913f929db..45fa6073a0e91 100644
--- a/llvm/test/MC/AArch64/SVE/ldnf1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnf1d-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
ldnf1d z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1d z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1d z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1d z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnf1h-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnf1h-diagnostics.s
index 344826415a2a9..75eeda1e23d11 100644
--- a/llvm/test/MC/AArch64/SVE/ldnf1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnf1h-diagnostics.s
@@ -4,32 +4,32 @@
// Immediate out of lower bound [-8, 7].
ldnf1h z21.h, p4/z, [x17, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1h z21.h, p4/z, [x17, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1h z10.h, p5/z, [x16, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1h z10.h, p5/z, [x16, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1h z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1h z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1h z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1h z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1h z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1h z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1h z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1h z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s
index b34419cc585fc..fc4ae23453177 100644
--- a/llvm/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnf1sb-diagnostics.s
@@ -18,32 +18,32 @@ ldnf1sb z29.b, p0/z, [x3, #1, MUL VL]
// Immediate out of lower bound [-8, 7].
ldnf1sb z21.h, p4/z, [x17, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sb z21.h, p4/z, [x17, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sb z10.h, p5/z, [x16, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sb z10.h, p5/z, [x16, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sb z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sb z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sb z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sb z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sb z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sb z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sb z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sb z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s
index c3a50699abe24..3055c1d37266b 100644
--- a/llvm/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnf1sh-diagnostics.s
@@ -18,22 +18,22 @@ ldnf1sh z29.h, p0/z, [x3, #1, MUL VL]
// Immediate out of lower bound [-8, 7].
ldnf1sh z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sh z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sh z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sh z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sh z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sh z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sh z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sh z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s
index c4a25efd44a3e..04c2a5bae27c9 100644
--- a/llvm/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnf1sw-diagnostics.s
@@ -18,12 +18,12 @@ ldnf1sw z29.s, p0/z, [x3, #1, MUL VL]
// Immediate out of lower bound [-8, 7].
ldnf1sw z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sw z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1sw z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1sw z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnf1w-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnf1w-diagnostics.s
index 829af248ea98f..896ed150dac26 100644
--- a/llvm/test/MC/AArch64/SVE/ldnf1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnf1w-diagnostics.s
@@ -4,22 +4,22 @@
// Immediate out of lower bound [-8, 7].
ldnf1w z30.s, p6/z, [x25, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1w z30.s, p6/z, [x25, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1w z29.s, p5/z, [x15, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1w z29.s, p5/z, [x15, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1w z28.d, p2/z, [x28, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1w z28.d, p2/z, [x28, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnf1w z27.d, p1/z, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnf1w z27.d, p1/z, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnt1b-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnt1b-diagnostics.s
index 9771d68979208..726ce73422596 100644
--- a/llvm/test/MC/AArch64/SVE/ldnt1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnt1b-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
ldnt1b z23.b, p0/z, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1b z23.b, p0/z, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1b z29.b, p0/z, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1b z29.b, p0/z, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnt1d-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnt1d-diagnostics.s
index 7f458132aef3c..55139294d1d40 100644
--- a/llvm/test/MC/AArch64/SVE/ldnt1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnt1d-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
ldnt1d z23.d, p0/z, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1d z23.d, p0/z, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1d z29.d, p0/z, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1d z29.d, p0/z, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnt1h-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnt1h-diagnostics.s
index ec6f1a9c93460..157dc5754d3a0 100644
--- a/llvm/test/MC/AArch64/SVE/ldnt1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnt1h-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
ldnt1h z23.h, p0/z, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1h z23.h, p0/z, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1h z29.h, p0/z, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1h z29.h, p0/z, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/ldnt1w-diagnostics.s b/llvm/test/MC/AArch64/SVE/ldnt1w-diagnostics.s
index ae1e4cef1ace0..1a970400d9ec5 100644
--- a/llvm/test/MC/AArch64/SVE/ldnt1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/ldnt1w-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
ldnt1w z23.s, p0/z, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1w z23.s, p0/z, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1w z29.s, p0/z, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ldnt1w z29.s, p0/z, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/matrix-multiply-fp-diagnostics.s b/llvm/test/MC/AArch64/SVE/matrix-multiply-fp-diagnostics.s
index 2fe43f7aa8444..46d26ab85e9d6 100644
--- a/llvm/test/MC/AArch64/SVE/matrix-multiply-fp-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/matrix-multiply-fp-diagnostics.s
@@ -18,33 +18,33 @@ fmmla z0.s, z1.s, z2.d
// Immediate too high (>224)
ld1rob { z0.b }, p1/z, [x2, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1roh { z0.h }, p1/z, [x2, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1row { z0.s }, p1/z, [x2, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1rod { z0.d }, p1/z, [x2, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
// Immediate too low (<-256)
ld1rob { z0.b }, p1/z, [x2, #-288]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1roh { z0.h }, p1/z, [x2, #-288]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1row { z0.s }, p1/z, [x2, #-288]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1rod { z0.d }, p1/z, [x2, #-288]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
// Immediate not a multiple of 32
ld1rob { z0.b }, p1/z, [x2, #16]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1roh { z0.h }, p1/z, [x2, #16]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1row { z0.s }, p1/z, [x2, #16]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
ld1rod { z0.d }, p1/z, [x2, #16]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 32 in range [-256, 224].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 32 in range [-256, 224].
// Prediate register too high
ld1rob { z0.b }, p8/z, [x2]
diff --git a/llvm/test/MC/AArch64/SVE/mul-diagnostics.s b/llvm/test/MC/AArch64/SVE/mul-diagnostics.s
index 8254bbd7b3a62..f8f301dc9c73a 100644
--- a/llvm/test/MC/AArch64/SVE/mul-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/mul-diagnostics.s
@@ -5,12 +5,12 @@
// Invalid immediate range
mul z0.b, z0.b, #-129
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-128, 127].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-128, 127].
// CHECK-NEXT: mul z0.b, z0.b, #-129
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
mul z0.b, z0.b, #128
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-128, 127].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-128, 127].
// CHECK-NEXT: mul z0.b, z0.b, #128
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/prfb-diagnostics.s b/llvm/test/MC/AArch64/SVE/prfb-diagnostics.s
index eddd975d8060a..7a5a19c89484e 100644
--- a/llvm/test/MC/AArch64/SVE/prfb-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/prfb-diagnostics.s
@@ -29,12 +29,12 @@ prfb #pldl1keep, p0, [x0]
// invalid scalar + scalar addressing modes
prfb #0, p0, [x0, #-33, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfb #0, p0, [x0, #-33, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfb #0, p0, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfb #0, p0, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/prfd-diagnostics.s b/llvm/test/MC/AArch64/SVE/prfd-diagnostics.s
index 62247fc6009d1..2ba3823d48a39 100644
--- a/llvm/test/MC/AArch64/SVE/prfd-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/prfd-diagnostics.s
@@ -29,12 +29,12 @@ prfd #pldl1keep, p0, [x0]
// invalid scalar + scalar addressing modes
prfd #0, p0, [x0, #-33, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfd #0, p0, [x0, #-33, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfd #0, p0, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfd #0, p0, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -82,27 +82,27 @@ prfd #0, p0, [x0, z0.d, lsl]
// Invalid vector + immediate addressing modes
prfd #0, p0, [z0.d, #-8]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: prfd #0, p0, [z0.d, #-8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfd #0, p0, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: prfd #0, p0, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfd #0, p0, [z0.d, #249]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: prfd #0, p0, [z0.d, #249]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfd #0, p0, [z0.d, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: prfd #0, p0, [z0.d, #256]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfd #0, p0, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: prfd #0, p0, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/prfh-diagnostics.s b/llvm/test/MC/AArch64/SVE/prfh-diagnostics.s
index 16be69066ac40..ab3155fc0ff04 100644
--- a/llvm/test/MC/AArch64/SVE/prfh-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/prfh-diagnostics.s
@@ -29,12 +29,12 @@ prfh #pldl1keep, p0, [x0]
// invalid scalar + scalar addressing modes
prfh #0, p0, [x0, #-33, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfh #0, p0, [x0, #-33, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfh #0, p0, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -97,52 +97,52 @@ prfh #0, p0, [x0, z0.d, sxtw #2]
// Invalid vector + immediate addressing modes
prfh #0, p0, [z0.s, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.s, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.s, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.s, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.s, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.s, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.d, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.d, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.d, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.d, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.d, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.d, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfh #0, p0, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: prfh #0, p0, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/prfw-diagnostics.s b/llvm/test/MC/AArch64/SVE/prfw-diagnostics.s
index fcace08e17b97..7ce388dcd7e60 100644
--- a/llvm/test/MC/AArch64/SVE/prfw-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/prfw-diagnostics.s
@@ -29,12 +29,12 @@ prfw #pldl1keep, p0, [x0]
// invalid scalar + scalar addressing modes
prfw #0, p0, [x0, #-33, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfw #0, p0, [x0, #-33, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: prfw #0, p0, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -97,52 +97,52 @@ prfw #0, p0, [x0, z0.d, sxtw #3]
// Invalid vector + immediate addressing modes
prfw #0, p0, [z0.s, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.s, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.s, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.s, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.s, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.s, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.d, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.d, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.d, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.d, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.d, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.d, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
prfw #0, p0, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: prfw #0, p0, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/rdvl-diagnostics.s b/llvm/test/MC/AArch64/SVE/rdvl-diagnostics.s
index e78b5f1292bd4..7bbac18d980b1 100644
--- a/llvm/test/MC/AArch64/SVE/rdvl-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/rdvl-diagnostics.s
@@ -2,7 +2,7 @@
// Immediate out of upper bound [-32, 31].
rdvl x9, #32
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-32, 31].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-32, 31].
// CHECK-NEXT: rdvl x9, #32
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/smax-diagnostics.s b/llvm/test/MC/AArch64/SVE/smax-diagnostics.s
index e61aadcf58c84..97a7c5ecea32d 100644
--- a/llvm/test/MC/AArch64/SVE/smax-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/smax-diagnostics.s
@@ -1,12 +1,12 @@
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve 2>&1 < %s| FileCheck %s
smax z0.b, z0.b, #-129
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-128, 127].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-128, 127].
// CHECK-NEXT: smax z0.b, z0.b, #-129
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
smax z31.b, z31.b, #128
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-128, 127].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-128, 127].
// CHECK-NEXT: smax z31.b, z31.b, #128
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/smin-diagnostics.s b/llvm/test/MC/AArch64/SVE/smin-diagnostics.s
index 5f62a2c69b1b5..4bb425f39f5ff 100644
--- a/llvm/test/MC/AArch64/SVE/smin-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/smin-diagnostics.s
@@ -1,12 +1,12 @@
// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve 2>&1 < %s| FileCheck %s
smin z0.b, z0.b, #-129
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-128, 127].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-128, 127].
// CHECK-NEXT: smin z0.b, z0.b, #-129
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
smin z31.b, z31.b, #128
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-128, 127].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-128, 127].
// CHECK-NEXT: smin z31.b, z31.b, #128
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st1b-diagnostics.s b/llvm/test/MC/AArch64/SVE/st1b-diagnostics.s
index 957550c6d6cf2..f03fadf7f94cc 100644
--- a/llvm/test/MC/AArch64/SVE/st1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st1b-diagnostics.s
@@ -4,42 +4,42 @@
// Immediate out of upper bound [-8, 7].
st1b z10.b, p4, [x8, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z10.b, p4, [x8, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b z18.b, p4, [x24, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z18.b, p4, [x24, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b z11.h, p0, [x23, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z11.h, p0, [x23, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b z24.h, p3, [x1, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z24.h, p3, [x1, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b z6.s, p5, [x23, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z6.s, p5, [x23, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b z16.s, p6, [x14, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z16.s, p6, [x14, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b z26.d, p2, [x7, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z26.d, p2, [x7, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b z27.d, p1, [x12, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1b z27.d, p1, [x12, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st1d-diagnostics.s b/llvm/test/MC/AArch64/SVE/st1d-diagnostics.s
index 237daa04aa362..d7b6f07cd14b9 100644
--- a/llvm/test/MC/AArch64/SVE/st1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st1d-diagnostics.s
@@ -4,13 +4,13 @@
// Immediate out of lower bound [-8, 7].
st1d z25.d, p4, [x16, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1d z25.d, p4, [x16, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
// Immediate out of upper bound [-8, 7].
st1d z16.d, p4, [x2, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1d z16.d, p4, [x2, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -118,27 +118,27 @@ st1d z0.s, p0, [z0.s, #8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d z0.d, p0, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: st1d z0.d, p0, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d z0.d, p0, [z0.d, #-8]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: st1d z0.d, p0, [z0.d, #-8]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d z0.d, p0, [z0.d, #249]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: st1d z0.d, p0, [z0.d, #249]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d z0.d, p0, [z0.d, #256]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: st1d z0.d, p0, [z0.d, #256]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d z0.d, p0, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 8 in range [0, 248].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 8 in range [0, 248].
// CHECK-NEXT: st1d z0.d, p0, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st1h-diagnostics.s b/llvm/test/MC/AArch64/SVE/st1h-diagnostics.s
index 89964b85f9084..a8fb510bfdfc9 100644
--- a/llvm/test/MC/AArch64/SVE/st1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st1h-diagnostics.s
@@ -4,32 +4,32 @@
// Immediate out of upper bound [-8, 7].
st1h z29.h, p5, [x7, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1h z29.h, p5, [x7, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z29.h, p5, [x4, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1h z29.h, p5, [x4, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z21.s, p2, [x1, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1h z21.s, p2, [x1, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z17.s, p5, [x1, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1h z17.s, p5, [x1, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.d, p1, [x14, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1h z0.d, p1, [x14, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z24.d, p3, [x16, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1h z24.d, p3, [x16, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -151,52 +151,52 @@ st1h z0.d, p0, [x0, z0.d, sxtw #2]
// Invalid vector + immediate addressing modes
st1h z0.s, p0, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.s, p0, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.s, p0, [z0.s, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.s, p0, [z0.s, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.s, p0, [z0.s, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.s, p0, [z0.s, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.s, p0, [z0.s, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.s, p0, [z0.s, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.s, p0, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.s, p0, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.d, p0, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.d, p0, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.d, p0, [z0.d, #-2]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.d, p0, [z0.d, #-2]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.d, p0, [z0.d, #63]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.d, p0, [z0.d, #63]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.d, p0, [z0.d, #64]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.d, p0, [z0.d, #64]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h z0.d, p0, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [0, 62].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [0, 62].
// CHECK-NEXT: st1h z0.d, p0, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st1w-diagnostics.s b/llvm/test/MC/AArch64/SVE/st1w-diagnostics.s
index c2e8edd59194b..2aa99a325e7fb 100644
--- a/llvm/test/MC/AArch64/SVE/st1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st1w-diagnostics.s
@@ -4,25 +4,25 @@
// Immediate out of lower bound [-8, 7].
st1w z19.s, p2, [x18, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1w z19.s, p2, [x18, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
// Immediate out of upper bound [-8, 7].
st1w z1.s, p5, [x23, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1w z1.s, p5, [x23, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
// Immediate out of lower bound [-8, 7].
st1w z21.d, p2, [x29, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1w z21.d, p2, [x29, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
// Immediate out of upper bound [-8, 7].
st1w z10.d, p5, [x26, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1w z10.d, p5, [x26, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -140,52 +140,52 @@ st1w z0.d, p0, [x0, z0.d, sxtw #3]
// Invalid vector + immediate addressing modes
st1w z0.s, p0, [z0.s, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.s, p0, [z0.s, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.s, p0, [z0.s, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.s, p0, [z0.s, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.s, p0, [z0.s, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.s, p0, [z0.s, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.s, p0, [z0.s, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.s, p0, [z0.s, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.s, p0, [z0.s, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.s, p0, [z0.s, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.d, p0, [z0.d, #-1]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.d, p0, [z0.d, #-1]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.d, p0, [z0.d, #-4]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.d, p0, [z0.d, #-4]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.d, p0, [z0.d, #125]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.d, p0, [z0.d, #125]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.d, p0, [z0.d, #128]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.d, p0, [z0.d, #128]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w z0.d, p0, [z0.d, #3]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [0, 124].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [0, 124].
// CHECK-NEXT: st1w z0.d, p0, [z0.d, #3]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st2b-diagnostics.s b/llvm/test/MC/AArch64/SVE/st2b-diagnostics.s
index ebbd89cfaed60..75d8576001dbf 100644
--- a/llvm/test/MC/AArch64/SVE/st2b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st2b-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
st2b {z12.b, z13.b}, p4, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2b {z12.b, z13.b}, p4, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2b {z7.b, z8.b}, p3, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2b {z7.b, z8.b}, p3, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st2b {z7.b, z8.b}, p3, [x1, #16, MUL VL]
// Immediate not a multiple of two.
st2b {z12.b, z13.b}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2b {z12.b, z13.b}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2b {z7.b, z8.b}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2b {z7.b, z8.b}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st2d-diagnostics.s b/llvm/test/MC/AArch64/SVE/st2d-diagnostics.s
index 203b06929a890..bcb8599450f82 100644
--- a/llvm/test/MC/AArch64/SVE/st2d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st2d-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
st2d {z12.d, z13.d}, p4, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2d {z12.d, z13.d}, p4, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2d {z7.d, z8.d}, p3, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2d {z7.d, z8.d}, p3, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st2d {z7.d, z8.d}, p3, [x1, #16, MUL VL]
// Immediate not a multiple of two.
st2d {z12.d, z13.d}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2d {z12.d, z13.d}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2d {z7.d, z8.d}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2d {z7.d, z8.d}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st2h-diagnostics.s b/llvm/test/MC/AArch64/SVE/st2h-diagnostics.s
index b07ffc6b95cea..13d1d9ee96d51 100644
--- a/llvm/test/MC/AArch64/SVE/st2h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st2h-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
st2h {z12.h, z13.h}, p4, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2h {z12.h, z13.h}, p4, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2h {z7.h, z8.h}, p3, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2h {z7.h, z8.h}, p3, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st2h {z7.h, z8.h}, p3, [x1, #16, MUL VL]
// Immediate not a multiple of two.
st2h {z12.h, z13.h}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2h {z12.h, z13.h}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2h {z7.h, z8.h}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2h {z7.h, z8.h}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st2w-diagnostics.s b/llvm/test/MC/AArch64/SVE/st2w-diagnostics.s
index f375aa5e7459e..155caff88eada 100644
--- a/llvm/test/MC/AArch64/SVE/st2w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st2w-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-16, 14].
st2w {z12.s, z13.s}, p4, [x12, #-18, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2w {z12.s, z13.s}, p4, [x12, #-18, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2w {z7.s, z8.s}, p3, [x1, #16, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2w {z7.s, z8.s}, p3, [x1, #16, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st2w {z7.s, z8.s}, p3, [x1, #16, MUL VL]
// Immediate not a multiple of two.
st2w {z12.s, z13.s}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2w {z12.s, z13.s}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2w {z7.s, z8.s}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2w {z7.s, z8.s}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st3b-diagnostics.s b/llvm/test/MC/AArch64/SVE/st3b-diagnostics.s
index 821b4bb10b690..5926aba8c5191 100644
--- a/llvm/test/MC/AArch64/SVE/st3b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st3b-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
st3b {z12.b, z13.b, z14.b}, p4, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3b {z12.b, z13.b, z14.b}, p4, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3b {z7.b, z8.b, z9.b}, p3, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3b {z7.b, z8.b, z9.b}, p3, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st3b {z7.b, z8.b, z9.b}, p3, [x1, #24, MUL VL]
// Immediate not a multiple of three.
st3b {z12.b, z13.b, z14.b}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3b {z12.b, z13.b, z14.b}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3b {z7.b, z8.b, z9.b}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3b {z7.b, z8.b, z9.b}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st3d-diagnostics.s b/llvm/test/MC/AArch64/SVE/st3d-diagnostics.s
index a7f9fdc2647aa..0c52f3b46b278 100644
--- a/llvm/test/MC/AArch64/SVE/st3d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st3d-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
st3d {z12.d, z13.d, z14.d}, p4, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3d {z12.d, z13.d, z14.d}, p4, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3d {z7.d, z8.d, z9.d}, p3, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3d {z7.d, z8.d, z9.d}, p3, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st3d {z7.d, z8.d, z9.d}, p3, [x1, #24, MUL VL]
// Immediate not a multiple of three.
st3d {z12.d, z13.d, z14.d}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3d {z12.d, z13.d, z14.d}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3d {z7.d, z8.d, z9.d}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3d {z7.d, z8.d, z9.d}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st3h-diagnostics.s b/llvm/test/MC/AArch64/SVE/st3h-diagnostics.s
index f3cbeb9e31138..f6dca50abdfa6 100644
--- a/llvm/test/MC/AArch64/SVE/st3h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st3h-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
st3h {z12.h, z13.h, z14.h}, p4, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3h {z12.h, z13.h, z14.h}, p4, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3h {z7.h, z8.h, z9.h}, p3, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3h {z7.h, z8.h, z9.h}, p3, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st3h {z7.h, z8.h, z9.h}, p3, [x1, #24, MUL VL]
// Immediate not a multiple of three.
st3h {z12.h, z13.h, z14.h}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3h {z12.h, z13.h, z14.h}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3h {z7.h, z8.h, z9.h}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3h {z7.h, z8.h, z9.h}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st3w-diagnostics.s b/llvm/test/MC/AArch64/SVE/st3w-diagnostics.s
index ce62db7691b3f..0dd6310bb8f8f 100644
--- a/llvm/test/MC/AArch64/SVE/st3w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st3w-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-24, 21].
st3w {z12.s, z13.s, z14.s}, p4, [x12, #-27, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3w {z12.s, z13.s, z14.s}, p4, [x12, #-27, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3w {z7.s, z8.s, z9.s}, p3, [x1, #24, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3w {z7.s, z8.s, z9.s}, p3, [x1, #24, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st3w {z7.s, z8.s, z9.s}, p3, [x1, #24, MUL VL]
// Immediate not a multiple of three.
st3w {z12.s, z13.s, z14.s}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3w {z12.s, z13.s, z14.s}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3w {z7.s, z8.s, z9.s}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3w {z7.s, z8.s, z9.s}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st4b-diagnostics.s b/llvm/test/MC/AArch64/SVE/st4b-diagnostics.s
index 438347100860e..0ba168f5e76d0 100644
--- a/llvm/test/MC/AArch64/SVE/st4b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st4b-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
st4b {z12.b, z13.b, z14.b, z15.b}, p4, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4b {z12.b, z13.b, z14.b, z15.b}, p4, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4b {z7.b, z8.b, z9.b, z10.b}, p3, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4b {z7.b, z8.b, z9.b, z10.b}, p3, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st4b {z7.b, z8.b, z9.b, z10.b}, p3, [x1, #32, MUL VL]
// Immediate not a multiple of four.
st4b {z12.b, z13.b, z14.b, z15.b}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4b {z12.b, z13.b, z14.b, z15.b}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4b {z7.b, z8.b, z9.b, z10.b}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4b {z7.b, z8.b, z9.b, z10.b}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st4d-diagnostics.s b/llvm/test/MC/AArch64/SVE/st4d-diagnostics.s
index 147882b8dc1cd..2d8366be916da 100644
--- a/llvm/test/MC/AArch64/SVE/st4d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st4d-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
st4d {z12.d, z13.d, z14.d, z15.d}, p4, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4d {z12.d, z13.d, z14.d, z15.d}, p4, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4d {z7.d, z8.d, z9.d, z10.d}, p3, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4d {z7.d, z8.d, z9.d, z10.d}, p3, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st4d {z7.d, z8.d, z9.d, z10.d}, p3, [x1, #32, MUL VL]
// Immediate not a multiple of four.
st4d {z12.d, z13.d, z14.d, z15.d}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4d {z12.d, z13.d, z14.d, z15.d}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4d {z7.d, z8.d, z9.d, z10.d}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4d {z7.d, z8.d, z9.d, z10.d}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st4h-diagnostics.s b/llvm/test/MC/AArch64/SVE/st4h-diagnostics.s
index 1a1e266120152..d2bc291b2e27b 100644
--- a/llvm/test/MC/AArch64/SVE/st4h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st4h-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
st4h {z12.h, z13.h, z14.h, z15.h}, p4, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4h {z12.h, z13.h, z14.h, z15.h}, p4, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4h {z7.h, z8.h, z9.h, z10.h}, p3, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4h {z7.h, z8.h, z9.h, z10.h}, p3, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st4h {z7.h, z8.h, z9.h, z10.h}, p3, [x1, #32, MUL VL]
// Immediate not a multiple of four.
st4h {z12.h, z13.h, z14.h, z15.h}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4h {z12.h, z13.h, z14.h, z15.h}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4h {z7.h, z8.h, z9.h, z10.h}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4h {z7.h, z8.h, z9.h, z10.h}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/st4w-diagnostics.s b/llvm/test/MC/AArch64/SVE/st4w-diagnostics.s
index e5388f57d6a77..da808bc1397cb 100644
--- a/llvm/test/MC/AArch64/SVE/st4w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/st4w-diagnostics.s
@@ -5,12 +5,12 @@
// Immediate out of lower bound [-32, 28].
st4w {z12.s, z13.s, z14.s, z15.s}, p4, [x12, #-36, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4w {z12.s, z13.s, z14.s, z15.s}, p4, [x12, #-36, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4w {z7.s, z8.s, z9.s, z10.s}, p3, [x1, #32, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4w {z7.s, z8.s, z9.s, z10.s}, p3, [x1, #32, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
@@ -19,12 +19,12 @@ st4w {z7.s, z8.s, z9.s, z10.s}, p3, [x1, #32, MUL VL]
// Immediate not a multiple of four.
st4w {z12.s, z13.s, z14.s, z15.s}, p4, [x12, #-7, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4w {z12.s, z13.s, z14.s, z15.s}, p4, [x12, #-7, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4w {z7.s, z8.s, z9.s, z10.s}, p3, [x1, #5, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4w {z7.s, z8.s, z9.s, z10.s}, p3, [x1, #5, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/stnt1b-diagnostics.s b/llvm/test/MC/AArch64/SVE/stnt1b-diagnostics.s
index e07a9bf65c112..282ccaa4c70cd 100644
--- a/llvm/test/MC/AArch64/SVE/stnt1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/stnt1b-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
stnt1b z23.b, p0, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1b z23.b, p0, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1b z29.b, p0, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1b z29.b, p0, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/stnt1d-diagnostics.s b/llvm/test/MC/AArch64/SVE/stnt1d-diagnostics.s
index 7026659c66f71..20cee96660dd6 100644
--- a/llvm/test/MC/AArch64/SVE/stnt1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/stnt1d-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
stnt1d z23.d, p0, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1d z23.d, p0, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1d z29.d, p0, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1d z29.d, p0, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/stnt1h-diagnostics.s b/llvm/test/MC/AArch64/SVE/stnt1h-diagnostics.s
index 153fc15043112..3edfc38d1e2e1 100644
--- a/llvm/test/MC/AArch64/SVE/stnt1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/stnt1h-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
stnt1h z23.h, p0, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1h z23.h, p0, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1h z29.h, p0, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1h z29.h, p0, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE/stnt1w-diagnostics.s b/llvm/test/MC/AArch64/SVE/stnt1w-diagnostics.s
index 3c5d5406587f8..1f3ee85a5d752 100644
--- a/llvm/test/MC/AArch64/SVE/stnt1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE/stnt1w-diagnostics.s
@@ -4,12 +4,12 @@
// Immediate out of lower bound [-8, 7].
stnt1w z23.s, p0, [x13, #-9, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1w z23.s, p0, [x13, #-9, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1w z29.s, p0, [x3, #8, MUL VL]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: stnt1w z29.s, p0, [x3, #8, MUL VL]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld1b-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld1b-diagnostics.s
index f6596af54f780..c38d3db2fa13b 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld1b-diagnostics.s
@@ -40,16 +40,16 @@ ld1b {z0.b-z1.b}, pn8.b, [x13, #-8, mul vl]
// Invalid immediate range
ld1b {z0.b-z3.b}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1b {z0.b-z3.b}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b {z0.b-z3.b}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1b {z0.b-z3.b}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1b {z0.b-z3.b}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1b {z0.b-z3.b}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld1d-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld1d-diagnostics.s
index 0ef9decd357bf..02b461c15aace 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld1d-diagnostics.s
@@ -40,16 +40,16 @@ ld1d {z0.d-z1.d}, pn8.d, [x13, #-8, mul vl]
// Invalid immediate range
ld1d {z0.d-z3.d}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1d {z0.d-z3.d}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d {z0.d-z3.d}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1d {z0.d-z3.d}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d {z0.d-z3.d}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1d {z0.d-z3.d}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld1d_q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld1d_q-diagnostics.s
index 7860d9a610d01..f47a95363c982 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld1d_q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld1d_q-diagnostics.s
@@ -22,11 +22,11 @@ ld1d {z23.q}, p2.q, [x13, #-8, mul vl]
// Invalid immediate range
ld1d {z0.q}, p0/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1d {z0.q}, p0/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1d {z3.q}, p0/z, [x0, #8, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1d {z3.q}, p0/z, [x0, #8, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld1h-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld1h-diagnostics.s
index 64c87ed987f4e..6afd77d47f917 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld1h-diagnostics.s
@@ -40,16 +40,16 @@ ld1h {z0.h-z1.h}, pn8.h, [x13, #-8, mul vl]
// Invalid immediate range
ld1h {z0.h-z3.h}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1h {z0.h-z3.h}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h {z0.h-z3.h}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1h {z0.h-z3.h}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1h {z0.h-z3.h}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1h {z0.h-z3.h}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld1w-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld1w-diagnostics.s
index fb9158111bea1..a4b2811debf4a 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld1w-diagnostics.s
@@ -40,16 +40,16 @@ ld1w {z0.s-z1.s}, pn8.s, [x13, #-8, mul vl]
// Invalid immediate range
ld1w {z0.s-z3.s}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1w {z0.s-z3.s}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w {z0.s-z3.s}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1w {z0.s-z3.s}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w {z0.s-z3.s}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ld1w {z0.s-z3.s}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld1w_q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld1w_q-diagnostics.s
index f049add93eb75..2db2120caae09 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld1w_q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld1w_q-diagnostics.s
@@ -22,11 +22,11 @@ ld1w {z23.q}, p2.q, [x13, #-8, mul vl]
// Invalid immediate range
ld1w {z0.q}, p0/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1w {z0.q}, p0/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld1w {z3.q}, p0/z, [x0, #8, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: ld1w {z3.q}, p0/z, [x0, #8, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld2q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld2q-diagnostics.s
index ad8c7b263c7f5..0677f223e5f7b 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld2q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld2q-diagnostics.s
@@ -22,11 +22,11 @@ ld2q {z21.q, z22.q}, p2.q, [x10, x21, lsl #4]
// Invalid immediate offset
ld2q {z23.q, z24.q}, p3/z, [x13, #-17, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2q {z23.q, z24.q}, p3/z, [x13, #-17, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld2q {z23.q, z24.q}, p3/z, [x13, #15, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: ld2q {z23.q, z24.q}, p3/z, [x13, #15, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld3q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld3q-diagnostics.s
index 8a612e61dc860..921a49c7ca4e0 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld3q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld3q-diagnostics.s
@@ -22,11 +22,11 @@ ld3q {z21.q, z22.q, z23.q}, p2.q, [x10, x21, lsl #4]
// Invalid immediate offset
ld3q {z23.q, z24.q, z25.q}, p3/z, [x13, #-25, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3q {z23.q, z24.q, z25.q}, p3/z, [x13, #-25, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld3q {z23.q, z24.q, z25.q}, p3/z, [x13, #22, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: ld3q {z23.q, z24.q, z25.q}, p3/z, [x13, #22, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ld4q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ld4q-diagnostics.s
index 183cccc9fa3b4..c264dc492c7aa 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ld4q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ld4q-diagnostics.s
@@ -22,11 +22,11 @@ ld4q {z21.q, z22.q, z23.q, z24.q}, p2.q, [x10, x21, lsl #4]
// Invalid immediate offset
ld4q {z23.q, z24.q, z25.q, z26.q}, p3/z, [x13, #-33, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4q {z23.q, z24.q, z25.q, z26.q}, p3/z, [x13, #-33, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ld4q {z23.q, z24.q, z25.q, z26.q}, p3/z, [x13, #29, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: ld4q {z23.q, z24.q, z25.q, z26.q}, p3/z, [x13, #29, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ldnt1b-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ldnt1b-diagnostics.s
index 040469cbdd5bc..3a732d8b05107 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ldnt1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ldnt1b-diagnostics.s
@@ -40,16 +40,16 @@ ldnt1b {z0.b-z1.b}, pn8.b, [x13, #-8, mul vl]
// Invalid immediate range
ldnt1b {z0.b-z3.b}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1b {z0.b-z3.b}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1b {z0.b-z3.b}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1b {z0.b-z3.b}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1b {z0.b-z3.b}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1b {z0.b-z3.b}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ldnt1d-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ldnt1d-diagnostics.s
index af7fab1ed0188..bf5c0955e411d 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ldnt1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ldnt1d-diagnostics.s
@@ -40,16 +40,16 @@ ldnt1d {z0.d-z1.d}, pn8.d, [x13, #-8, mul vl]
// Invalid immediate range
ldnt1d {z0.d-z3.d}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1d {z0.d-z3.d}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1d {z0.d-z3.d}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1d {z0.d-z3.d}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1d {z0.d-z3.d}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1d {z0.d-z3.d}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ldnt1h-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ldnt1h-diagnostics.s
index 92a24578e0506..ec39d18baf4b9 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ldnt1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ldnt1h-diagnostics.s
@@ -40,16 +40,16 @@ ldnt1h {z0.h-z1.h}, pn8.h, [x13, #-8, mul vl]
// Invalid immediate range
ldnt1h {z0.h-z3.h}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1h {z0.h-z3.h}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1h {z0.h-z3.h}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1h {z0.h-z3.h}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1h {z0.h-z3.h}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1h {z0.h-z3.h}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/ldnt1w-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/ldnt1w-diagnostics.s
index c5c41a1645721..948eefe410e74 100644
--- a/llvm/test/MC/AArch64/SVE2p1/ldnt1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/ldnt1w-diagnostics.s
@@ -40,16 +40,16 @@ ldnt1w {z0.s-z1.s}, pn8.s, [x13, #-8, mul vl]
// Invalid immediate range
ldnt1w {z0.s-z3.s}, pn8/z, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1w {z0.s-z3.s}, pn8/z, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1w {z0.s-z3.s}, pn8/z, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1w {z0.s-z3.s}, pn8/z, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
ldnt1w {z0.s-z3.s}, pn8/z, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: ldnt1w {z0.s-z3.s}, pn8/z, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st1b-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st1b-diagnostics.s
index 7b8d645994212..663414d3cf49c 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st1b-diagnostics.s
@@ -35,16 +35,16 @@ st1b {z0.b-z1.b}, pn8.b, [x13, #-8, mul vl]
// Invalid immediate range
st1b {z0.b-z3.b}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1b {z0.b-z3.b}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b {z0.b-z3.b}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1b {z0.b-z3.b}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1b {z0.b-z3.b}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1b {z0.b-z3.b}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st1d-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st1d-diagnostics.s
index baa08faae2b8a..8ceaead91cce5 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st1d-diagnostics.s
@@ -35,16 +35,16 @@ st1d {z0.d-z1.d}, pn8.d, [x13, #-8, mul vl]
// Invalid immediate range
st1d {z0.d-z3.d}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1d {z0.d-z3.d}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d {z0.d-z3.d}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1d {z0.d-z3.d}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d {z0.d-z3.d}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1d {z0.d-z3.d}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st1d_q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st1d_q-diagnostics.s
index 4ad52197095dc..07fcb9b5b8ab0 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st1d_q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st1d_q-diagnostics.s
@@ -23,11 +23,11 @@ st1d {z23.q}, p2.q, [x13, #-8, mul vl]
// Invalid immediate range
st1d {z0.q}, p0, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1d {z0.q}, p0, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1d {z3.q}, p0, [x0, #8, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1d {z3.q}, p0, [x0, #8, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st1h-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st1h-diagnostics.s
index a64e3005fe92c..98f586372371a 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st1h-diagnostics.s
@@ -35,16 +35,16 @@ st1h {z0.h-z1.h}, pn8.h, [x13, #-8, mul vl]
// Invalid immediate range
st1h {z0.h-z3.h}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1h {z0.h-z3.h}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h {z0.h-z3.h}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1h {z0.h-z3.h}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1h {z0.h-z3.h}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1h {z0.h-z3.h}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st1w-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st1w-diagnostics.s
index 1fb104e77c14e..b2356c64f7fe5 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st1w-diagnostics.s
@@ -35,16 +35,16 @@ st1w {z0.s-z1.s}, pn8.s, [x13, #-8, mul vl]
// Invalid immediate range
st1w {z0.s-z3.s}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1w {z0.s-z3.s}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w {z0.s-z3.s}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1w {z0.s-z3.s}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w {z0.s-z3.s}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: st1w {z0.s-z3.s}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st1w_q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st1w_q-diagnostics.s
index d337e62666360..5fc02d7ac776b 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st1w_q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st1w_q-diagnostics.s
@@ -22,11 +22,11 @@ st1w {z23.q}, p2.q, [x13, #-8, mul vl]
// Invalid immediate range
st1w {z0.q}, p0, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1w {z0.q}, p0, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st1w {z3.q}, p0, [x0, #8, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be an integer in range [-8, 7].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be an integer in range [-8, 7].
// CHECK-NEXT: st1w {z3.q}, p0, [x0, #8, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st2q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st2q-diagnostics.s
index aa728371ca004..56c4591ea2a74 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st2q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st2q-diagnostics.s
@@ -22,11 +22,11 @@ st2q {z21.q, z22.q}, p2.q, [x10, x21, lsl #4]
// Invalid immediate offset
st2q {z23.q, z24.q}, p3, [x13, #-17, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2q {z23.q, z24.q}, p3, [x13, #-17, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st2q {z23.q, z24.q}, p3, [x13, #15, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 2 in range [-16, 14].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 2 in range [-16, 14].
// CHECK-NEXT: st2q {z23.q, z24.q}, p3, [x13, #15, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st3q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st3q-diagnostics.s
index 57ba2a0ed9d3c..1ddb34b2f1e45 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st3q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st3q-diagnostics.s
@@ -22,11 +22,11 @@ st3q {z21.q, z22.q, z23.q}, p2.q, [x10, x21, lsl #4]
// Invalid immediate offset
st3q {z23.q, z24.q, z25.q}, p3, [x13, #-25, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3q {z23.q, z24.q, z25.q}, p3, [x13, #-25, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st3q {z23.q, z24.q, z25.q}, p3, [x13, #22, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 3 in range [-24, 21].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 3 in range [-24, 21].
// CHECK-NEXT: st3q {z23.q, z24.q, z25.q}, p3, [x13, #22, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/st4q-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/st4q-diagnostics.s
index 2fcef04b0c1d6..33ac70cd9e717 100644
--- a/llvm/test/MC/AArch64/SVE2p1/st4q-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/st4q-diagnostics.s
@@ -22,11 +22,11 @@ st4q {z21.q, z22.q, z23.q, z24.q}, p2.q, [x10, x21, lsl #4]
// Invalid immediate offset
st4q {z23.q, z24.q, z25.q, z26.q}, p3, [x13, #-33, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4q {z23.q, z24.q, z25.q, z26.q}, p3, [x13, #-33, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
st4q {z23.q, z24.q, z25.q, z26.q}, p3, [x13, #29, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28].
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28].
// CHECK-NEXT: st4q {z23.q, z24.q, z25.q, z26.q}, p3, [x13, #29, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/stnt1b-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/stnt1b-diagnostics.s
index fcb77f9bfba64..d201a1be1ae83 100644
--- a/llvm/test/MC/AArch64/SVE2p1/stnt1b-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/stnt1b-diagnostics.s
@@ -35,16 +35,16 @@ stnt1b {z0.b-z1.b}, pn8.b, [x13, #-8, mul vl]
// Invalid immediate range
stnt1b {z0.b-z3.b}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1b {z0.b-z3.b}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1b {z0.b-z3.b}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1b {z0.b-z3.b}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1b {z0.b-z3.b}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1b {z0.b-z3.b}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/stnt1d-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/stnt1d-diagnostics.s
index a0a8af06df63e..4f0f577a4cead 100644
--- a/llvm/test/MC/AArch64/SVE2p1/stnt1d-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/stnt1d-diagnostics.s
@@ -35,16 +35,16 @@ stnt1d {z0.d-z1.d}, pn8.d, [x13, #-8, mul vl]
// Invalid immediate range
stnt1d {z0.d-z3.d}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1d {z0.d-z3.d}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1d {z0.d-z3.d}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1d {z0.d-z3.d}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1d {z0.d-z3.d}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1d {z0.d-z3.d}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/stnt1h-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/stnt1h-diagnostics.s
index cc6cb975635d6..09d44e93c194b 100644
--- a/llvm/test/MC/AArch64/SVE2p1/stnt1h-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/stnt1h-diagnostics.s
@@ -35,16 +35,16 @@ stnt1h {z0.h-z1.h}, pn8.h, [x13, #-8, mul vl]
// Invalid immediate range
stnt1h {z0.h-z3.h}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1h {z0.h-z3.h}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1h {z0.h-z3.h}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1h {z0.h-z3.h}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1h {z0.h-z3.h}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1h {z0.h-z3.h}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/SVE2p1/stnt1w-diagnostics.s b/llvm/test/MC/AArch64/SVE2p1/stnt1w-diagnostics.s
index 145509efe897e..38daa74a08cd5 100644
--- a/llvm/test/MC/AArch64/SVE2p1/stnt1w-diagnostics.s
+++ b/llvm/test/MC/AArch64/SVE2p1/stnt1w-diagnostics.s
@@ -35,16 +35,16 @@ stnt1w {z0.s-z1.s}, pn8.s, [x13, #-8, mul vl]
// Invalid immediate range
stnt1w {z0.s-z3.s}, pn8, [x0, #-9, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1w {z0.s-z3.s}, pn8, [x0, #-9, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1w {z0.s-z3.s}, pn8, [x0, #-36, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1w {z0.s-z3.s}, pn8, [x0, #-36, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
stnt1w {z0.s-z3.s}, pn8, [x0, #32, mul vl]
-// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: index must be a multiple of 4 in range [-32, 28]
+// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: immediate must be a multiple of 4 in range [-32, 28]
// CHECK-NEXT: stnt1w {z0.s-z3.s}, pn8, [x0, #32, mul vl]
// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}:
diff --git a/llvm/test/MC/AArch64/arm64-diags.s b/llvm/test/MC/AArch64/arm64-diags.s
index d364f71ce8c6f..d0757a605a408 100644
--- a/llvm/test/MC/AArch64/arm64-diags.s
+++ b/llvm/test/MC/AArch64/arm64-diags.s
@@ -51,22 +51,22 @@ foo:
; CHECK-ERRORS: error: invalid operand for instruction
; CHECK-ERRORS: ldr w0, [w0], #301
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be a multiple of 4 in range [-256, 252].
+; CHECK-ERRORS: error: immediate must be a multiple of 4 in range [-256, 252].
; CHECK-ERRORS: ldp w3, w4, [x5, #11]!
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be a multiple of 8 in range [-512, 504].
+; CHECK-ERRORS: error: immediate must be a multiple of 8 in range [-512, 504].
; CHECK-ERRORS: ldp x3, x4, [x5, #12]!
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be a multiple of 16 in range [-1024, 1008].
+; CHECK-ERRORS: error: immediate must be a multiple of 16 in range [-1024, 1008].
; CHECK-ERRORS: ldp q3, q4, [x5, #12]!
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be a multiple of 4 in range [-256, 252].
+; CHECK-ERRORS: error: immediate must be a multiple of 4 in range [-256, 252].
; CHECK-ERRORS: ldp w3, w4, [x5], #11
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be a multiple of 8 in range [-512, 504].
+; CHECK-ERRORS: error: immediate must be a multiple of 8 in range [-512, 504].
; CHECK-ERRORS: ldp x3, x4, [x5], #12
; CHECK-ERRORS: ^
-; CHECK-ERRORS: error: index must be a multiple of 16 in range [-1024, 1008].
+; CHECK-ERRORS: error: immediate must be a multiple of 16 in range [-1024, 1008].
; CHECK-ERRORS: ldp q3, q4, [x5], #12
; CHECK-ERRORS: ^
; CHECK-ERRORS: error: immediate must be an integer in range [-256, 255].
diff --git a/llvm/test/MC/AArch64/armv8.3a-diagnostics.s b/llvm/test/MC/AArch64/armv8.3a-diagnostics.s
index 178a64266f26e..e0dd6c7cdffc1 100644
--- a/llvm/test/MC/AArch64/armv8.3a-diagnostics.s
+++ b/llvm/test/MC/AArch64/armv8.3a-diagnostics.s
@@ -7,17 +7,17 @@
// CHECK-NEXT: ^
ldraa x0, [x1, 4089]
-// CHECK: error: index must be a multiple of 8 in range [-4096, 4088].
+// CHECK: error: immediate must be a multiple of 8 in range [-4096, 4088].
ldraa x0, [x1, -4097]
-// CHECK: error: index must be a multiple of 8 in range [-4096, 4088].
+// CHECK: error: immediate must be a multiple of 8 in range [-4096, 4088].
ldraa x0, [x1, 4086]
-// CHECK: error: index must be a multiple of 8 in range [-4096, 4088].
+// CHECK: error: immediate must be a multiple of 8 in range [-4096, 4088].
ldrab x0, [x1, 4089]
-// CHECK: error: index must be a multiple of 8 in range [-4096, 4088].
+// CHECK: error: immediate must be a multiple of 8 in range [-4096, 4088].
ldrab x0, [x1, -4097]
-// CHECK: error: index must be a multiple of 8 in range [-4096, 4088].
+// CHECK: error: immediate must be a multiple of 8 in range [-4096, 4088].
ldrab x0, [x1, 4086]
-// CHECK: error: index must be a multiple of 8 in range [-4096, 4088].
+// CHECK: error: immediate must be a multiple of 8 in range [-4096, 4088].
ldraa x0, [x0, -4096]!
// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: unpredictable LDRA instruction, writeback base is also a destination
ldrab x0, [x0, -4096]!
diff --git a/llvm/test/MC/AArch64/armv8.5a-mte-error.s b/llvm/test/MC/AArch64/armv8.5a-mte-error.s
index b5d5ebdeb10fa..217016d3385d4 100644
--- a/llvm/test/MC/AArch64/armv8.5a-mte-error.s
+++ b/llvm/test/MC/AArch64/armv8.5a-mte-error.s
@@ -85,11 +85,11 @@ subg x0, x1, #16, #2, #99
// CHECK-NEXT: addg x0, x1
// CHECK: too few operands for instruction
// CHECK-NEXT: addg x0, x1, #0
-// CHECK: index must be a multiple of 16 in range [0, 1008]
+// CHECK: immediate must be a multiple of 16 in range [0, 1008]
// CHECK-NEXT: addg x0, x1, #1024, #0
-// CHECK: index must be a multiple of 16 in range [0, 1008]
+// CHECK: immediate must be a multiple of 16 in range [0, 1008]
// CHECK-NEXT: addg x0, x1, #8, #0
-// CHECK: index must be a multiple of 16 in range [0, 1008]
+// CHECK: immediate must be a multiple of 16 in range [0, 1008]
// CHECK-NEXT: addg x0, x1, #-16, #0
// CHECK: immediate must be an integer in range [0, 15]
// CHECK-NEXT: addg x0, x1, #0, #16
@@ -120,11 +120,11 @@ subg x0, x1, #16, #2, #99
// CHECK-NEXT: subg x0, x1
// CHECK: too few operands for instruction
// CHECK-NEXT: subg x0, x1, #0
-// CHECK: index must be a multiple of 16 in range [0, 1008]
+// CHECK: immediate must be a multiple of 16 in range [0, 1008]
// CHECK-NEXT: subg x0, x1, #1024, #0
-// CHECK: index must be a multiple of 16 in range [0, 1008]
+// CHECK: immediate must be a multiple of 16 in range [0, 1008]
// CHECK-NEXT: subg x0, x1, #8, #0
-// CHECK: index must be a multiple of 16 in range [0, 1008]
+// CHECK: immediate must be a multiple of 16 in range [0, 1008]
// CHECK-NEXT: subg x0, x1, #-16, #0
// CHECK: immediate must be an integer in range [0, 15]
// CHECK-NEXT: subg x0, x1, #0, #16
@@ -207,11 +207,11 @@ stg x0, [#1]
// CHECK-NEXT: stg sp
// CHECK: invalid operand for instruction
// CHECK-NEXT: stg #1
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stg x0, [x0, x1]
@@ -245,11 +245,11 @@ stzg x0, [#1]
// CHECK-NEXT: stzg sp
// CHECK: invalid operand for instruction
// CHECK-NEXT: stzg #1
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stzg x0, [x0, x1]
@@ -268,11 +268,11 @@ stg x0, [w0]!
stg x0, [xzr]!
stg x0, [#1]!
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stg x0, [x0, x1]!
@@ -291,11 +291,11 @@ stzg x0, [w0]!
stzg x0, [xzr]!
stzg x0, [#1]!
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stzg x0, [x0, x1]!
@@ -314,11 +314,11 @@ stg x0, [w0], #255
stg x0, [xzr], #255
stg x0, [#1], #255
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stg x0, [x0], x1
@@ -337,11 +337,11 @@ stzg x0, [w0], #255
stzg x0, [xzr], #255
stzg x0, [#1], #255
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stzg x0, [x0], x1
@@ -375,11 +375,11 @@ st2g x0, [#1]
// CHECK-NEXT: st2g sp
// CHECK: invalid operand for instruction
// CHECK-NEXT: st2g #1
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: st2g x0, [x0, x1]
@@ -413,11 +413,11 @@ stz2g x0, [#1]
// CHECK-NEXT: stz2g sp
// CHECK: invalid operand for instruction
// CHECK-NEXT: stz2g #1
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stz2g x0, [x0, x1]
@@ -436,11 +436,11 @@ st2g x0, [w0, #256]!
st2g x0, [xzr, #256]!
st2g x0, [#1, #256]!
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: st2g x0, [x0, x1]!
@@ -459,11 +459,11 @@ stz2g x0, [w0, #255]!
stz2g x0, [xzr, #255]!
stz2g x0, [#1, #255]!
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stz2g x0, [x0, x1]!
@@ -482,11 +482,11 @@ st2g x0, [w0], #255
st2g x0, [xzr], #255
st2g x0, [#1], #255
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: st2g x0, [x0], x1
@@ -505,11 +505,11 @@ stz2g x0, [w0], #255
stz2g x0, [xzr], #255
stz2g x0, [#1], #255
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #-4112
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #4096
-// CHECK: index must be a multiple of 16 in range [-4096, 4080]
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stz2g x0, [x0], x1
@@ -540,11 +540,11 @@ stgp x0, x1, [#1, #1]
// CHECK-NEXT: stgp x0, sp
// CHECK: invalid operand for instruction
// CHECK-NEXT: stgp x0, x1, [xzr
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #-1040
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #1024
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stgp x0, x1, [x2, x3]
@@ -581,11 +581,11 @@ stgp x0, x1, [#1, #1]!
// CHECK-NEXT: stgp x0, sp
// CHECK: invalid operand for instruction
// CHECK-NEXT: stgp x0, x1, [xzr
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #-1040
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #1024
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stgp x0, x1, [x2, x3]!
@@ -622,11 +622,11 @@ stgp x0, x1, [#1], #1
// CHECK-NEXT: stgp x0, sp
// CHECK: invalid operand for instruction
// CHECK-NEXT: stgp x0, x1, [xzr
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #-1040
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #1024
-// CHECK: index must be a multiple of 16 in range [-1024, 1008]
+// CHECK: immediate must be a multiple of 16 in range [-1024, 1008]
// CHECK-NEXT: #8
// CHECK: invalid operand for instruction
// CHECK-NEXT: stgp x0, x1, [x2], x3
@@ -886,9 +886,9 @@ ldg x0, [#1, #255]
// CHECK-NEXT: ldg sp, [x0, #0]
// CHECK: invalid operand for instruction
// CHECK-NEXT: ldg x0, [x0, x0]
-// CHECK: index must be a multiple of 16 in range [-4096, 4080].
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080].
// CHECK-NEXT: ldg x0, [x0, #4096]
-// CHECK: index must be a multiple of 16 in range [-4096, 4080].
+// CHECK: immediate must be a multiple of 16 in range [-4096, 4080].
// CHECK-NEXT: ldg x0, [x0, #-4112]
// CHECK: invalid operand for instruction
// CHECK-NEXT: ldg #1, [x0, #255]
diff --git a/llvm/test/MC/AArch64/basic-a64-diagnostics.s b/llvm/test/MC/AArch64/basic-a64-diagnostics.s
index f9e3fb1eb6fdf..b8754810f5f71 100644
--- a/llvm/test/MC/AArch64/basic-a64-diagnostics.s
+++ b/llvm/test/MC/AArch64/basic-a64-diagnostics.s
@@ -2663,16 +2663,16 @@ cbz w1, lsl
stp w9, w10, [x5, #256]
ldp w11, w12, [x9, #-260]
stp wsp, w9, [sp]
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp w3, w2, [x4, #1]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp w1, w2, [x3, #253]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp w9, w10, [x5, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp w11, w12, [x9, #-260]
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
@@ -2682,26 +2682,26 @@ cbz w1, lsl
ldpsw x9, x2, [sp, #2]
ldpsw x1, x2, [x10, #256]
ldpsw x3, x4, [x11, #-260]
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x9, x2, [sp, #2]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x1, x2, [x10, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x3, x4, [x11, #-260]
// CHECK-ERROR-NEXT: ^
ldp x2, x5, [sp, #4]
ldp x5, x6, [x9, #512]
stp x7, x8, [x10, #-520]
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp x2, x5, [sp, #4]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp x5, x6, [x9, #512]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stp x7, x8, [x10, #-520]
// CHECK-ERROR-NEXT: ^
@@ -2717,13 +2717,13 @@ cbz w1, lsl
stp s3, s5, [sp, #-2]
ldp s6, s26, [x4, #-260]
stp s13, s19, [x5, #256]
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp s3, s5, [sp, #-2]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp s6, s26, [x4, #-260]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp s13, s19, [x5, #256]
// CHECK-ERROR-NEXT: ^
@@ -2733,10 +2733,10 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldp d3, d4, [xzr]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp d5, d6, [x0, #512]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stp d7, d8, [x0, #-520]
// CHECK-ERROR-NEXT: ^
@@ -2747,13 +2747,13 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldp d3, q2, [sp]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldp q3, q5, [sp, #8]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: stp q20, q25, [x5, #1024]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldp q30, q15, [x23, #-1040]
// CHECK-ERROR-NEXT: ^
@@ -2774,16 +2774,16 @@ cbz w1, lsl
stp w9, w10, [x5], #256
ldp w11, w12, [x9], #-260
stp wsp, w9, [sp], #0
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp w3, w2, [x4], #1
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp w1, w2, [x3], #253
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp w9, w10, [x5], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp w11, w12, [x9], #-260
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
@@ -2793,26 +2793,26 @@ cbz w1, lsl
ldpsw x9, x2, [sp], #2
ldpsw x1, x2, [x10], #256
ldpsw x3, x4, [x11], #-260
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x9, x2, [sp], #2
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x1, x2, [x10], #256
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x3, x4, [x11], #-260
// CHECK-ERROR-NEXT: ^
ldp x2, x5, [sp], #4
ldp x5, x6, [x9], #512
stp x7, x8, [x10], #-520
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp x2, x5, [sp], #4
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp x5, x6, [x9], #512
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stp x7, x8, [x10], #-520
// CHECK-ERROR-NEXT: ^
@@ -2828,13 +2828,13 @@ cbz w1, lsl
stp s3, s5, [sp], #-2
ldp s6, s26, [x4], #-260
stp s13, s19, [x5], #256
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp s3, s5, [sp], #-2
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp s6, s26, [x4], #-260
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp s13, s19, [x5], #256
// CHECK-ERROR-NEXT: ^
@@ -2844,10 +2844,10 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldp d3, d4, [xzr], #0
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp d5, d6, [x0], #512
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stp d7, d8, [x0], #-520
// CHECK-ERROR-NEXT: ^
@@ -2858,13 +2858,13 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldp d3, q2, [sp], #0
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldp q3, q5, [sp], #8
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: stp q20, q25, [x5], #1024
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldp q30, q15, [x23], #-1040
// CHECK-ERROR-NEXT: ^
@@ -2885,16 +2885,16 @@ cbz w1, lsl
stp w9, w10, [x5, #256]!
ldp w11, w12, [x9, #-260]!
stp wsp, w9, [sp, #0]!
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp w3, w2, [x4, #1]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp w1, w2, [x3, #253]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp w9, w10, [x5, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp w11, w12, [x9, #-260]!
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
@@ -2904,26 +2904,26 @@ cbz w1, lsl
ldpsw x9, x2, [sp, #2]!
ldpsw x1, x2, [x10, #256]!
ldpsw x3, x4, [x11, #-260]!
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x9, x2, [sp, #2]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x1, x2, [x10, #256]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldpsw x3, x4, [x11, #-260]!
// CHECK-ERROR-NEXT: ^
ldp x2, x5, [sp, #4]!
ldp x5, x6, [x9, #512]!
stp x7, x8, [x10, #-520]!
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp x2, x5, [sp, #4]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp x5, x6, [x9, #512]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stp x7, x8, [x10, #-520]!
// CHECK-ERROR-NEXT: ^
@@ -2939,13 +2939,13 @@ cbz w1, lsl
stp s3, s5, [sp, #-2]!
ldp s6, s26, [x4, #-260]!
stp s13, s19, [x5, #256]!
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp s3, s5, [sp, #-2]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldp s6, s26, [x4, #-260]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stp s13, s19, [x5, #256]!
// CHECK-ERROR-NEXT: ^
@@ -2955,10 +2955,10 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldp d3, d4, [xzr, #0]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldp d5, d6, [x0, #512]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stp d7, d8, [x0, #-520]!
// CHECK-ERROR-NEXT: ^
@@ -2969,13 +2969,13 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldp d3, q2, [sp, #0]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldp q3, q5, [sp, #8]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: stp q20, q25, [x5, #1024]!
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldp q30, q15, [x23, #-1040]!
// CHECK-ERROR-NEXT: ^
@@ -2996,16 +2996,16 @@ cbz w1, lsl
stnp w9, w10, [x5, #256]
ldnp w11, w12, [x9, #-260]
stnp wsp, w9, [sp]
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldnp w3, w2, [x4, #1]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stnp w1, w2, [x3, #253]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stnp w9, w10, [x5, #256]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldnp w11, w12, [x9, #-260]
// CHECK-ERROR-NEXT: ^
// CHECK-ERROR-NEXT: error: invalid operand for instruction
@@ -3015,13 +3015,13 @@ cbz w1, lsl
ldnp x2, x5, [sp, #4]
ldnp x5, x6, [x9, #512]
stnp x7, x8, [x10, #-520]
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldnp x2, x5, [sp, #4]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldnp x5, x6, [x9, #512]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stnp x7, x8, [x10, #-520]
// CHECK-ERROR-NEXT: ^
@@ -3037,13 +3037,13 @@ cbz w1, lsl
stnp s3, s5, [sp, #-2]
ldnp s6, s26, [x4, #-260]
stnp s13, s19, [x5, #256]
-// CHECK-ERROR: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stnp s3, s5, [sp, #-2]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: ldnp s6, s26, [x4, #-260]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 4 in range [-256, 252]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 4 in range [-256, 252]
// CHECK-ERROR-NEXT: stnp s13, s19, [x5, #256]
// CHECK-ERROR-NEXT: ^
@@ -3053,10 +3053,10 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldnp d3, d4, [xzr]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: ldnp d5, d6, [x0, #512]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 8 in range [-512, 504]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 8 in range [-512, 504]
// CHECK-ERROR-NEXT: stnp d7, d8, [x0, #-520]
// CHECK-ERROR-NEXT: ^
@@ -3067,13 +3067,13 @@ cbz w1, lsl
// CHECK-ERROR: error: invalid operand for instruction
// CHECK-ERROR-NEXT: ldnp d3, q2, [sp]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldnp q3, q5, [sp, #8]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: stnp q20, q25, [x5, #1024]
// CHECK-ERROR-NEXT: ^
-// CHECK-ERROR-NEXT: error: {{expected integer|index must be a}} multiple of 16 in range [-1024, 1008]
+// CHECK-ERROR-NEXT: error: {{expected integer|immediate must be a}} multiple of 16 in range [-1024, 1008]
// CHECK-ERROR-NEXT: ldnp q30, q15, [x23, #-1040]
// CHECK-ERROR-NEXT: ^
>From 9612cc2f7c655ea273aa306a814f5688cc1c2e58 Mon Sep 17 00:00:00 2001
From: Jonathan Thackray <jonathan.thackray at arm.com>
Date: Mon, 12 Oct 2026 09:55:39 +0100
Subject: [PATCH 3/3] fixup! Also rename the tablegen and case names, and
re-order the DiagnosticType so it matches the operand name
---
.../lib/Target/AArch64/AArch64InstrFormats.td | 73 ++++-----
.../AArch64/AsmParser/AArch64AsmParser.cpp | 148 +++++++++---------
2 files changed, 111 insertions(+), 110 deletions(-)
diff --git a/llvm/lib/Target/AArch64/AArch64InstrFormats.td b/llvm/lib/Target/AArch64/AArch64InstrFormats.td
index 007197285fec0..0273310069a84 100644
--- a/llvm/lib/Target/AArch64/AArch64InstrFormats.td
+++ b/llvm/lib/Target/AArch64/AArch64InstrFormats.td
@@ -358,16 +358,16 @@ def GPR64as32 : RegisterOperand<GPR64, "printGPR64as32"> {
// are encoded as the eight bit value 'abcdefgh'.
def SIMDImmType10Operand : AsmOperandClass { let Name = "SIMDImmType10"; }
-class UImmScaledMemoryIndexed<int Width, int Scale> : AsmOperandClass {
+class UImmScaledOperand<int Width, int Scale> : AsmOperandClass {
let Name = "UImm" # Width # "s" # Scale;
- let DiagnosticType = "InvalidMemoryIndexed" # Scale # "UImm" # Width;
+ let DiagnosticType = "InvalidUImm" # Width # "s" # Scale;
let RenderMethod = "addImmScaledOperands<" # Scale # ">";
let PredicateMethod = "isUImmScaled<" # Width # ", " # Scale # ">";
}
-class SImmScaledMemoryIndexed<int Width, int Scale> : AsmOperandClass {
+class SImmScaledOperand<int Width, int Scale> : AsmOperandClass {
let Name = "SImm" # Width # "s" # Scale;
- let DiagnosticType = "InvalidMemoryIndexed" # Scale # "SImm" # Width;
+ let DiagnosticType = "InvalidSImm" # Width # "s" # Scale;
let RenderMethod = "addImmScaledOperands<" # Scale # ">";
let PredicateMethod = "isSImmScaled<" # Width # ", " # Scale # ">";
}
@@ -403,7 +403,7 @@ def adrlabel : Operand<i64> {
class SImmOperand<int width> : AsmOperandClass {
let Name = "SImm" # width;
- let DiagnosticType = "InvalidMemoryIndexedSImm" # width;
+ let DiagnosticType = "InvalidSImm" # width;
let RenderMethod = "addImmOperands";
let PredicateMethod = "isSImm<" # width # ">";
}
@@ -416,7 +416,7 @@ class AsmImmRange<int Low, int High> : AsmOperandClass {
}
// Authenticated loads for v8.3 can have scaled 10-bit immediate offsets.
-def SImm10s8Operand : SImmScaledMemoryIndexed<10, 8>;
+def SImm10s8Operand : SImmScaledOperand<10, 8>;
def simm10Scaled : Operand<i64> {
let ParserMatchClass = SImm10s8Operand;
let DecoderMethod = "DecodeSImm<10>";
@@ -425,7 +425,7 @@ def simm10Scaled : Operand<i64> {
}
def simm9s16 : Operand<i64> {
- let ParserMatchClass = SImmScaledMemoryIndexed<9, 16>;
+ let ParserMatchClass = SImmScaledOperand<9, 16>;
let DecoderMethod = "DecodeSImm<9>";
let PrintMethod = "printImmScale<16>";
let OperandType = "OPERAND_IMMEDIATE";
@@ -616,9 +616,9 @@ def simm5_16b : Operand<i32>, ImmLeaf<i32, [{ return (int16_t)Imm >= -16 && (int
// simm7sN predicate - True if the immediate is a multiple of N in the range
// [-64 * N, 63 * N].
-def SImm7s4Operand : SImmScaledMemoryIndexed<7, 4>;
-def SImm7s8Operand : SImmScaledMemoryIndexed<7, 8>;
-def SImm7s16Operand : SImmScaledMemoryIndexed<7, 16>;
+def SImm7s4Operand : SImmScaledOperand<7, 4>;
+def SImm7s8Operand : SImmScaledOperand<7, 8>;
+def SImm7s16Operand : SImmScaledOperand<7, 16>;
def simm7s4 : Operand<i32> {
let ParserMatchClass = SImm7s4Operand;
@@ -674,9 +674,9 @@ def UImmM8XForm : SDNodeXForm<imm, [{
// uimm5sN predicate - True if the immediate is a multiple of N in the range
// [0 * N, 32 * N].
-def UImm5s2Operand : UImmScaledMemoryIndexed<5, 2>;
-def UImm5s4Operand : UImmScaledMemoryIndexed<5, 4>;
-def UImm5s8Operand : UImmScaledMemoryIndexed<5, 8>;
+def UImm5s2Operand : UImmScaledOperand<5, 2>;
+def UImm5s4Operand : UImmScaledOperand<5, 4>;
+def UImm5s8Operand : UImmScaledOperand<5, 8>;
def uimm5s2 : Operand<i64>, ImmLeaf<i64,
[{ return Imm >= 0 && Imm < (32*2) && ((Imm % 2) == 0); }],
@@ -702,11 +702,11 @@ def uimm5s8 : Operand<i64>, ImmLeaf<i64,
// uimm6sN predicate - True if the immediate is a multiple of N in the range
// [0 * N, 64 * N].
-def UImm6s1Operand : UImmScaledMemoryIndexed<6, 1>;
-def UImm6s2Operand : UImmScaledMemoryIndexed<6, 2>;
-def UImm6s4Operand : UImmScaledMemoryIndexed<6, 4>;
-def UImm6s8Operand : UImmScaledMemoryIndexed<6, 8>;
-def UImm6s16Operand : UImmScaledMemoryIndexed<6, 16>;
+def UImm6s1Operand : UImmScaledOperand<6, 1>;
+def UImm6s2Operand : UImmScaledOperand<6, 2>;
+def UImm6s4Operand : UImmScaledOperand<6, 4>;
+def UImm6s8Operand : UImmScaledOperand<6, 8>;
+def UImm6s16Operand : UImmScaledOperand<6, 16>;
def uimm6s1 : Operand<i64>, ImmLeaf<i64, [{ return Imm >= 0 && Imm < 64; }]> {
let ParserMatchClass = UImm6s1Operand;
@@ -755,7 +755,7 @@ def SImmS32XForm : SDNodeXForm<imm, [{
// simm6sN predicate - True if the immediate is a multiple of N in the range
// [-32 * N, 31 * N].
-def SImm6s1Operand : SImmScaledMemoryIndexed<6, 1>;
+def SImm6s1Operand : SImmScaledOperand<6, 1>;
def simm6s1 : Operand<i64>, ImmLeaf<i64, [{ return Imm >= -32 && Imm < 32; }]> {
let ParserMatchClass = SImm6s1Operand;
let DecoderMethod = "DecodeSImm<6>";
@@ -764,12 +764,12 @@ def simm6s1 : Operand<i64>, ImmLeaf<i64, [{ return Imm >= -32 && Imm < 32; }]> {
// simm4sN predicate - True if the immediate is a multiple of N in the range
// [ -8* N, 7 * N].
-def SImm4s1Operand : SImmScaledMemoryIndexed<4, 1>;
-def SImm4s2Operand : SImmScaledMemoryIndexed<4, 2>;
-def SImm4s3Operand : SImmScaledMemoryIndexed<4, 3>;
-def SImm4s4Operand : SImmScaledMemoryIndexed<4, 4>;
-def SImm4s16Operand : SImmScaledMemoryIndexed<4, 16>;
-def SImm4s32Operand : SImmScaledMemoryIndexed<4, 32>;
+def SImm4s1Operand : SImmScaledOperand<4, 1>;
+def SImm4s2Operand : SImmScaledOperand<4, 2>;
+def SImm4s3Operand : SImmScaledOperand<4, 3>;
+def SImm4s4Operand : SImmScaledOperand<4, 4>;
+def SImm4s16Operand : SImmScaledOperand<4, 16>;
+def SImm4s32Operand : SImmScaledOperand<4, 32>;
def simm4s1 : Operand<i64>, ImmLeaf<i64,
[{ return Imm >=-8 && Imm <= 7; }]> {
@@ -1755,7 +1755,7 @@ def sme_elm_idx0_15 : Operand<i32>, TImmLeaf<i32, [{
// uimm3s8 predicate
// True if the immediate is a multiple of 8 in the range [0,56].
-def UImm3s8Operand : UImmScaledMemoryIndexed<3, 8>;
+def UImm3s8Operand : UImmScaledOperand<3, 8>;
def uimm3s8 : Operand<i64>, ImmLeaf<i64,
[{ return Imm >= 0 && Imm <= 56 && ((Imm % 8) == 0); }], UImmS8XForm> {
@@ -1764,9 +1764,10 @@ def uimm3s8 : Operand<i64>, ImmLeaf<i64,
let OperandType = "OPERAND_IMMEDIATE";
}
-class UImmScaledMemoryIndexedRange<int Width, int Scale, int OffsetVal> : AsmOperandClass {
+class UImmScaledRangeOperand<int Width, int Scale, int OffsetVal>
+ : AsmOperandClass {
let Name = "UImm" # Width # "s" # Scale # "Range";
- let DiagnosticType = "InvalidMemoryIndexedRange" # Scale # "UImm" # Width;
+ let DiagnosticType = "InvalidUImm" # Width # "s" # Scale # "Range";
let RenderMethod = "addImmScaledRangeOperands<" # Scale # ">";
let PredicateMethod = "isUImmScaled<" # Width # ", " # Scale # ", " # OffsetVal # ", /*IsRange=*/true>";
let ParserMethod = "tryParseImmRange";
@@ -1774,14 +1775,14 @@ class UImmScaledMemoryIndexedRange<int Width, int Scale, int OffsetVal> : AsmOpe
// Implicit immediate ranges 0:1 and 0:3, scale has no meaning
// since the immediate is zero
-def UImm0s2RangeOperand : UImmScaledMemoryIndexedRange<0, 2, 1>;
-def UImm0s4RangeOperand : UImmScaledMemoryIndexedRange<0, 4, 3>;
+def UImm0s2RangeOperand : UImmScaledRangeOperand<0, 2, 1>;
+def UImm0s4RangeOperand : UImmScaledRangeOperand<0, 4, 3>;
-def UImm1s2RangeOperand : UImmScaledMemoryIndexedRange<1, 2, 1>;
-def UImm1s4RangeOperand : UImmScaledMemoryIndexedRange<1, 4, 3>;
-def UImm2s2RangeOperand : UImmScaledMemoryIndexedRange<2, 2, 1>;
-def UImm2s4RangeOperand : UImmScaledMemoryIndexedRange<2, 4, 3>;
-def UImm3s2RangeOperand : UImmScaledMemoryIndexedRange<3, 2, 1>;
+def UImm1s2RangeOperand : UImmScaledRangeOperand<1, 2, 1>;
+def UImm1s4RangeOperand : UImmScaledRangeOperand<1, 4, 3>;
+def UImm2s2RangeOperand : UImmScaledRangeOperand<2, 2, 1>;
+def UImm2s4RangeOperand : UImmScaledRangeOperand<2, 4, 3>;
+def UImm3s2RangeOperand : UImmScaledRangeOperand<3, 2, 1>;
def uimm0s2range : Operand<i64>, ImmLeaf<i64,
[{ return Imm == 0; }], UImmS1XForm> {
@@ -3815,7 +3816,7 @@ class UImm12OffsetOperand<int Scale> : AsmOperandClass {
let Name = "UImm12Offset" # Scale;
let RenderMethod = "addUImm12OffsetOperands<" # Scale # ">";
let PredicateMethod = "isUImm12Offset<" # Scale # ">";
- let DiagnosticType = "InvalidMemoryIndexed" # Scale;
+ let DiagnosticType = "InvalidUImm12Offset" # Scale;
}
def UImm12OffsetScale1Operand : UImm12OffsetOperand<1>;
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 2e3d8be87cf2a..3236024afc87d 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -5996,62 +5996,62 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
case Match_InvalidFPImm:
return Error(Loc,
"expected compatible register or floating-point constant");
- case Match_InvalidMemoryIndexedSImm6:
+ case Match_InvalidSImm6:
return Error(Loc, "immediate must be an integer in range [-32, 31].");
- case Match_InvalidMemoryIndexedSImm5:
+ case Match_InvalidSImm5:
return Error(Loc, "immediate must be an integer in range [-16, 15].");
- case Match_InvalidMemoryIndexed1SImm4:
+ case Match_InvalidSImm4s1:
return Error(Loc, "immediate must be an integer in range [-8, 7].");
- case Match_InvalidMemoryIndexed2SImm4:
+ case Match_InvalidSImm4s2:
return Error(Loc, "immediate must be a multiple of 2 in range [-16, 14].");
- case Match_InvalidMemoryIndexed3SImm4:
+ case Match_InvalidSImm4s3:
return Error(Loc, "immediate must be a multiple of 3 in range [-24, 21].");
- case Match_InvalidMemoryIndexed4SImm4:
+ case Match_InvalidSImm4s4:
return Error(Loc, "immediate must be a multiple of 4 in range [-32, 28].");
- case Match_InvalidMemoryIndexed16SImm4:
+ case Match_InvalidSImm4s16:
return Error(Loc,
"immediate must be a multiple of 16 in range [-128, 112].");
- case Match_InvalidMemoryIndexed32SImm4:
+ case Match_InvalidSImm4s32:
return Error(Loc,
"immediate must be a multiple of 32 in range [-256, 224].");
- case Match_InvalidMemoryIndexed1SImm6:
+ case Match_InvalidSImm6s1:
return Error(Loc, "immediate must be an integer in range [-32, 31].");
- case Match_InvalidMemoryIndexedSImm8:
+ case Match_InvalidSImm8:
return Error(Loc, "immediate must be an integer in range [-128, 127].");
- case Match_InvalidMemoryIndexedSImm9:
+ case Match_InvalidSImm9:
return Error(Loc, "immediate must be an integer in range [-256, 255].");
- case Match_InvalidMemoryIndexed16SImm9:
+ case Match_InvalidSImm9s16:
return Error(Loc,
"immediate must be a multiple of 16 in range [-4096, 4080].");
- case Match_InvalidMemoryIndexed8SImm10:
+ case Match_InvalidSImm10s8:
return Error(Loc,
"immediate must be a multiple of 8 in range [-4096, 4088].");
- case Match_InvalidMemoryIndexed4SImm7:
+ case Match_InvalidSImm7s4:
return Error(Loc,
"immediate must be a multiple of 4 in range [-256, 252].");
- case Match_InvalidMemoryIndexed8SImm7:
+ case Match_InvalidSImm7s8:
return Error(Loc,
"immediate must be a multiple of 8 in range [-512, 504].");
- case Match_InvalidMemoryIndexed16SImm7:
+ case Match_InvalidSImm7s16:
return Error(Loc,
"immediate must be a multiple of 16 in range [-1024, 1008].");
- case Match_InvalidMemoryIndexed8UImm5:
+ case Match_InvalidUImm5s8:
return Error(Loc, "immediate must be a multiple of 8 in range [0, 248].");
- case Match_InvalidMemoryIndexed8UImm3:
+ case Match_InvalidUImm3s8:
return Error(Loc, "immediate must be a multiple of 8 in range [0, 56].");
- case Match_InvalidMemoryIndexed4UImm5:
+ case Match_InvalidUImm5s4:
return Error(Loc, "immediate must be a multiple of 4 in range [0, 124].");
- case Match_InvalidMemoryIndexed2UImm5:
+ case Match_InvalidUImm5s2:
return Error(Loc, "immediate must be a multiple of 2 in range [0, 62].");
- case Match_InvalidMemoryIndexed8UImm6:
+ case Match_InvalidUImm6s8:
return Error(Loc, "immediate must be a multiple of 8 in range [0, 504].");
- case Match_InvalidMemoryIndexed16UImm6:
+ case Match_InvalidUImm6s16:
return Error(Loc, "immediate must be a multiple of 16 in range [0, 1008].");
- case Match_InvalidMemoryIndexed4UImm6:
+ case Match_InvalidUImm6s4:
return Error(Loc, "immediate must be a multiple of 4 in range [0, 252].");
- case Match_InvalidMemoryIndexed2UImm6:
+ case Match_InvalidUImm6s2:
return Error(Loc, "immediate must be a multiple of 2 in range [0, 126].");
- case Match_InvalidMemoryIndexed1UImm6:
+ case Match_InvalidUImm6s1:
return Error(Loc, "immediate must be in range [0, 63].");
case Match_InvalidMemoryWExtend8:
return Error(Loc,
@@ -6083,15 +6083,15 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
case Match_InvalidMemoryXExtend128:
return Error(Loc,
"expected 'lsl' or 'sxtx' with optional shift of #0 or #4");
- case Match_InvalidMemoryIndexed1:
+ case Match_InvalidUImm12Offset1:
return Error(Loc, "immediate must be an integer in range [0, 4095].");
- case Match_InvalidMemoryIndexed2:
+ case Match_InvalidUImm12Offset2:
return Error(Loc, "immediate must be a multiple of 2 in range [0, 8190].");
- case Match_InvalidMemoryIndexed4:
+ case Match_InvalidUImm12Offset4:
return Error(Loc, "immediate must be a multiple of 4 in range [0, 16380].");
- case Match_InvalidMemoryIndexed8:
+ case Match_InvalidUImm12Offset8:
return Error(Loc, "immediate must be a multiple of 8 in range [0, 32760].");
- case Match_InvalidMemoryIndexed16:
+ case Match_InvalidUImm12Offset16:
return Error(Loc,
"immediate must be a multiple of 16 in range [0, 65520].");
case Match_InvalidImm0_0:
@@ -6139,15 +6139,15 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
return Error(Loc, "immediate must be an integer in range [-255, 256].");
case Match_InvalidImmM257_254:
return Error(Loc, "immediate must be an integer in range [-257, 254].");
- case Match_InvalidMemoryIndexedRange2UImm0:
+ case Match_InvalidUImm0s2Range:
return Error(Loc, "vector select offset must be the immediate range 0:1.");
- case Match_InvalidMemoryIndexedRange2UImm1:
+ case Match_InvalidUImm1s2Range:
return Error(Loc, "vector select offset must be an immediate range of the "
"form <immf>:<imml>, where the first "
"immediate is a multiple of 2 in the range [0, 2], and "
"the second immediate is immf + 1.");
- case Match_InvalidMemoryIndexedRange2UImm2:
- case Match_InvalidMemoryIndexedRange2UImm3:
+ case Match_InvalidUImm2s2Range:
+ case Match_InvalidUImm3s2Range:
return Error(
Loc,
"vector select offset must be an immediate range of the form "
@@ -6155,10 +6155,10 @@ bool AArch64AsmParser::showMatchError(SMLoc Loc, unsigned ErrCode,
"where the first immediate is a multiple of 2 in the range [0, 6] or "
"[0, 14] "
"depending on the instruction, and the second immediate is immf + 1.");
- case Match_InvalidMemoryIndexedRange4UImm0:
+ case Match_InvalidUImm0s4Range:
return Error(Loc, "vector select offset must be the immediate range 0:3.");
- case Match_InvalidMemoryIndexedRange4UImm1:
- case Match_InvalidMemoryIndexedRange4UImm2:
+ case Match_InvalidUImm1s4Range:
+ case Match_InvalidUImm2s4Range:
return Error(
Loc,
"vector select offset must be an immediate range of the form "
@@ -6850,11 +6850,11 @@ bool AArch64AsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
return showMatchError(ErrorLoc, MatchResult, ErrorInfo, Operands);
}
case Match_InvalidTiedOperand:
- case Match_InvalidMemoryIndexed1:
- case Match_InvalidMemoryIndexed2:
- case Match_InvalidMemoryIndexed4:
- case Match_InvalidMemoryIndexed8:
- case Match_InvalidMemoryIndexed16:
+ case Match_InvalidUImm12Offset1:
+ case Match_InvalidUImm12Offset2:
+ case Match_InvalidUImm12Offset4:
+ case Match_InvalidUImm12Offset8:
+ case Match_InvalidUImm12Offset16:
case Match_InvalidCondCode:
case Match_AddSubLSLImm3ShiftLarge:
case Match_AddSubRegExtendSmall:
@@ -6876,31 +6876,31 @@ bool AArch64AsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
case Match_InvalidMemoryXExtend32:
case Match_InvalidMemoryXExtend64:
case Match_InvalidMemoryXExtend128:
- case Match_InvalidMemoryIndexed1SImm4:
- case Match_InvalidMemoryIndexed2SImm4:
- case Match_InvalidMemoryIndexed3SImm4:
- case Match_InvalidMemoryIndexed4SImm4:
- case Match_InvalidMemoryIndexed1SImm6:
- case Match_InvalidMemoryIndexed16SImm4:
- case Match_InvalidMemoryIndexed32SImm4:
- case Match_InvalidMemoryIndexed4SImm7:
- case Match_InvalidMemoryIndexed8SImm7:
- case Match_InvalidMemoryIndexed16SImm7:
- case Match_InvalidMemoryIndexed8UImm5:
- case Match_InvalidMemoryIndexed8UImm3:
- case Match_InvalidMemoryIndexed4UImm5:
- case Match_InvalidMemoryIndexed2UImm5:
- case Match_InvalidMemoryIndexed1UImm6:
- case Match_InvalidMemoryIndexed2UImm6:
- case Match_InvalidMemoryIndexed4UImm6:
- case Match_InvalidMemoryIndexed8UImm6:
- case Match_InvalidMemoryIndexed16UImm6:
- case Match_InvalidMemoryIndexedSImm6:
- case Match_InvalidMemoryIndexedSImm5:
- case Match_InvalidMemoryIndexedSImm8:
- case Match_InvalidMemoryIndexedSImm9:
- case Match_InvalidMemoryIndexed16SImm9:
- case Match_InvalidMemoryIndexed8SImm10:
+ case Match_InvalidSImm4s1:
+ case Match_InvalidSImm4s2:
+ case Match_InvalidSImm4s3:
+ case Match_InvalidSImm4s4:
+ case Match_InvalidSImm6s1:
+ case Match_InvalidSImm4s16:
+ case Match_InvalidSImm4s32:
+ case Match_InvalidSImm7s4:
+ case Match_InvalidSImm7s8:
+ case Match_InvalidSImm7s16:
+ case Match_InvalidUImm5s8:
+ case Match_InvalidUImm3s8:
+ case Match_InvalidUImm5s4:
+ case Match_InvalidUImm5s2:
+ case Match_InvalidUImm6s1:
+ case Match_InvalidUImm6s2:
+ case Match_InvalidUImm6s4:
+ case Match_InvalidUImm6s8:
+ case Match_InvalidUImm6s16:
+ case Match_InvalidSImm6:
+ case Match_InvalidSImm5:
+ case Match_InvalidSImm8:
+ case Match_InvalidSImm9:
+ case Match_InvalidSImm9s16:
+ case Match_InvalidSImm10s8:
case Match_InvalidImm0_0:
case Match_InvalidImm0_1:
case Match_InvalidImm0_3:
@@ -6922,13 +6922,13 @@ bool AArch64AsmParser::matchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
case Match_InvalidImmM1_510:
case Match_InvalidImmM255_256:
case Match_InvalidImmM257_254:
- case Match_InvalidMemoryIndexedRange2UImm0:
- case Match_InvalidMemoryIndexedRange2UImm1:
- case Match_InvalidMemoryIndexedRange2UImm2:
- case Match_InvalidMemoryIndexedRange2UImm3:
- case Match_InvalidMemoryIndexedRange4UImm0:
- case Match_InvalidMemoryIndexedRange4UImm1:
- case Match_InvalidMemoryIndexedRange4UImm2:
+ case Match_InvalidUImm0s2Range:
+ case Match_InvalidUImm1s2Range:
+ case Match_InvalidUImm2s2Range:
+ case Match_InvalidUImm3s2Range:
+ case Match_InvalidUImm0s4Range:
+ case Match_InvalidUImm1s4Range:
+ case Match_InvalidUImm2s4Range:
case Match_InvalidSVEAddSubImm8:
case Match_InvalidSVEAddSubImm16:
case Match_InvalidSVEAddSubImm32:
More information about the llvm-branch-commits
mailing list