Index: lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
===================================================================
--- lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -3033,9 +3033,23 @@
 bool AArch64AsmParser::parseOperand(OperandVector &Operands, bool isCondCode,
                                   bool invertCondCode) {
   MCAsmParser &Parser = getParser();
+
+  auto Features = STI->getFeatureBits();
+  auto FeaturesWithSVE =
+      ComputeAvailableFeatures(Features.set(AArch64::FeatureSVE));
+  auto FeaturesDefault = getAvailableFeatures();
+
+  // Parse operands with the SVE feature-bit set, so that we parse
+  // the custom SVE-specific operands for the corresponding mnemonics.
+  // This way the matcher code in MatchInstructionImpl() can properly
+  // try to match the instruction and give a 'instruction requires: sve'
+  // diagnostic if the instruction is valid, but disabled by the feature string.
+  setAvailableFeatures(FeaturesWithSVE);
+  OperandMatchResultTy ResTy = MatchOperandParserImpl(Operands, Mnemonic);
+  setAvailableFeatures(FeaturesDefault);
+
   // Check if the current operand has a custom associated parser, if so, try to
   // custom parse the operand, or fallback to the general approach.
-  OperandMatchResultTy ResTy = MatchOperandParserImpl(Operands, Mnemonic);
   if (ResTy == MatchOperand_Success)
     return false;
   // If there wasn't a custom match, try the generic matcher below. Otherwise,
Index: test/MC/AArch64/SVE/add.s
===================================================================
--- test/MC/AArch64/SVE/add.s
+++ test/MC/AArch64/SVE/add.s
@@ -10,95 +10,95 @@
 add     z31.s, z31.s, z31.s
 // CHECK-INST: add     z31.s, z31.s, z31.s
 // CHECK-ENCODING: [0xff,0x03,0xbf,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 03 bf 04 <unknown>
 
 add     z23.d, z13.d, z8.d
 // CHECK-INST: add     z23.d, z13.d, z8.d
 // CHECK-ENCODING: [0xb7,0x01,0xe8,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 01 e8 04 <unknown>
 
 add     z0.s, z0.s, z0.s
 // CHECK-INST: add     z0.s, z0.s, z0.s
 // CHECK-ENCODING: [0x00,0x00,0xa0,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 00 a0 04 <unknown>
 
 add     z31.d, z31.d, z31.d
 // CHECK-INST: add     z31.d, z31.d, z31.d
 // CHECK-ENCODING: [0xff,0x03,0xff,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 03 ff 04 <unknown>
 
 add     z21.b, z10.b, z21.b
 // CHECK-INST: add     z21.b, z10.b, z21.b
 // CHECK-ENCODING: [0x55,0x01,0x35,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 01 35 04 <unknown>
 
 add     z31.b, z31.b, z31.b
 // CHECK-INST: add     z31.b, z31.b, z31.b
 // CHECK-ENCODING: [0xff,0x03,0x3f,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 03 3f 04 <unknown>
 
 add     z0.h, z0.h, z0.h
 // CHECK-INST: add     z0.h, z0.h, z0.h
 // CHECK-ENCODING: [0x00,0x00,0x60,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 00 60 04 <unknown>
 
 add     z23.b, z13.b, z8.b
 // CHECK-INST: add     z23.b, z13.b, z8.b
 // CHECK-ENCODING: [0xb7,0x01,0x28,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 01 28 04 <unknown>
 
 add     z0.d, z0.d, z0.d
 // CHECK-INST: add     z0.d, z0.d, z0.d
 // CHECK-ENCODING: [0x00,0x00,0xe0,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 00 e0 04 <unknown>
 
 add     z31.h, z31.h, z31.h
 // CHECK-INST: add     z31.h, z31.h, z31.h
 // CHECK-ENCODING: [0xff,0x03,0x7f,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 03 7f 04 <unknown>
 
 add     z0.b, z0.b, z0.b
 // CHECK-INST: add     z0.b, z0.b, z0.b
 // CHECK-ENCODING: [0x00,0x00,0x20,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 00 20 04 <unknown>
 
 add     z21.d, z10.d, z21.d
 // CHECK-INST: add     z21.d, z10.d, z21.d
 // CHECK-ENCODING: [0x55,0x01,0xf5,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 01 f5 04 <unknown>
 
 add     z21.h, z10.h, z21.h
 // CHECK-INST: add     z21.h, z10.h, z21.h
 // CHECK-ENCODING: [0x55,0x01,0x75,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 01 75 04 <unknown>
 
 add     z21.s, z10.s, z21.s
 // CHECK-INST: add     z21.s, z10.s, z21.s
 // CHECK-ENCODING: [0x55,0x01,0xb5,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 01 b5 04 <unknown>
 
 add     z23.h, z13.h, z8.h
 // CHECK-INST: add     z23.h, z13.h, z8.h
 // CHECK-ENCODING: [0xb7,0x01,0x68,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 01 68 04 <unknown>
 
 add     z23.s, z13.s, z8.s
 // CHECK-INST: add     z23.s, z13.s, z8.s
 // CHECK-ENCODING: [0xb7,0x01,0xa8,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 01 a8 04 <unknown>
Index: test/MC/AArch64/SVE/sub.s
===================================================================
--- test/MC/AArch64/SVE/sub.s
+++ test/MC/AArch64/SVE/sub.s
@@ -10,95 +10,95 @@
 sub     z0.h, z0.h, z0.h
 // CHECK-INST: sub     z0.h, z0.h, z0.h
 // CHECK-ENCODING: [0x00,0x04,0x60,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 04 60 04 <unknown>
 
 sub     z21.b, z10.b, z21.b
 // CHECK-INST: sub     z21.b, z10.b, z21.b
 // CHECK-ENCODING: [0x55,0x05,0x35,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 05 35 04 <unknown>
 
 sub     z31.h, z31.h, z31.h
 // CHECK-INST: sub     z31.h, z31.h, z31.h
 // CHECK-ENCODING: [0xff,0x07,0x7f,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 07 7f 04 <unknown>
 
 sub     z21.h, z10.h, z21.h
 // CHECK-INST: sub     z21.h, z10.h, z21.h
 // CHECK-ENCODING: [0x55,0x05,0x75,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 05 75 04 <unknown>
 
 sub     z31.b, z31.b, z31.b
 // CHECK-INST: sub     z31.b, z31.b, z31.b
 // CHECK-ENCODING: [0xff,0x07,0x3f,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 07 3f 04 <unknown>
 
 sub     z0.s, z0.s, z0.s
 // CHECK-INST: sub     z0.s, z0.s, z0.s
 // CHECK-ENCODING: [0x00,0x04,0xa0,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 04 a0 04 <unknown>
 
 sub     z23.b, z13.b, z8.b
 // CHECK-INST: sub     z23.b, z13.b, z8.b
 // CHECK-ENCODING: [0xb7,0x05,0x28,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 05 28 04 <unknown>
 
 sub     z21.d, z10.d, z21.d
 // CHECK-INST: sub     z21.d, z10.d, z21.d
 // CHECK-ENCODING: [0x55,0x05,0xf5,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 05 f5 04 <unknown>
 
 sub     z21.s, z10.s, z21.s
 // CHECK-INST: sub     z21.s, z10.s, z21.s
 // CHECK-ENCODING: [0x55,0x05,0xb5,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 05 b5 04 <unknown>
 
 sub     z0.b, z0.b, z0.b
 // CHECK-INST: sub     z0.b, z0.b, z0.b
 // CHECK-ENCODING: [0x00,0x04,0x20,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 04 20 04 <unknown>
 
 sub     z23.d, z13.d, z8.d
 // CHECK-INST: sub     z23.d, z13.d, z8.d
 // CHECK-ENCODING: [0xb7,0x05,0xe8,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 05 e8 04 <unknown>
 
 sub     z23.s, z13.s, z8.s
 // CHECK-INST: sub     z23.s, z13.s, z8.s
 // CHECK-ENCODING: [0xb7,0x05,0xa8,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 05 a8 04 <unknown>
 
 sub     z31.d, z31.d, z31.d
 // CHECK-INST: sub     z31.d, z31.d, z31.d
 // CHECK-ENCODING: [0xff,0x07,0xff,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 07 ff 04 <unknown>
 
 sub     z23.h, z13.h, z8.h
 // CHECK-INST: sub     z23.h, z13.h, z8.h
 // CHECK-ENCODING: [0xb7,0x05,0x68,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 05 68 04 <unknown>
 
 sub     z0.d, z0.d, z0.d
 // CHECK-INST: sub     z0.d, z0.d, z0.d
 // CHECK-ENCODING: [0x00,0x04,0xe0,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 04 e0 04 <unknown>
 
 sub     z31.s, z31.s, z31.s
 // CHECK-INST: sub     z31.s, z31.s, z31.s
 // CHECK-ENCODING: [0xff,0x07,0xbf,0x04]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 07 bf 04 <unknown>
Index: test/MC/AArch64/SVE/zip1.s
===================================================================
--- test/MC/AArch64/SVE/zip1.s
+++ test/MC/AArch64/SVE/zip1.s
@@ -10,191 +10,191 @@
 zip1    z21.d, z10.d, z21.d
 // CHECK-INST: zip1    z21.d, z10.d, z21.d
 // CHECK-ENCODING: [0x55,0x61,0xf5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 61 f5 05 <unknown>
 
 zip1    z0.d, z0.d, z0.d
 // CHECK-INST: zip1    z0.d, z0.d, z0.d
 // CHECK-ENCODING: [0x00,0x60,0xe0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 60 e0 05 <unknown>
 
 zip1    z23.s, z13.s, z8.s
 // CHECK-INST: zip1    z23.s, z13.s, z8.s
 // CHECK-ENCODING: [0xb7,0x61,0xa8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 61 a8 05 <unknown>
 
 zip1    z0.s, z0.s, z0.s
 // CHECK-INST: zip1    z0.s, z0.s, z0.s
 // CHECK-ENCODING: [0x00,0x60,0xa0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 60 a0 05 <unknown>
 
 zip1    p5.s, p10.s, p5.s
 // CHECK-INST: zip1    p5.s, p10.s, p5.s
 // CHECK-ENCODING: [0x45,0x41,0xa5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 41 a5 05 <unknown>
 
 zip1    p5.b, p10.b, p5.b
 // CHECK-INST: zip1    p5.b, p10.b, p5.b
 // CHECK-ENCODING: [0x45,0x41,0x25,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 41 25 05 <unknown>
 
 zip1    z31.h, z31.h, z31.h
 // CHECK-INST: zip1    z31.h, z31.h, z31.h
 // CHECK-ENCODING: [0xff,0x63,0x7f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 63 7f 05 <unknown>
 
 zip1    p0.d, p0.d, p0.d
 // CHECK-INST: zip1    p0.d, p0.d, p0.d
 // CHECK-ENCODING: [0x00,0x40,0xe0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 40 e0 05 <unknown>
 
 zip1    p7.d, p13.d, p8.d
 // CHECK-INST: zip1    p7.d, p13.d, p8.d
 // CHECK-ENCODING: [0xa7,0x41,0xe8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 41 e8 05 <unknown>
 
 zip1    z21.b, z10.b, z21.b
 // CHECK-INST: zip1    z21.b, z10.b, z21.b
 // CHECK-ENCODING: [0x55,0x61,0x35,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 61 35 05 <unknown>
 
 zip1    p7.b, p13.b, p8.b
 // CHECK-INST: zip1    p7.b, p13.b, p8.b
 // CHECK-ENCODING: [0xa7,0x41,0x28,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 41 28 05 <unknown>
 
 zip1    z23.h, z13.h, z8.h
 // CHECK-INST: zip1    z23.h, z13.h, z8.h
 // CHECK-ENCODING: [0xb7,0x61,0x68,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 61 68 05 <unknown>
 
 zip1    p7.h, p13.h, p8.h
 // CHECK-INST: zip1    p7.h, p13.h, p8.h
 // CHECK-ENCODING: [0xa7,0x41,0x68,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 41 68 05 <unknown>
 
 zip1    p0.h, p0.h, p0.h
 // CHECK-INST: zip1    p0.h, p0.h, p0.h
 // CHECK-ENCODING: [0x00,0x40,0x60,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 40 60 05 <unknown>
 
 zip1    z0.h, z0.h, z0.h
 // CHECK-INST: zip1    z0.h, z0.h, z0.h
 // CHECK-ENCODING: [0x00,0x60,0x60,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 60 60 05 <unknown>
 
 zip1    z31.s, z31.s, z31.s
 // CHECK-INST: zip1    z31.s, z31.s, z31.s
 // CHECK-ENCODING: [0xff,0x63,0xbf,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 63 bf 05 <unknown>
 
 zip1    p15.d, p15.d, p15.d
 // CHECK-INST: zip1    p15.d, p15.d, p15.d
 // CHECK-ENCODING: [0xef,0x41,0xef,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 41 ef 05 <unknown>
 
 zip1    p5.d, p10.d, p5.d
 // CHECK-INST: zip1    p5.d, p10.d, p5.d
 // CHECK-ENCODING: [0x45,0x41,0xe5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 41 e5 05 <unknown>
 
 zip1    p15.b, p15.b, p15.b
 // CHECK-INST: zip1    p15.b, p15.b, p15.b
 // CHECK-ENCODING: [0xef,0x41,0x2f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 41 2f 05 <unknown>
 
 zip1    z31.d, z31.d, z31.d
 // CHECK-INST: zip1    z31.d, z31.d, z31.d
 // CHECK-ENCODING: [0xff,0x63,0xff,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 63 ff 05 <unknown>
 
 zip1    p15.h, p15.h, p15.h
 // CHECK-INST: zip1    p15.h, p15.h, p15.h
 // CHECK-ENCODING: [0xef,0x41,0x6f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 41 6f 05 <unknown>
 
 zip1    z21.h, z10.h, z21.h
 // CHECK-INST: zip1    z21.h, z10.h, z21.h
 // CHECK-ENCODING: [0x55,0x61,0x75,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 61 75 05 <unknown>
 
 zip1    p5.h, p10.h, p5.h
 // CHECK-INST: zip1    p5.h, p10.h, p5.h
 // CHECK-ENCODING: [0x45,0x41,0x65,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 41 65 05 <unknown>
 
 zip1    p7.s, p13.s, p8.s
 // CHECK-INST: zip1    p7.s, p13.s, p8.s
 // CHECK-ENCODING: [0xa7,0x41,0xa8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 41 a8 05 <unknown>
 
 zip1    z23.b, z13.b, z8.b
 // CHECK-INST: zip1    z23.b, z13.b, z8.b
 // CHECK-ENCODING: [0xb7,0x61,0x28,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 61 28 05 <unknown>
 
 zip1    p0.s, p0.s, p0.s
 // CHECK-INST: zip1    p0.s, p0.s, p0.s
 // CHECK-ENCODING: [0x00,0x40,0xa0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 40 a0 05 <unknown>
 
 zip1    p0.b, p0.b, p0.b
 // CHECK-INST: zip1    p0.b, p0.b, p0.b
 // CHECK-ENCODING: [0x00,0x40,0x20,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 40 20 05 <unknown>
 
 zip1    z23.d, z13.d, z8.d
 // CHECK-INST: zip1    z23.d, z13.d, z8.d
 // CHECK-ENCODING: [0xb7,0x61,0xe8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 61 e8 05 <unknown>
 
 zip1    z0.b, z0.b, z0.b
 // CHECK-INST: zip1    z0.b, z0.b, z0.b
 // CHECK-ENCODING: [0x00,0x60,0x20,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 60 20 05 <unknown>
 
 zip1    p15.s, p15.s, p15.s
 // CHECK-INST: zip1    p15.s, p15.s, p15.s
 // CHECK-ENCODING: [0xef,0x41,0xaf,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 41 af 05 <unknown>
 
 zip1    z31.b, z31.b, z31.b
 // CHECK-INST: zip1    z31.b, z31.b, z31.b
 // CHECK-ENCODING: [0xff,0x63,0x3f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 63 3f 05 <unknown>
 
 zip1    z21.s, z10.s, z21.s
 // CHECK-INST: zip1    z21.s, z10.s, z21.s
 // CHECK-ENCODING: [0x55,0x61,0xb5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 61 b5 05 <unknown>
Index: test/MC/AArch64/SVE/zip2.s
===================================================================
--- test/MC/AArch64/SVE/zip2.s
+++ test/MC/AArch64/SVE/zip2.s
@@ -10,191 +10,191 @@
 zip2    p5.d, p10.d, p5.d
 // CHECK-INST: zip2    p5.d, p10.d, p5.d
 // CHECK-ENCODING: [0x45,0x45,0xe5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 45 e5 05 <unknown>
 
 zip2    p5.b, p10.b, p5.b
 // CHECK-INST: zip2    p5.b, p10.b, p5.b
 // CHECK-ENCODING: [0x45,0x45,0x25,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 45 25 05 <unknown>
 
 zip2    z0.s, z0.s, z0.s
 // CHECK-INST: zip2    z0.s, z0.s, z0.s
 // CHECK-ENCODING: [0x00,0x64,0xa0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 64 a0 05 <unknown>
 
 zip2    p0.h, p0.h, p0.h
 // CHECK-INST: zip2    p0.h, p0.h, p0.h
 // CHECK-ENCODING: [0x00,0x44,0x60,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 44 60 05 <unknown>
 
 zip2    p7.d, p13.d, p8.d
 // CHECK-INST: zip2    p7.d, p13.d, p8.d
 // CHECK-ENCODING: [0xa7,0x45,0xe8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 45 e8 05 <unknown>
 
 zip2    z0.h, z0.h, z0.h
 // CHECK-INST: zip2    z0.h, z0.h, z0.h
 // CHECK-ENCODING: [0x00,0x64,0x60,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 64 60 05 <unknown>
 
 zip2    z21.d, z10.d, z21.d
 // CHECK-INST: zip2    z21.d, z10.d, z21.d
 // CHECK-ENCODING: [0x55,0x65,0xf5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 65 f5 05 <unknown>
 
 zip2    p0.s, p0.s, p0.s
 // CHECK-INST: zip2    p0.s, p0.s, p0.s
 // CHECK-ENCODING: [0x00,0x44,0xa0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 44 a0 05 <unknown>
 
 zip2    p7.b, p13.b, p8.b
 // CHECK-INST: zip2    p7.b, p13.b, p8.b
 // CHECK-ENCODING: [0xa7,0x45,0x28,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 45 28 05 <unknown>
 
 zip2    p7.s, p13.s, p8.s
 // CHECK-INST: zip2    p7.s, p13.s, p8.s
 // CHECK-ENCODING: [0xa7,0x45,0xa8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 45 a8 05 <unknown>
 
 zip2    p0.d, p0.d, p0.d
 // CHECK-INST: zip2    p0.d, p0.d, p0.d
 // CHECK-ENCODING: [0x00,0x44,0xe0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 44 e0 05 <unknown>
 
 zip2    z23.b, z13.b, z8.b
 // CHECK-INST: zip2    z23.b, z13.b, z8.b
 // CHECK-ENCODING: [0xb7,0x65,0x28,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 65 28 05 <unknown>
 
 zip2    z21.s, z10.s, z21.s
 // CHECK-INST: zip2    z21.s, z10.s, z21.s
 // CHECK-ENCODING: [0x55,0x65,0xb5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 65 b5 05 <unknown>
 
 zip2    z23.s, z13.s, z8.s
 // CHECK-INST: zip2    z23.s, z13.s, z8.s
 // CHECK-ENCODING: [0xb7,0x65,0xa8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 65 a8 05 <unknown>
 
 zip2    p15.b, p15.b, p15.b
 // CHECK-INST: zip2    p15.b, p15.b, p15.b
 // CHECK-ENCODING: [0xef,0x45,0x2f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 45 2f 05 <unknown>
 
 zip2    z0.d, z0.d, z0.d
 // CHECK-INST: zip2    z0.d, z0.d, z0.d
 // CHECK-ENCODING: [0x00,0x64,0xe0,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 64 e0 05 <unknown>
 
 zip2    z31.d, z31.d, z31.d
 // CHECK-INST: zip2    z31.d, z31.d, z31.d
 // CHECK-ENCODING: [0xff,0x67,0xff,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 67 ff 05 <unknown>
 
 zip2    p15.d, p15.d, p15.d
 // CHECK-INST: zip2    p15.d, p15.d, p15.d
 // CHECK-ENCODING: [0xef,0x45,0xef,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 45 ef 05 <unknown>
 
 zip2    z21.b, z10.b, z21.b
 // CHECK-INST: zip2    z21.b, z10.b, z21.b
 // CHECK-ENCODING: [0x55,0x65,0x35,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 65 35 05 <unknown>
 
 zip2    z0.b, z0.b, z0.b
 // CHECK-INST: zip2    z0.b, z0.b, z0.b
 // CHECK-ENCODING: [0x00,0x64,0x20,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 64 20 05 <unknown>
 
 zip2    z31.s, z31.s, z31.s
 // CHECK-INST: zip2    z31.s, z31.s, z31.s
 // CHECK-ENCODING: [0xff,0x67,0xbf,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 67 bf 05 <unknown>
 
 zip2    p5.h, p10.h, p5.h
 // CHECK-INST: zip2    p5.h, p10.h, p5.h
 // CHECK-ENCODING: [0x45,0x45,0x65,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 45 65 05 <unknown>
 
 zip2    z31.b, z31.b, z31.b
 // CHECK-INST: zip2    z31.b, z31.b, z31.b
 // CHECK-ENCODING: [0xff,0x67,0x3f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 67 3f 05 <unknown>
 
 zip2    p7.h, p13.h, p8.h
 // CHECK-INST: zip2    p7.h, p13.h, p8.h
 // CHECK-ENCODING: [0xa7,0x45,0x68,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: a7 45 68 05 <unknown>
 
 zip2    z23.d, z13.d, z8.d
 // CHECK-INST: zip2    z23.d, z13.d, z8.d
 // CHECK-ENCODING: [0xb7,0x65,0xe8,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 65 e8 05 <unknown>
 
 zip2    z21.h, z10.h, z21.h
 // CHECK-INST: zip2    z21.h, z10.h, z21.h
 // CHECK-ENCODING: [0x55,0x65,0x75,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 55 65 75 05 <unknown>
 
 zip2    p5.s, p10.s, p5.s
 // CHECK-INST: zip2    p5.s, p10.s, p5.s
 // CHECK-ENCODING: [0x45,0x45,0xa5,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 45 45 a5 05 <unknown>
 
 zip2    p0.b, p0.b, p0.b
 // CHECK-INST: zip2    p0.b, p0.b, p0.b
 // CHECK-ENCODING: [0x00,0x44,0x20,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: 00 44 20 05 <unknown>
 
 zip2    p15.s, p15.s, p15.s
 // CHECK-INST: zip2    p15.s, p15.s, p15.s
 // CHECK-ENCODING: [0xef,0x45,0xaf,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 45 af 05 <unknown>
 
 zip2    z31.h, z31.h, z31.h
 // CHECK-INST: zip2    z31.h, z31.h, z31.h
 // CHECK-ENCODING: [0xff,0x67,0x7f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ff 67 7f 05 <unknown>
 
 zip2    p15.h, p15.h, p15.h
 // CHECK-INST: zip2    p15.h, p15.h, p15.h
 // CHECK-ENCODING: [0xef,0x45,0x6f,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: ef 45 6f 05 <unknown>
 
 zip2    z23.h, z13.h, z8.h
 // CHECK-INST: zip2    z23.h, z13.h, z8.h
 // CHECK-ENCODING: [0xb7,0x65,0x68,0x05]
-// CHECK-ERROR: invalid operand for instruction
+// CHECK-ERROR: instruction requires: sve
 // CHECK-UNKNOWN: b7 65 68 05 <unknown>