[llvm-branch-commits] [llvm] [RISC-V][MC] Convert diagnostic tests to llvm-mc --verify (PR #227571)
Alexander Richardson via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Nov 2 23:19:38 PST 2026
https://github.com/arichardson updated https://github.com/llvm/llvm-project/pull/227571
>From 2530f7f3aeaf22088b505bcb4616505e250a4f7f Mon Sep 17 00:00:00 2001
From: Alex Richardson <alexrichardson at google.com>
Date: Mon, 2 Nov 2026 22:11:52 -0800
Subject: [PATCH 1/2] [nspr] initial commit
---
.../Relocations/data-directive-specifier.s | 14 +-
llvm/test/MC/RISCV/Relocations/expr-err.s | 22 +-
llvm/test/MC/RISCV/XTHeadBa-invalid.s | 12 +-
llvm/test/MC/RISCV/XTHeadVdot-valid.s | 31 +-
llvm/test/MC/RISCV/attribute-arch-invalid.s | 6 +-
llvm/test/MC/RISCV/cfi-regs-invalid.s | 8 +-
llvm/test/MC/RISCV/compressed-zicfiss.s | 19 +-
llvm/test/MC/RISCV/corev/XCValu-invalid.s | 359 ++-
llvm/test/MC/RISCV/corev/XCValu-valid.s | 155 +-
llvm/test/MC/RISCV/corev/XCVbi-invalid.s | 35 +-
llvm/test/MC/RISCV/corev/XCVbi.s | 15 +-
.../test/MC/RISCV/corev/XCVbitmanip-invalid.s | 187 +-
llvm/test/MC/RISCV/corev/XCVbitmanip.s | 99 +-
llvm/test/MC/RISCV/corev/XCVelw-invalid.s | 21 +-
llvm/test/MC/RISCV/corev/XCVelw-valid.s | 9 +-
llvm/test/MC/RISCV/corev/XCVmac-invalid.s | 319 +-
llvm/test/MC/RISCV/corev/XCVmac-valid.s | 123 +-
llvm/test/MC/RISCV/corev/XCVmem-invalid.s | 283 +-
llvm/test/MC/RISCV/corev/XCVmem-valid.s | 99 +-
llvm/test/MC/RISCV/corev/XCVsimd-invalid.s | 2713 ++++++++---------
llvm/test/MC/RISCV/corev/XCVsimd.s | 1763 ++++++-----
llvm/test/MC/RISCV/data-directives-invalid.s | 24 +-
llvm/test/MC/RISCV/directive-variant_cc.s | 6 +-
llvm/test/MC/RISCV/empty-string.s | 4 +-
llvm/test/MC/RISCV/fixups-diagnostics.s | 8 +-
llvm/test/MC/RISCV/function-call-invalid.s | 28 +-
llvm/test/MC/RISCV/hinval-invalid.s | 20 +-
llvm/test/MC/RISCV/insn-invalid.s | 72 +-
llvm/test/MC/RISCV/insn_c-invalid.s | 28 +-
llvm/test/MC/RISCV/insn_xqci-invalid.s | 75 +-
llvm/test/MC/RISCV/invalid-attribute.s | 26 +-
llvm/test/MC/RISCV/option-invalid.s | 49 +-
llvm/test/MC/RISCV/pcrel-lo12-invalid.s | 10 +-
llvm/test/MC/RISCV/priv-invalid.s | 96 +-
llvm/test/MC/RISCV/priv-rv64-invalid.s | 20 +-
llvm/test/MC/RISCV/pseudo-jump-invalid.s | 10 +-
llvm/test/MC/RISCV/reloc-directive-err.s | 4 +-
llvm/test/MC/RISCV/rv32-only-csr-names.s | 297 +-
llvm/test/MC/RISCV/rv32c-invalid.s | 120 +-
llvm/test/MC/RISCV/rv32d-invalid.s | 36 +-
llvm/test/MC/RISCV/rv32dc-invalid.s | 12 +-
llvm/test/MC/RISCV/rv32e-xqccmp-invalid.s | 12 +-
llvm/test/MC/RISCV/rv32e-zcmp-invalid.s | 10 +-
llvm/test/MC/RISCV/rv32f-invalid.s | 34 +-
llvm/test/MC/RISCV/rv32fc-invalid.s | 12 +-
llvm/test/MC/RISCV/rv32i-aliases-invalid.s | 204 +-
llvm/test/MC/RISCV/rv32m-invalid.s | 12 +-
llvm/test/MC/RISCV/rv32p-invalid.s | 235 +-
llvm/test/MC/RISCV/rv32q-invalid.s | 24 +-
llvm/test/MC/RISCV/rv32xqccmp-invalid.s | 31 +-
llvm/test/MC/RISCV/rv32xtheadbs-invalid.s | 8 +-
.../MC/RISCV/rv32xtheadfmemidx-d-invalid.s | 10 +-
.../MC/RISCV/rv32xtheadfmemidx-f-invalid.s | 14 +-
llvm/test/MC/RISCV/rv32xtheadmac-invalid.s | 6 +-
llvm/test/MC/RISCV/rv32xtheadmemidx-invalid.s | 26 +-
.../test/MC/RISCV/rv32xtheadmempair-invalid.s | 40 +-
llvm/test/MC/RISCV/rv32zaamo-invalid.s | 16 +-
llvm/test/MC/RISCV/rv32zacas-invalid.s | 24 +-
llvm/test/MC/RISCV/rv32zalasr-invalid.s | 28 +-
llvm/test/MC/RISCV/rv32zalrsc-invalid.s | 8 +-
llvm/test/MC/RISCV/rv32zba-invalid.s | 18 +-
llvm/test/MC/RISCV/rv32zbb-invalid.s | 50 +-
llvm/test/MC/RISCV/rv32zbc-invalid.s | 8 +-
llvm/test/MC/RISCV/rv32zbkc-invalid.s | 8 +-
llvm/test/MC/RISCV/rv32zbkx-invalid.s | 6 +-
llvm/test/MC/RISCV/rv32zbs-invalid.s | 34 +-
llvm/test/MC/RISCV/rv32zclsd-invalid.s | 50 +-
llvm/test/MC/RISCV/rv32zcmop-invalid.s | 8 +-
llvm/test/MC/RISCV/rv32zcmp-invalid.s | 37 +-
llvm/test/MC/RISCV/rv32zdinx-invalid.s | 26 +-
llvm/test/MC/RISCV/rv32zfa-only-valid.s | 8 +-
llvm/test/MC/RISCV/rv32zfh-invalid.s | 41 +-
llvm/test/MC/RISCV/rv32zfinx-invalid.s | 28 +-
llvm/test/MC/RISCV/rv32zhinx-invalid.s | 24 +-
llvm/test/MC/RISCV/rv32zhinxmin-invalid.s | 14 +-
llvm/test/MC/RISCV/rv32zilsd-invalid.s | 18 +-
llvm/test/MC/RISCV/rv32zimop-invalid.s | 6 +-
llvm/test/MC/RISCV/rv32zknd-only-invalid.s | 13 +-
llvm/test/MC/RISCV/rv32zkne-only-invalid.s | 13 +-
llvm/test/MC/RISCV/rv32zksed-invalid.s | 10 +-
llvm/test/MC/RISCV/rv32zmmul-invaild.s | 11 +-
llvm/test/MC/RISCV/rv64d-invalid.s | 30 +-
llvm/test/MC/RISCV/rv64d-valid.s | 23 +-
llvm/test/MC/RISCV/rv64e-xqccmp-invalid.s | 12 +-
llvm/test/MC/RISCV/rv64e-zcmp-invalid.s | 10 +-
llvm/test/MC/RISCV/rv64f-invalid.s | 26 +-
llvm/test/MC/RISCV/rv64f-valid.s | 19 +-
llvm/test/MC/RISCV/rv64h-invalid.s | 24 +-
llvm/test/MC/RISCV/rv64i-aliases-invalid.s | 204 +-
llvm/test/MC/RISCV/rv64i-invalid.s | 32 +-
llvm/test/MC/RISCV/rv64ih-valid.s | 15 +-
llvm/test/MC/RISCV/rv64p-invalid.s | 111 +-
llvm/test/MC/RISCV/rv64q-invalid.s | 10 +-
llvm/test/MC/RISCV/rv64q-valid.s | 19 +-
llvm/test/MC/RISCV/rv64xqccmp-invalid.s | 25 +-
llvm/test/MC/RISCV/rv64xtheadbs-invalid.s | 6 +-
.../test/MC/RISCV/rv64xtheadfmemidx-invalid.s | 16 +-
llvm/test/MC/RISCV/rv64xtheadmemidx-invalid.s | 110 +-
.../test/MC/RISCV/rv64xtheadmempair-invalid.s | 36 +-
llvm/test/MC/RISCV/rv64zaamo-invalid.s | 16 +-
llvm/test/MC/RISCV/rv64zaamo-valid.s | 78 +-
llvm/test/MC/RISCV/rv64zacas-invalid.s | 24 +-
llvm/test/MC/RISCV/rv64zalasr-invalid.s | 20 +-
llvm/test/MC/RISCV/rv64zalasr-valid.s | 12 +-
llvm/test/MC/RISCV/rv64zalrsc-invalid.s | 8 +-
llvm/test/MC/RISCV/rv64zalrsc-valid.s | 22 +-
llvm/test/MC/RISCV/rv64zba-invalid.s | 16 +-
llvm/test/MC/RISCV/rv64zbb-invalid.s | 22 +-
llvm/test/MC/RISCV/rv64zbs-invalid.s | 34 +-
llvm/test/MC/RISCV/rv64zcmp-invalid.s | 69 +-
llvm/test/MC/RISCV/rv64zdinx-invalid.s | 18 +-
llvm/test/MC/RISCV/rv64zdinx-valid.s | 19 +-
llvm/test/MC/RISCV/rv64zfa-only-valid.s | 8 +-
llvm/test/MC/RISCV/rv64zfh-invalid.s | 31 +-
llvm/test/MC/RISCV/rv64zfh-valid.s | 19 +-
llvm/test/MC/RISCV/rv64zfinx-invalid.s | 14 +-
llvm/test/MC/RISCV/rv64zfinx-valid.s | 19 +-
llvm/test/MC/RISCV/rv64zhinx-invalid.s | 14 +-
llvm/test/MC/RISCV/rv64zhinx-valid.s | 19 +-
llvm/test/MC/RISCV/rv64zhinxmin-invalid.s | 14 +-
llvm/test/MC/RISCV/rv64zkne-only-invalid.s | 13 +-
llvm/test/MC/RISCV/rv64zksed-invalid.s | 10 +-
llvm/test/MC/RISCV/rv64zmmul-invalid.s | 11 +-
llvm/test/MC/RISCV/rva-aliases-invalid.s | 202 +-
llvm/test/MC/RISCV/rvc-hints-invalid.s | 28 +-
llvm/test/MC/RISCV/rve-invalid.s | 78 +-
llvm/test/MC/RISCV/rvi-pseudos-invalid.s | 68 +-
llvm/test/MC/RISCV/rvq-zfhmin-invalid.s | 14 +-
llvm/test/MC/RISCV/rvv/add.s | 121 +-
llvm/test/MC/RISCV/rvv/and.s | 15 +-
llvm/test/MC/RISCV/rvv/clip.s | 27 +-
llvm/test/MC/RISCV/rvv/compare.s | 143 +-
llvm/test/MC/RISCV/rvv/convert.s | 89 +-
llvm/test/MC/RISCV/rvv/div.s | 35 +-
llvm/test/MC/RISCV/rvv/ext.s | 27 +-
llvm/test/MC/RISCV/rvv/fadd.s | 27 +-
llvm/test/MC/RISCV/rvv/fcompare.s | 53 +-
llvm/test/MC/RISCV/rvv/fdiv.s | 15 +-
llvm/test/MC/RISCV/rvv/fmacc.s | 99 +-
llvm/test/MC/RISCV/rvv/fminmax.s | 19 +-
llvm/test/MC/RISCV/rvv/fmul.s | 19 +-
llvm/test/MC/RISCV/rvv/fmv.s | 9 +-
llvm/test/MC/RISCV/rvv/fothers.s | 29 +-
llvm/test/MC/RISCV/rvv/freduction.s | 29 +-
llvm/test/MC/RISCV/rvv/fsub.s | 31 +-
llvm/test/MC/RISCV/rvv/invalid-alt.s | 10 +-
llvm/test/MC/RISCV/rvv/invalid-eew.s | 131 +-
llvm/test/MC/RISCV/rvv/load.s | 131 +-
llvm/test/MC/RISCV/rvv/macc.s | 63 +-
llvm/test/MC/RISCV/rvv/mask.s | 55 +-
llvm/test/MC/RISCV/rvv/minmax.s | 35 +-
llvm/test/MC/RISCV/rvv/mul.s | 67 +-
llvm/test/MC/RISCV/rvv/mv.s | 21 +-
llvm/test/MC/RISCV/rvv/or.s | 15 +-
llvm/test/MC/RISCV/rvv/others.s | 51 +-
llvm/test/MC/RISCV/rvv/reduction.s | 45 +-
llvm/test/MC/RISCV/rvv/shift.s | 89 +-
llvm/test/MC/RISCV/rvv/sign-injection.s | 27 +-
llvm/test/MC/RISCV/rvv/store.s | 87 +-
llvm/test/MC/RISCV/rvv/sub.s | 103 +-
llvm/test/MC/RISCV/rvv/vsetvl-alt.s | 11 +-
llvm/test/MC/RISCV/rvv/xor.s | 19 +-
llvm/test/MC/RISCV/rvv/xsfmm-invalid.s | 32 +-
llvm/test/MC/RISCV/rvv/xsfmm.s | 64 +-
llvm/test/MC/RISCV/rvv/xsfvcp.s | 62 +-
llvm/test/MC/RISCV/rvv/xsfvfnrclip.s | 11 +-
llvm/test/MC/RISCV/rvv/xsfvfwmacc.s | 7 +-
llvm/test/MC/RISCV/rvv/xsfvqmacc.s | 21 +-
llvm/test/MC/RISCV/rvv/zvabd.s | 39 +-
llvm/test/MC/RISCV/rvv/zvbb.s | 17 +-
llvm/test/MC/RISCV/rvv/zvbc.s | 14 +-
llvm/test/MC/RISCV/rvv/zvdot4a8i.s | 31 +-
llvm/test/MC/RISCV/rvv/zvfbdota32f-invalid.s | 13 +-
llvm/test/MC/RISCV/rvv/zvfbdota32f.s | 7 +-
llvm/test/MC/RISCV/rvv/zvfbfmin.s | 14 +-
llvm/test/MC/RISCV/rvv/zvfbfwma-invalid.s | 14 +-
llvm/test/MC/RISCV/rvv/zvfbfwma.s | 14 +-
llvm/test/MC/RISCV/rvv/zvfofp8min.s | 12 +-
llvm/test/MC/RISCV/rvv/zvfqwbdota8f-invalid.s | 13 +-
llvm/test/MC/RISCV/rvv/zvfqwbdota8f.s | 11 +-
llvm/test/MC/RISCV/rvv/zvfqwdota8f.s | 13 +-
.../test/MC/RISCV/rvv/zvfwbdota16bf-invalid.s | 13 +-
llvm/test/MC/RISCV/rvv/zvfwbdota16bf.s | 7 +-
llvm/test/MC/RISCV/rvv/zvfwdota16bf.s | 9 +-
llvm/test/MC/RISCV/rvv/zvkb.s | 21 +-
llvm/test/MC/RISCV/rvv/zvkg.s | 7 +-
llvm/test/MC/RISCV/rvv/zvkgs.s | 7 +-
llvm/test/MC/RISCV/rvv/zvkned.s | 33 +-
llvm/test/MC/RISCV/rvv/zvknh.s | 9 +-
llvm/test/MC/RISCV/rvv/zvksed.s | 11 +-
llvm/test/MC/RISCV/rvv/zvksh.s | 9 +-
llvm/test/MC/RISCV/rvv/zvlsseg.s | 1029 ++++---
llvm/test/MC/RISCV/rvv/zvqwbdota-invalid.s | 13 +-
llvm/test/MC/RISCV/rvv/zvqwbdota.s | 11 +-
llvm/test/MC/RISCV/rvv/zvqwdotai8i16.s | 9 +-
llvm/test/MC/RISCV/rvv/zvvfmm.s | 23 +-
llvm/test/MC/RISCV/rvv/zvvmm.s | 11 +-
llvm/test/MC/RISCV/rvv/zvvmtls-invalid.s | 23 +-
llvm/test/MC/RISCV/rvv/zvvmtls.s | 27 +-
llvm/test/MC/RISCV/rvv/zvvmttls-invalid.s | 23 +-
llvm/test/MC/RISCV/rvv/zvvmttls.s | 27 +-
llvm/test/MC/RISCV/rvy-invalid-attributes.s | 20 +-
llvm/test/MC/RISCV/rvy/rvy-basic-invalid.s | 36 +-
llvm/test/MC/RISCV/rvzabha-invalid.s | 20 +-
llvm/test/MC/RISCV/rvzalasr-valid.s | 32 +-
llvm/test/MC/RISCV/rvzcb-invalid.s | 16 +-
llvm/test/MC/RISCV/rvzcmt-invalid.s | 12 +-
llvm/test/MC/RISCV/rvzcmt-valid.s | 12 +-
llvm/test/MC/RISCV/rvzfbfmin-invalid.s | 28 +-
llvm/test/MC/RISCV/rvzfhmin-invalid.s | 28 +-
llvm/test/MC/RISCV/rvzicbom-invalid.s | 30 +-
llvm/test/MC/RISCV/rvzicbop-invalid.s | 36 +-
llvm/test/MC/RISCV/rvzicboz-invalid.s | 18 +-
llvm/test/MC/RISCV/rvzicond-invalid.s | 16 +-
llvm/test/MC/RISCV/rvzihintntl-invalid.s | 24 +-
llvm/test/MC/RISCV/rvzihintntlc-invalid.s | 20 +-
llvm/test/MC/RISCV/smctr-ssctr-valid.s | 8 +-
llvm/test/MC/RISCV/smrnmi-invalid.s | 6 +-
llvm/test/MC/RISCV/spmp-csr-names.s | 5 +-
llvm/test/MC/RISCV/tail-call-invalid.s | 24 +-
llvm/test/MC/RISCV/tlsdesc.s | 42 +-
llvm/test/MC/RISCV/xaifet-amo-valid.s | 366 ++-
llvm/test/MC/RISCV/xaifet-simd-valid.s | 268 +-
.../MC/RISCV/xandesperf-fixups-diagnostics.s | 6 +-
llvm/test/MC/RISCV/xandesperf-rv64-invalid.s | 35 +-
llvm/test/MC/RISCV/xandesvbfhcvt-valid.s | 10 +-
llvm/test/MC/RISCV/xandesvdot-valid.s | 18 +-
llvm/test/MC/RISCV/xandesvpackfph-valid.s | 14 +-
llvm/test/MC/RISCV/xandesvsinth-invalid.s | 12 +-
llvm/test/MC/RISCV/xandesvsintload-valid.s | 14 +-
llvm/test/MC/RISCV/xqccmi-invalid.s | 6 +-
llvm/test/MC/RISCV/xqccmt-invalid.s | 12 +-
llvm/test/MC/RISCV/xqci-access-pseudos.s | 93 +-
llvm/test/MC/RISCV/xqcibm-invalid.s | 562 ++--
llvm/test/MC/RISCV/xqciint-csrs-invalid.s | 127 +-
llvm/test/MC/RISCV/xqciio-invalid.s | 30 +-
llvm/test/MC/RISCV/xqcilo-pseudos-invalid.s | 120 +-
llvm/test/MC/RISCV/xqcilsm-invalid.s | 126 +-
llvm/test/MC/RISCV/xqcisls-invalid.s | 150 +-
llvm/test/MC/RISCV/xsfmclic-invalid.s | 16 +-
llvm/test/MC/RISCV/xsfsclic-invalid.s | 16 +-
llvm/test/MC/RISCV/xsfvfexp.s | 5 +-
llvm/test/MC/RISCV/xsfvfexpa.s | 5 +-
llvm/test/MC/RISCV/xsifive-invalid.s | 22 +-
llvm/test/MC/RISCV/xsmtvdot-invalid.s | 25 +-
llvm/test/MC/RISCV/xsmtvdotii-invalid.s | 127 +-
llvm/test/MC/RISCV/xtheadcmo-invalid.s | 46 +-
llvm/test/MC/RISCV/xtheadcondmov-invalid.s | 16 +-
llvm/test/MC/RISCV/xtheadmac-invalid.s | 14 +-
llvm/test/MC/RISCV/xtheadsync-invalid.s | 14 +-
llvm/test/MC/RISCV/zfa-double-invalid.s | 36 +-
llvm/test/MC/RISCV/zfa-half-invalid.s | 34 +-
llvm/test/MC/RISCV/zfa-invalid.s | 80 +-
llvm/test/MC/RISCV/zfa-quad-invalid.s | 34 +-
llvm/test/MC/RISCV/zfa-valid.s | 610 ++--
llvm/test/MC/RISCV/zfa-zfhmin-zvfh-valid.s | 8 +-
llvm/test/MC/RISCV/zicfilp-invalid.s | 14 +-
llvm/test/MC/RISCV/zicfiss-invalid.s | 16 +-
llvm/test/MC/RISCV/zilx-invalid.s | 26 +-
llvm/test/MC/RISCV/zilx-valid-rv32.s | 23 +-
llvm/test/MC/RISCV/zilx-valid-rv64.s | 25 +-
261 files changed, 8460 insertions(+), 8702 deletions(-)
diff --git a/llvm/test/MC/RISCV/Relocations/data-directive-specifier.s b/llvm/test/MC/RISCV/Relocations/data-directive-specifier.s
index 2b97dca147bfef..a7c56c9bedb815 100644
--- a/llvm/test/MC/RISCV/Relocations/data-directive-specifier.s
+++ b/llvm/test/MC/RISCV/Relocations/data-directive-specifier.s
@@ -1,7 +1,7 @@
# RUN: llvm-mc -triple=riscv64 -filetype=obj %s | llvm-readobj -r - | FileCheck %s --check-prefixes=CHECK,RV64
# RUN: llvm-mc -triple=riscv32 -filetype=obj %s | llvm-readobj -r - | FileCheck %s --check-prefixes=CHECK,RV32
-# RUN: not llvm-mc -triple=riscv64 -filetype=obj %s --defsym ERR=1 -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
+# RUN: llvm-mc --verify -triple=riscv64 -filetype=obj %s --defsym ERR=1 -o /dev/null
.globl g
g:
@@ -28,21 +28,21 @@ data1:
.word %gotpcrel(extern+4), %gotpcrel(extern-5)
.ifdef ERR
-# ERR: [[#@LINE+1]]:8: error: %pltpcrel can only be used in a .word directive
+# expected-error at +1:8 {{%pltpcrel can only be used in a .word directive}}
.quad %pltpcrel(g)
-# ERR: [[#@LINE+1]]:8: error: expected relocatable expression
+# expected-error at +1:8 {{expected relocatable expression}}
.word %pltpcrel(g-.)
-# ERR: [[#@LINE+1]]:8: error: expected relocatable expression
+# expected-error at +1:8 {{expected relocatable expression}}
.word %pltpcrel(extern - und)
-# ERR: [[#@LINE+1]]:8: error: %gotpcrel can only be used in a .word directive
+# expected-error at +1:8 {{%gotpcrel can only be used in a .word directive}}
.quad %gotpcrel(g)
-# ERR: [[#@LINE+1]]:8: error: expected relocatable expression
+# expected-error at +1:8 {{expected relocatable expression}}
.word %gotpcrel(extern - .)
-# ERR: [[#@LINE+1]]:8: error: expected relocatable expression
+# expected-error at +1:8 {{expected relocatable expression}}
.word %gotpcrel(extern - und)
.endif
diff --git a/llvm/test/MC/RISCV/Relocations/expr-err.s b/llvm/test/MC/RISCV/Relocations/expr-err.s
index 481a379321a20a..f4ec30975320c4 100644
--- a/llvm/test/MC/RISCV/Relocations/expr-err.s
+++ b/llvm/test/MC/RISCV/Relocations/expr-err.s
@@ -1,28 +1,28 @@
-# RUN: not llvm-mc -triple riscv32 -filetype obj %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -filetype obj %s -o /dev/null
.Ltmp1:
.quad tls
lui a0, %hi(tls+0-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:10: error: expected relocatable expression
+# expected-error at -1:10 {{expected relocatable expression}}
lw a0, %lo(tls+0-.Ltmp1)(t0)
-# CHECK: :[[#@LINE-1]]:9: error: expected relocatable expression
+# expected-error at -1:9 {{expected relocatable expression}}
lui a0, %tprel_hi(tls+0-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:10: error: expected relocatable expression
+# expected-error at -1:10 {{expected relocatable expression}}
add a0, a0, tp, %tprel_add(tls+0-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:18: error: expected relocatable expression
+# expected-error at -1:18 {{expected relocatable expression}}
addi a0, a0, %tprel_lo(tls+0-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:15: error: expected relocatable expression
+# expected-error at -1:15 {{expected relocatable expression}}
auipc a0, %tls_ie_pcrel_hi(tls+0-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:12: error: expected relocatable expression
+# expected-error at -1:12 {{expected relocatable expression}}
auipc a0, %tls_gd_pcrel_hi(tls+0-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:12: error: expected relocatable expression
+# expected-error at -1:12 {{expected relocatable expression}}
auipc a0, %pcrel_hi(tls-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:12: error: expected relocatable expression
+# expected-error at -1:12 {{expected relocatable expression}}
auipc a0, %got_pcrel_hi(tls-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:12: error: expected relocatable expression
+# expected-error at -1:12 {{expected relocatable expression}}
addi a0, a0, %pcrel_lo(tls-.Ltmp1)
-# CHECK: :[[#@LINE-1]]:15: error: expected relocatable expression
+# expected-error at -1:15 {{expected relocatable expression}}
# tail tls+32
# tail tls-tls
diff --git a/llvm/test/MC/RISCV/XTHeadBa-invalid.s b/llvm/test/MC/RISCV/XTHeadBa-invalid.s
index 11e80d32250439..f6b21db292a727 100644
--- a/llvm/test/MC/RISCV/XTHeadBa-invalid.s
+++ b/llvm/test/MC/RISCV/XTHeadBa-invalid.s
@@ -1,11 +1,11 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadba < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadba < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadba < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xtheadba < %s
# Too few operands
-th.addsl t0, t1 # CHECK: :[[@LINE]]:16: error: too few operands for instruction
+th.addsl t0, t1 # expected-error:16 {{too few operands for instruction}}
# Too few operands
-th.addsl t0, t1, t2 # CHECK: :[[@LINE]]:20: error: too few operands for instruction
+th.addsl t0, t1, t2 # expected-error:20 {{too few operands for instruction}}
# Immediate operand out of range
-th.addsl t0, t1, t2, 4 # CHECK: :[[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
+th.addsl t0, t1, t2, 4 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
# Immediate operand out of range
-th.addsl t0, t1, t2, -1 # CHECK: :[[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
+th.addsl t0, t1, t2, -1 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
diff --git a/llvm/test/MC/RISCV/XTHeadVdot-valid.s b/llvm/test/MC/RISCV/XTHeadVdot-valid.s
index f01c75374f7efc..421c3965e64b2f 100644
--- a/llvm/test/MC/RISCV/XTHeadVdot-valid.s
+++ b/llvm/test/MC/RISCV/XTHeadVdot-valid.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+xtheadvdot %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+xtheadvdot %s \
# RUN: | llvm-objdump -d --mattr=+xtheadvdot - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,69 +8,69 @@
th.vmaqau.vv v8, v20, v4, v0.t
# CHECK-INST: th.vmaqau.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x0b,0x64,0x4a,0x88]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqau.vv v8, v20, v4
# CHECK-INST: th.vmaqau.vv v8, v20, v4
# CHECK-ENCODING: [0x0b,0x64,0x4a,0x8a]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqau.vx v8, a0, v4, v0.t
# CHECK-INST: th.vmaqau.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x0b,0x64,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqau.vx v8, a0, v4
# CHECK-INST: th.vmaqau.vx v8, a0, v4
# CHECK-ENCODING: [0x0b,0x64,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqa.vv v8, v20, v4, v0.t
# CHECK-INST: th.vmaqa.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x0b,0x64,0x4a,0x80]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqa.vv v8, v20, v4
# CHECK-INST: th.vmaqa.vv v8, v20, v4
# CHECK-ENCODING: [0x0b,0x64,0x4a,0x82]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqa.vx v8, a0, v4, v0.t
# CHECK-INST: th.vmaqa.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x0b,0x64,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqa.vx v8, a0, v4
# CHECK-INST: th.vmaqa.vx v8, a0, v4
# CHECK-ENCODING: [0x0b,0x64,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqasu.vv v8, v20, v4, v0.t
# CHECK-INST: th.vmaqasu.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x0b,0x64,0x4a,0x90]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqasu.vv v8, v20, v4
# CHECK-INST: th.vmaqasu.vv v8, v20, v4
# CHECK-ENCODING: [0x0b,0x64,0x4a,0x92]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqasu.vx v8, a0, v4, v0.t
# CHECK-INST: th.vmaqasu.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x0b,0x64,0x45,0x94]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqasu.vx v8, a0, v4
# CHECK-INST: th.vmaqasu.vx v8, a0, v4
# CHECK-ENCODING: [0x0b,0x64,0x45,0x96]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqaus.vx v8, a0, v4, v0.t
# CHECK-INST: th.vmaqaus.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x0b,0x64,0x45,0x9c]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
th.vmaqaus.vx v8, a0, v4
# CHECK-INST: th.vmaqaus.vx v8, a0, v4
# CHECK-ENCODING: [0x0b,0x64,0x45,0x9e]
-# CHECK-ERROR: instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot){{$}}
+# expected-error at -3 {{instruction requires the following: 'XTHeadVdot' (T-Head Vector Extensions for Dot)}}
diff --git a/llvm/test/MC/RISCV/attribute-arch-invalid.s b/llvm/test/MC/RISCV/attribute-arch-invalid.s
index 4ed8f6a0278948..54a996411ec9df 100644
--- a/llvm/test/MC/RISCV/attribute-arch-invalid.s
+++ b/llvm/test/MC/RISCV/attribute-arch-invalid.s
@@ -1,9 +1,9 @@
## Invalid arch string
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
## Version strings are required for experimental extensions
.attribute arch, "rv32izicfilp"
-# CHECK: error: invalid arch name 'rv32izicfilp', experimental extension requires explicit version number `zicfilp`
+# expected-error at -1 {{invalid arch name 'rv32izicfilp', experimental extension requires explicit version number `zicfilp`}}
diff --git a/llvm/test/MC/RISCV/cfi-regs-invalid.s b/llvm/test/MC/RISCV/cfi-regs-invalid.s
index 92943e7f1dc11b..bef34983717ba0 100644
--- a/llvm/test/MC/RISCV/cfi-regs-invalid.s
+++ b/llvm/test/MC/RISCV/cfi-regs-invalid.s
@@ -1,7 +1,7 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
.cfi_startproc
-.cfi_offset x00, 0 # CHECK: :[[@LINE]]:16: error: invalid register name
-.cfi_offset a8, 8 # CHECK: :[[@LINE]]:15: error: invalid register name
+.cfi_offset x00, 0 # expected-error:16 {{invalid register name}}
+.cfi_offset a8, 8 # expected-error:15 {{invalid register name}}
.cfi_endproc
diff --git a/llvm/test/MC/RISCV/compressed-zicfiss.s b/llvm/test/MC/RISCV/compressed-zicfiss.s
index aa5bf2df8d8009..eb7a9581030a09 100644
--- a/llvm/test/MC/RISCV/compressed-zicfiss.s
+++ b/llvm/test/MC/RISCV/compressed-zicfiss.s
@@ -23,45 +23,44 @@
# RUN: | llvm-objdump --mattr=+zcmop,+zimop -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -M no-aliases -show-encoding < %s
# CHECK-ASM-AND-OBJ: c.sspopchk t0
# CHECK-ASM: encoding: [0x81,0x62]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zimop' (May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zimop' (May-Be-Operations)}}
sspopchk x5
# CHECK-ASM-AND-OBJ: c.sspopchk t0
# CHECK-ASM: encoding: [0x81,0x62]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zimop' (May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zimop' (May-Be-Operations)}}
sspopchk t0
# CHECK-ASM-AND-OBJ: c.sspush ra
# CHECK-ASM: encoding: [0x81,0x60]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zimop' (May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zimop' (May-Be-Operations)}}
sspush x1
# CHECK-ASM-AND-OBJ: c.sspush ra
# CHECK-ASM: encoding: [0x81,0x60]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zimop' (May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zimop' (May-Be-Operations)}}
sspush ra
# CHECK-ASM-AND-OBJ: c.sspush ra
# CHECK-ASM: encoding: [0x81,0x60]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)}}
c.sspush x1
# CHECK-ASM-AND-OBJ: c.sspush ra
# CHECK-ASM: encoding: [0x81,0x60]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)}}
c.sspush ra
# CHECK-ASM-AND-OBJ: c.sspopchk t0
# CHECK-ASM: encoding: [0x81,0x62]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)}}
c.sspopchk x5
# CHECK-ASM-AND-OBJ: c.sspopchk t0
# CHECK-ASM: encoding: [0x81,0x62]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)
+# expected-error at +1 {{instruction requires the following: 'Zcmop' (Compressed May-Be-Operations)}}
c.sspopchk t0
diff --git a/llvm/test/MC/RISCV/corev/XCValu-invalid.s b/llvm/test/MC/RISCV/corev/XCValu-invalid.s
index 1caf5b5756ff28..aea7b75a7870dd 100644
--- a/llvm/test/MC/RISCV/corev/XCValu-invalid.s
+++ b/llvm/test/MC/RISCV/corev/XCValu-invalid.s
@@ -1,536 +1,535 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xcvalu %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xcvalu %s
cv.addrnr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addrnr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addrnr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addrnr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addrnr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.addun t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addun t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addun t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addun t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addun t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addun 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addun t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addun t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.extbz t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extbz 0, t1
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extbz t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extbz t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.addnr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addnr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addnr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addnr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addnr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.clipu t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.clipu t0, t1, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.clipu t0, t1, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.clipu t0, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipu 0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.clipu t0, t1, 0, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.minu t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.minu t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.abs t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.abs 0, t1
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.abs t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.abs t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.addrn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addrn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addrn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addrn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addrn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addrn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addrn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addrn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.suburn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.suburn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.suburn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.suburn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.suburn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.suburn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.suburn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.suburn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.clip t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.clip t0, t1, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.clip t0, t1, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.clip t0, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clip 0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clip t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.clip t0, t1, 0, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.addunr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addunr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addunr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addunr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addunr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.addurn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addurn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addurn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addurn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addurn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addurn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addurn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addurn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subun t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subun t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subun t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subun t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subun t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subun 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subun t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.subun t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.subn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subrnr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrnr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrnr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrnr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.subrnr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.slet t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.slet t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.slet 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.slet t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.slet t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.suburnr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.suburnr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.suburnr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.suburnr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.suburnr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.maxu t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.maxu t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.extbs t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extbs 0, t1
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extbs t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extbs t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.exths t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.exths 0, t1
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.exths t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.exths t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.max t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.max t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subunr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subunr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subunr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subunr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.subunr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.exthz t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.exthz 0, t1
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.exthz t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.exthz t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.clipur t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipur t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipur 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipur t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.clipur t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.addurnr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addurnr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addurnr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addurnr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addurnr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.addn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.addn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.addn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.addn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subrn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subrn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subrn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.subrn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.subrn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subnr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subnr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subnr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subnr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.subnr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.clipr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipr t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipr 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clipr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.clipr t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sletu t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sletu t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sletu 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sletu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.sletu t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.min t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.min t0, t1, t2, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/corev/XCValu-valid.s b/llvm/test/MC/RISCV/corev/XCValu-valid.s
index 2636b34d07735b..fef51b50cba5b7 100644
--- a/llvm/test/MC/RISCV/corev/XCValu-valid.s
+++ b/llvm/test/MC/RISCV/corev/XCValu-valid.s
@@ -3,385 +3,384 @@
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xcvalu < %s \
# RUN: | llvm-objdump --mattr=+xcvalu --no-print-imm-hex -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-INSTR %s
-# RUN: not llvm-mc -triple riscv32 %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 %s
cv.addurnr t0, t1, t2
# CHECK-INSTR: cv.addurnr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x86]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addurnr a0, a1, a2
# CHECK-INSTR: cv.addurnr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x86]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.maxu t0, t1, t2
# CHECK-INSTR: cv.maxu t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x5c]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.maxu a0, a1, a2
# CHECK-INSTR: cv.maxu a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x5c]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subrnr t0, t1, t2
# CHECK-INSTR: cv.subrnr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x8c]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subrnr a0, a1, a2
# CHECK-INSTR: cv.subrnr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x8c]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.sle t0, t1, t2
# CHECK-INSTR: cv.sle t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x52]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.slet t0, t1, t2
# CHECK-INSTR: cv.sle t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x52]
-# CHECK-NO-EXT: unrecognized instruction mnemonic
+# expected-error at -3 {{unrecognized instruction mnemonic}}
cv.sle a0, a1, a2
# CHECK-INSTR: cv.sle a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x52]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.slet a0, a1, a2
# CHECK-INSTR: cv.sle a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x52]
-# CHECK-NO-EXT: unrecognized instruction mnemonic
+# expected-error at -3 {{unrecognized instruction mnemonic}}
cv.subrn t0, t1, t2, 0
# CHECK-INSTR: cv.subrn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x32,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subrn t0, t1, t2, 16
# CHECK-INSTR: cv.subrn t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x32,0x73,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subrn a0, a1, zero, 31
# CHECK-INSTR: cv.subrn a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xb5,0x05,0xbe]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subnr t0, t1, t2
# CHECK-INSTR: cv.subnr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subnr a0, a1, a2
# CHECK-INSTR: cv.subnr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addunr t0, t1, t2
# CHECK-INSTR: cv.addunr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x82]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addunr a0, a1, a2
# CHECK-INSTR: cv.addunr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x82]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addurn t0, t1, t2, 0
# CHECK-INSTR: cv.addurn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x22,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addurn t0, t1, t2, 16
# CHECK-INSTR: cv.addurn t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x22,0x73,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addurn a0, a1, zero, 31
# CHECK-INSTR: cv.addurn a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xa5,0x05,0xfe]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addun t0, t1, t2, 0
# CHECK-INSTR: cv.addun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x22,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addun t0, t1, t2, 16
# CHECK-INSTR: cv.addun t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x22,0x73,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addun a0, a1, zero, 31
# CHECK-INSTR: cv.addun a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xa5,0x05,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clipu t0, t1, 0
# CHECK-INSTR: cv.clipu t0, t1, 0
# CHECK-ENCODING: [0xab,0x32,0x03,0x72]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clipu t0, t1, 16
# CHECK-INSTR: cv.clipu t0, t1, 16
# CHECK-ENCODING: [0xab,0x32,0x03,0x73]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clipu a0, zero, 31
# CHECK-INSTR: cv.clipu a0, zero, 31
# CHECK-ENCODING: [0x2b,0x35,0xf0,0x73]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clip t0, t1, 0
# CHECK-INSTR: cv.clip t0, t1, 0
# CHECK-ENCODING: [0xab,0x32,0x03,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clip t0, t1, 16
# CHECK-INSTR: cv.clip t0, t1, 16
# CHECK-ENCODING: [0xab,0x32,0x03,0x71]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clip a0, zero, 31
# CHECK-INSTR: cv.clip a0, zero, 31
# CHECK-ENCODING: [0x2b,0x35,0xf0,0x71]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.exthz t0, t1
# CHECK-INSTR: cv.exthz t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x62]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.exthz a0, a1
# CHECK-INSTR: cv.exthz a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x62]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.max t0, t1, t2
# CHECK-INSTR: cv.max t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x5a]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.max a0, a1, a2
# CHECK-INSTR: cv.max a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x5a]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clipr t0, t1, t2
# CHECK-INSTR: cv.clipr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clipr a0, a1, a2
# CHECK-INSTR: cv.clipr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subn t0, t1, t2, 0
# CHECK-INSTR: cv.subn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x32,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subn t0, t1, t2, 16
# CHECK-INSTR: cv.subn t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x32,0x73,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subn a0, a1, zero, 31
# CHECK-INSTR: cv.subn a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xb5,0x05,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.extbz t0, t1
# CHECK-INSTR: cv.extbz t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x66]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.extbz a0, a1
# CHECK-INSTR: cv.extbz a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x66]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.abs t0, t1
# CHECK-INSTR: cv.abs t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.abs a0, a1
# CHECK-INSTR: cv.abs a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clipur t0, t1, t2
# CHECK-INSTR: cv.clipur t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x76]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.clipur a0, a1, a2
# CHECK-INSTR: cv.clipur a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x76]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.minu t0, t1, t2
# CHECK-INSTR: cv.minu t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.minu a0, a1, a2
# CHECK-INSTR: cv.minu a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addn t0, t1, t2, 0
# CHECK-INSTR: cv.addn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x22,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addn t0, t1, t2, 16
# CHECK-INSTR: cv.addn t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x22,0x73,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addn a0, a1, zero, 31
# CHECK-INSTR: cv.addn a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xa5,0x05,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subunr t0, t1, t2
# CHECK-INSTR: cv.subunr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x8a]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subunr a0, a1, a2
# CHECK-INSTR: cv.subunr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x8a]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.extbs t0, t1
# CHECK-INSTR: cv.extbs t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.extbs a0, a1
# CHECK-INSTR: cv.extbs a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.sleu t0, t1, t2
# CHECK-INSTR: cv.sleu t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.sletu t0, t1, t2
# CHECK-INSTR: cv.sleu t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x54]
-# CHECK-NO-EXT: unrecognized instruction mnemonic
+# expected-error at -3 {{unrecognized instruction mnemonic}}
cv.sleu a0, a1, a2
# CHECK-INSTR: cv.sleu a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.sletu a0, a1, a2
# CHECK-INSTR: cv.sleu a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x54]
-# CHECK-NO-EXT: unrecognized instruction mnemonic
+# expected-error at -3 {{unrecognized instruction mnemonic}}
cv.min t0, t1, t2
# CHECK-INSTR: cv.min t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.min a0, a1, a2
# CHECK-INSTR: cv.min a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.suburnr t0, t1, t2
# CHECK-INSTR: cv.suburnr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x8e]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.suburnr a0, a1, a2
# CHECK-INSTR: cv.suburnr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x8e]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addrnr t0, t1, t2
# CHECK-INSTR: cv.addrnr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x84]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addrnr a0, a1, a2
# CHECK-INSTR: cv.addrnr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x84]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.exths t0, t1
# CHECK-INSTR: cv.exths t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.exths a0, a1
# CHECK-INSTR: cv.exths a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addrn t0, t1, t2, 0
# CHECK-INSTR: cv.addrn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x22,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addrn t0, t1, t2, 16
# CHECK-INSTR: cv.addrn t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x22,0x73,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addrn a0, a1, zero, 31
# CHECK-INSTR: cv.addrn a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xa5,0x05,0xbe]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.suburn t0, t1, t2, 0
# CHECK-INSTR: cv.suburn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x32,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.suburn t0, t1, t2, 16
# CHECK-INSTR: cv.suburn t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x32,0x73,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.suburn a0, a1, zero, 31
# CHECK-INSTR: cv.suburn a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xb5,0x05,0xfe]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addnr t0, t1, t2
# CHECK-INSTR: cv.addnr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.addnr a0, a1, a2
# CHECK-INSTR: cv.addnr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subun t0, t1, t2, 0
# CHECK-INSTR: cv.subun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x32,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subun t0, t1, t2, 16
# CHECK-INSTR: cv.subun t0, t1, t2, 16
# CHECK-ENCODING: [0xdb,0x32,0x73,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
cv.subun a0, a1, zero, 31
# CHECK-INSTR: cv.subun a0, a1, zero, 31
# CHECK-ENCODING: [0x5b,0xb5,0x05,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCValu' (CORE-V ALU Operations){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCValu' (CORE-V ALU Operations)}}
diff --git a/llvm/test/MC/RISCV/corev/XCVbi-invalid.s b/llvm/test/MC/RISCV/corev/XCVbi-invalid.s
index c35083200b8047..04c05767bddbdc 100644
--- a/llvm/test/MC/RISCV/corev/XCVbi-invalid.s
+++ b/llvm/test/MC/RISCV/corev/XCVbi-invalid.s
@@ -1,58 +1,57 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xcvbi %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xcvbi %s
//===----------------------------------------------------------------------===//
// cv.beqimm
//===----------------------------------------------------------------------===//
cv.beqimm 0, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.beqimm t0, t1, 0
-# CHECK-ERROR: immediate must be an integer in the range [-16, 15]
+# expected-error at -1 {{immediate must be an integer in the range [-16, 15]}}
cv.beqimm t0, 0, t1
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
cv.beqimm t0, 16, 0
-# CHECK-ERROR: immediate must be an integer in the range [-16, 15]
+# expected-error at -1 {{immediate must be an integer in the range [-16, 15]}}
cv.beqimm t0, -17, 0
-# CHECK-ERROR: immediate must be an integer in the range [-16, 15]
+# expected-error at -1 {{immediate must be an integer in the range [-16, 15]}}
cv.beqimm t0, 0, 1
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
cv.beqimm t0, 0, 4096
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
cv.beqimm t0, 0, -4098
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
//===----------------------------------------------------------------------===//
// cv.bneimm
//===----------------------------------------------------------------------===//
cv.bneimm 0, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.bneimm t0, t1, 0
-# CHECK-ERROR: immediate must be an integer in the range [-16, 15]
+# expected-error at -1 {{immediate must be an integer in the range [-16, 15]}}
cv.bneimm t0, 0, t1
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
cv.bneimm t0, 16, 0
-# CHECK-ERROR: immediate must be an integer in the range [-16, 15]
+# expected-error at -1 {{immediate must be an integer in the range [-16, 15]}}
cv.bneimm t0, -17, 0
-# CHECK-ERROR: immediate must be an integer in the range [-16, 15]
+# expected-error at -1 {{immediate must be an integer in the range [-16, 15]}}
cv.bneimm t0, 0, 1
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
cv.bneimm t0, 0, 4096
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
cv.bneimm t0, 0, -4098
-# CHECK-ERROR: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
\ No newline at end of file
+# expected-error at -1 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
\ No newline at end of file
diff --git a/llvm/test/MC/RISCV/corev/XCVbi.s b/llvm/test/MC/RISCV/corev/XCVbi.s
index 0a08a7a71e8b9b..7a707e3d8e4ebb 100644
--- a/llvm/test/MC/RISCV/corev/XCVbi.s
+++ b/llvm/test/MC/RISCV/corev/XCVbi.s
@@ -3,8 +3,7 @@
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xcvbi < %s \
# RUN: | llvm-objdump --mattr=+xcvbi -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-OBJDUMP %s
-# RUN: not llvm-mc -triple riscv32 %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 %s
//===----------------------------------------------------------------------===//
// cv.beqimm
@@ -16,20 +15,20 @@ cv.beqimm t0, 0, 0
# CHECK-INSTR: cv.beqimm t0, 0, 0
# CHECK-OBJDUMP: cv.beqimm t0, 0x0, 0x0 <label1>
# CHECK-ENCODING: [0x0b,0xe0,0x02,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbi' (CORE-V Immediate Branching){{$}}
+# expected-error at -4 {{instruction requires the following: 'XCVbi' (CORE-V Immediate Branching)}}
cv.beqimm a0, 5, 42
# CHECK-INSTR: cv.beqimm a0, 5, 42
# CHECK-OBJDUMP: cv.beqimm a0, 0x5, 0x2e <label2+0x22>
# CHECK-ENCODING: [0x0b,0x65,0x55,0x02]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbi' (CORE-V Immediate Branching){{$}}
+# expected-error at -4 {{instruction requires the following: 'XCVbi' (CORE-V Immediate Branching)}}
cv.beqimm a0, -5, label1
# CHECK-INSTR: cv.beqimm a0, -5, label1
# CHECK-OBJDUMP: cv.beqimm a0, -0x5, 0x0 <label1>
# CHECK-ENCODING: [0x0b'A',0x60'A',0xb5'A',0x01'A']
# CHECK-ENCODING: fixup A - offset: 0, value: label1, kind: fixup_riscv_branch
-# CHECK-NO-EXT: instruction requires the following: 'XCVbi' (CORE-V Immediate Branching){{$}}
+# expected-error at -5 {{instruction requires the following: 'XCVbi' (CORE-V Immediate Branching)}}
//===----------------------------------------------------------------------===//
// cv.bneimm
@@ -41,17 +40,17 @@ cv.bneimm t0, 0, 0
# CHECK-INSTR: cv.bneimm t0, 0, 0
# CHECK-OBJDUMP: cv.bneimm t0, 0x0, 0xc <label2>
# CHECK-ENCODING: [0x0b,0xf0,0x02,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbi' (CORE-V Immediate Branching){{$}}
+# expected-error at -4 {{instruction requires the following: 'XCVbi' (CORE-V Immediate Branching)}}
cv.bneimm a0, 5, 42
# CHECK-INSTR: cv.bneimm a0, 5, 42
# CHECK-OBJDUMP: cv.bneimm a0, 0x5, 0x3a <label2+0x2e>
# CHECK-ENCODING: [0x0b,0x75,0x55,0x02]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbi' (CORE-V Immediate Branching){{$}}
+# expected-error at -4 {{instruction requires the following: 'XCVbi' (CORE-V Immediate Branching)}}
cv.bneimm a0, -5, label2
# CHECK-INSTR: cv.bneimm a0, -5, label2
# CHECK-OBJDUMP: cv.bneimm a0, -0x5, 0xc <label2>
# CHECK-ENCODING: [0x0b'A',0x70'A',0xb5'A',0x01'A']
# CHECK-ENCODING: fixup A - offset: 0, value: label2, kind: fixup_riscv_branch
-# CHECK-NO-EXT: instruction requires the following: 'XCVbi' (CORE-V Immediate Branching){{$}}
+# expected-error at -5 {{instruction requires the following: 'XCVbi' (CORE-V Immediate Branching)}}
diff --git a/llvm/test/MC/RISCV/corev/XCVbitmanip-invalid.s b/llvm/test/MC/RISCV/corev/XCVbitmanip-invalid.s
index 4835fbc2a909fe..9fe6fd498f2834 100644
--- a/llvm/test/MC/RISCV/corev/XCVbitmanip-invalid.s
+++ b/llvm/test/MC/RISCV/corev/XCVbitmanip-invalid.s
@@ -1,279 +1,278 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xcvbitmanip %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xcvbitmanip %s
cv.extract t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extract t0, t1, 0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extract t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extract t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extract t0, t1, 0, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extract t0, t1, 0, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extract t0, t1, 32, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extract t0, t1, -1, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extractu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extractu t0, t1, 0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extractu t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extractu t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extractu t0, t1, 0, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extractu t0, t1, 0, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extractu t0, t1, 32, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.extractu t0, t1, -1, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.insert t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.insert t0, t1, 0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.insert t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.insert t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.insert t0, t1, 0, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.insert t0, t1, 0, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.insert t0, t1, 32, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.insert t0, t1, -1, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.insert a0, a1, 16, 16
-# CHECK-ERROR: :[[@LINE-1]]:19: error: the sum of the immediate operands must be less than 32
+# expected-error at -1:19 {{the sum of the immediate operands must be less than 32}}
cv.insert a0, a1, 31, 31
-# CHECK-ERROR: :[[@LINE-1]]:19: error: the sum of the immediate operands must be less than 32
+# expected-error at -1:19 {{the sum of the immediate operands must be less than 32}}
cv.insert a0, a1, 1, 31
-# CHECK-ERROR: :[[@LINE-1]]:19: error: the sum of the immediate operands must be less than 32
+# expected-error at -1:19 {{the sum of the immediate operands must be less than 32}}
cv.insert a0, a1, 31, 1
-# CHECK-ERROR: :[[@LINE-1]]:19: error: the sum of the immediate operands must be less than 32
+# expected-error at -1:19 {{the sum of the immediate operands must be less than 32}}
cv.bclr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bclr t0, t1, 0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bclr t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bclr t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bclr t0, t1, 0, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bclr t0, t1, 0, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bclr t0, t1, 32, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bclr t0, t1, -1, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bset t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bset t0, t1, 0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bset t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bset t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bset t0, t1, 0, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bset t0, t1, 0, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bset t0, t1, 32, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bset t0, t1, -1, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bitrev t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bitrev t0, t1, 0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bitrev t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.bitrev t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.bitrev t0, t1, 0, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bitrev t0, t1, 0, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.bitrev t0, t1, 32, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.bitrev t0, t1, -1, 0
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extractr t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extractr t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extractur t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.extractur t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractur t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractur t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.insertr t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.insertr t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.insertr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.insertr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bclrr t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bclrr t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.bclrr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.bclrr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bsetr t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.bsetr t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.bsetr t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.bsetr t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.ror t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.ror t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.ror t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.ror t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.ff1 t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.ff1 t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.ff1 t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.ff1 t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.fl1 t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.fl1 t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.fl1 t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.fl1 t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.clb t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.clb t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.clb t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.clb t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cnt t0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.cnt t0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cnt t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cnt t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/corev/XCVbitmanip.s b/llvm/test/MC/RISCV/corev/XCVbitmanip.s
index bd6e217d0afd38..e90e1ce7147a95 100644
--- a/llvm/test/MC/RISCV/corev/XCVbitmanip.s
+++ b/llvm/test/MC/RISCV/corev/XCVbitmanip.s
@@ -3,246 +3,245 @@
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xcvbitmanip < %s \
# RUN: | llvm-objdump --mattr=+xcvbitmanip --no-print-imm-hex -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-INSTR %s
-# RUN: not llvm-mc -triple riscv32 %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 %s
cv.extract t0, t1, 0, 1
# CHECK-INSTR: cv.extract t0, t1, 0, 1
# CHECK-ENCODING: [0xdb,0x02,0x13,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extract a0, a1, 17, 18
# CHECK-INSTR: cv.extract a0, a1, 17, 18
# CHECK-ENCODING: [0x5b,0x85,0x25,0x23]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extract s0, s1, 30, 31
# CHECK-INSTR: cv.extract s0, s1, 30, 31
# CHECK-ENCODING: [0x5b,0x84,0xf4,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractu t0, t1, 0, 1
# CHECK-INSTR: cv.extractu t0, t1, 0, 1
# CHECK-ENCODING: [0xdb,0x02,0x13,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractu a0, a1, 17, 18
# CHECK-INSTR: cv.extractu a0, a1, 17, 18
# CHECK-ENCODING: [0x5b,0x85,0x25,0x63]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractu s0, s1, 30, 31
# CHECK-INSTR: cv.extractu s0, s1, 30, 31
# CHECK-ENCODING: [0x5b,0x84,0xf4,0x7d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.insert t0, t1, 0, 1
# CHECK-INSTR: cv.insert t0, t1, 0, 1
# CHECK-ENCODING: [0xdb,0x02,0x13,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.insert a0, a1, 31, 0
# CHECK-INSTR: cv.insert a0, a1, 31, 0
# CHECK-ENCODING: [0x5b,0x85,0x05,0xbe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.insert s0, s1, 0, 31
# CHECK-INSTR: cv.insert s0, s1, 0, 31
# CHECK-ENCODING: [0x5b,0x84,0xf4,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bclr t0, t1, 0, 1
# CHECK-INSTR: cv.bclr t0, t1, 0, 1
# CHECK-ENCODING: [0xdb,0x12,0x13,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bclr a0, a1, 17, 18
# CHECK-INSTR: cv.bclr a0, a1, 17, 18
# CHECK-ENCODING: [0x5b,0x95,0x25,0x23]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bclr s0, s1, 30, 31
# CHECK-INSTR: cv.bclr s0, s1, 30, 31
# CHECK-ENCODING: [0x5b,0x94,0xf4,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bset t0, t1, 0, 1
# CHECK-INSTR: cv.bset t0, t1, 0, 1
# CHECK-ENCODING: [0xdb,0x12,0x13,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bset a0, a1, 17, 18
# CHECK-INSTR: cv.bset a0, a1, 17, 18
# CHECK-ENCODING: [0x5b,0x95,0x25,0x63]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bset s0, s1, 30, 31
# CHECK-INSTR: cv.bset s0, s1, 30, 31
# CHECK-ENCODING: [0x5b,0x94,0xf4,0x7d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bitrev t0, t1, 0, 1
# CHECK-INSTR: cv.bitrev t0, t1, 0, 1
# CHECK-ENCODING: [0xdb,0x12,0x13,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bitrev a0, a1, 1, 18
# CHECK-INSTR: cv.bitrev a0, a1, 1, 18
# CHECK-ENCODING: [0x5b,0x95,0x25,0xc3]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bitrev s0, s1, 2, 31
# CHECK-INSTR: cv.bitrev s0, s1, 2, 31
# CHECK-ENCODING: [0x5b,0x94,0xf4,0xc5]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractr t0, t1, t2
# CHECK-INSTR: cv.extractr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractr a0, a1, a2
# CHECK-INSTR: cv.extractr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractr s0, s1, s2
# CHECK-INSTR: cv.extractr s0, s1, s2
# CHECK-ENCODING: [0x2b,0xb4,0x24,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractur t0, t1, t2
# CHECK-INSTR: cv.extractur t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x32]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractur a0, a1, a2
# CHECK-INSTR: cv.extractur a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x32]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.extractur s0, s1, s2
# CHECK-INSTR: cv.extractur s0, s1, s2
# CHECK-ENCODING: [0x2b,0xb4,0x24,0x33]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.insertr t0, t1, t2
# CHECK-INSTR: cv.insertr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.insertr a0, a1, a2
# CHECK-INSTR: cv.insertr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.insertr s0, s1, s2
# CHECK-INSTR: cv.insertr s0, s1, s2
# CHECK-ENCODING: [0x2b,0xb4,0x24,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bclrr t0, t1, t2
# CHECK-INSTR: cv.bclrr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bclrr a0, a1, a2
# CHECK-INSTR: cv.bclrr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bclrr s0, s1, s2
# CHECK-INSTR: cv.bclrr s0, s1, s2
# CHECK-ENCODING: [0x2b,0xb4,0x24,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bsetr t0, t1, t2
# CHECK-INSTR: cv.bsetr t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x3a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bsetr a0, a1, a2
# CHECK-INSTR: cv.bsetr a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x3a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.bsetr s0, s1, s2
# CHECK-INSTR: cv.bsetr s0, s1, s2
# CHECK-ENCODING: [0x2b,0xb4,0x24,0x3b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.ror t0, t1, t2
# CHECK-INSTR: cv.ror t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.ror a0, a1, a2
# CHECK-INSTR: cv.ror a0, a1, a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.ror s0, s1, s2
# CHECK-INSTR: cv.ror s0, s1, s2
# CHECK-ENCODING: [0x2b,0xb4,0x24,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.ff1 t0, t1
# CHECK-INSTR: cv.ff1 t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x42]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.ff1 a0, a1
# CHECK-INSTR: cv.ff1 a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x42]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.ff1 s0, s1
# CHECK-INSTR: cv.ff1 s0, s1
# CHECK-ENCODING: [0x2b,0xb4,0x04,0x42]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.fl1 t0, t1
# CHECK-INSTR: cv.fl1 t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.fl1 a0, a1
# CHECK-INSTR: cv.fl1 a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.fl1 s0, s1
# CHECK-INSTR: cv.fl1 s0, s1
# CHECK-ENCODING: [0x2b,0xb4,0x04,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.clb t0, t1
# CHECK-INSTR: cv.clb t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x46]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.clb a0, a1
# CHECK-INSTR: cv.clb a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x46]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.clb s0, s1
# CHECK-INSTR: cv.clb s0, s1
# CHECK-ENCODING: [0x2b,0xb4,0x04,0x46]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.cnt t0, t1
# CHECK-INSTR: cv.cnt t0, t1
# CHECK-ENCODING: [0xab,0x32,0x03,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.cnt a0, a1
# CHECK-INSTR: cv.cnt a0, a1
# CHECK-ENCODING: [0x2b,0xb5,0x05,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
cv.cnt s0, s1
# CHECK-INSTR: cv.cnt s0, s1
# CHECK-ENCODING: [0x2b,0xb4,0x04,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVbitmanip' (CORE-V Bit Manipulation)}}
diff --git a/llvm/test/MC/RISCV/corev/XCVelw-invalid.s b/llvm/test/MC/RISCV/corev/XCVelw-invalid.s
index 8dabbcd9398c94..0b174fa6d66a3e 100644
--- a/llvm/test/MC/RISCV/corev/XCVelw-invalid.s
+++ b/llvm/test/MC/RISCV/corev/XCVelw-invalid.s
@@ -1,29 +1,28 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xcvelw %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xcvelw %s
cv.elw t0, 0(0)
-# CHECK-ERROR: expected register
+# expected-error at -1 {{expected register}}
cv.elw 0, 0(x6)
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.elw x12, 2048(x6)
-# CHECK-ERROR: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+# expected-error at -1 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
cv.elw x12, x1(2047)
-# CHECK-ERROR: unexpected token
+# expected-error at -1 {{unexpected token}}
cv.elw 0, x12(x6)
-# CHECK-ERROR: unexpected token
+# expected-error at -1 {{unexpected token}}
cv.elw x12, x12(x6)
-# CHECK-ERROR: unexpected token
+# expected-error at -1 {{unexpected token}}
cv.elw 0, 0(x6)
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.elw x0
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.elw x0, a_symbol
-# CHECK-ERROR: register must be a GPR excluding zero (x0)
+# expected-error at -1 {{register must be a GPR excluding zero (x0)}}
diff --git a/llvm/test/MC/RISCV/corev/XCVelw-valid.s b/llvm/test/MC/RISCV/corev/XCVelw-valid.s
index 5f525fe566b8f0..7e479a36bf2137 100644
--- a/llvm/test/MC/RISCV/corev/XCVelw-valid.s
+++ b/llvm/test/MC/RISCV/corev/XCVelw-valid.s
@@ -3,20 +3,19 @@
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xcvelw < %s \
# RUN: | llvm-objdump --mattr=+xcvelw --no-print-imm-hex -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-INSTR %s
-# RUN: not llvm-mc -triple riscv32 %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 %s
cv.elw a0, 1024(a0)
# CHECK-INSTR: cv.elw a0, 1024(a0)
# CHECK-ENCODING: [0x0b,0x35,0x05,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVelw' (CORE-V Event Load Word){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVelw' (CORE-V Event Load Word)}}
cv.elw a1, 1(a1)
# CHECK-INSTR: cv.elw a1, 1(a1)
# CHECK-ENCODING: [0x8b,0xb5,0x15,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVelw' (CORE-V Event Load Word){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVelw' (CORE-V Event Load Word)}}
cv.elw a2, -1024(a3)
# CHECK-INSTR: cv.elw a2, -1024(a3)
# CHECK-ENCODING: [0x0b,0xb6,0x06,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVelw' (CORE-V Event Load Word){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVelw' (CORE-V Event Load Word)}}
diff --git a/llvm/test/MC/RISCV/corev/XCVmac-invalid.s b/llvm/test/MC/RISCV/corev/XCVmac-invalid.s
index ab20a7fda0ba60..db0a81de1c7b3d 100644
--- a/llvm/test/MC/RISCV/corev/XCVmac-invalid.s
+++ b/llvm/test/MC/RISCV/corev/XCVmac-invalid.s
@@ -1,476 +1,475 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xcvmac %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xcvmac %s
cv.mac t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mac t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mac 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mac t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mac t0, t1, t2, t4
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.machhsn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhsn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhsn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhsn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhsn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhsn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhsn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.machhsn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.machhsrn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhsrn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhsrn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhsrn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhsrn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhsrn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhsrn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.machhsrn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.machhun t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhun t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhun t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhun t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhun t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhun 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhun t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.machhun t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.machhurn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhurn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhurn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.machhurn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhurn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhurn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.machhurn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.machhurn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.macsn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macsn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macsn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macsn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macsn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macsn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macsn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.macsn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.macsrn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macsrn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macsrn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macsrn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macsrn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macsrn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macsrn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.macsrn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.macun t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macun t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macun t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macun t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macun t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macun 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macun t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.macun t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.macurn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macurn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macurn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.macurn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macurn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macurn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.macurn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.macurn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.msu t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.msu t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.msu 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.msu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.msu t0, t1, t2, t4
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulhhs t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhs t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhs 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhs t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulhhs t0, t1, t2, t4
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulhhsn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhsn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhsn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhsn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhsn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhsn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhsn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulhhsn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulhhsrn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhsrn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhsrn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhsrn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhsrn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhsrn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhsrn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulhhsrn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulhhu t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhu t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhu 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulhhu t0, t1, t2, t4
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulhhun t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhun t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhun t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhun t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhun t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhun 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhun t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulhhun t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulhhurn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhurn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhurn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulhhurn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhurn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhurn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulhhurn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulhhurn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.muls t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.muls t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.muls 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.muls t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.muls t0, t1, t2, t4
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulsn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulsn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulsn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulsn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulsn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulsn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulsn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulsn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulsrn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulsrn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulsrn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulsrn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulsrn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulsrn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulsrn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulsrn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulu t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulu t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulu 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulu t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulu t0, t1, t2, t4
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulun t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulun t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulun t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulun t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulun t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulun 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulun t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulun t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.mulurn t0, t1, t2, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulurn t0, t1, t2, 32
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulurn t0, t1, t2, a0
-# CHECK-ERROR: immediate must be an integer in the range [0, 31]
+# expected-error at -1 {{immediate must be an integer in the range [0, 31]}}
cv.mulurn t0, t1, 0, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulurn t0, 0, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulurn 0, t1, t2, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.mulurn t0, t1, t2
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
cv.mulurn t0, t1, t2, 0, a0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/corev/XCVmac-valid.s b/llvm/test/MC/RISCV/corev/XCVmac-valid.s
index a795bc37e53ce5..0f4451b1d70238 100644
--- a/llvm/test/MC/RISCV/corev/XCVmac-valid.s
+++ b/llvm/test/MC/RISCV/corev/XCVmac-valid.s
@@ -3,306 +3,305 @@
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xcvmac < %s \
# RUN: | llvm-objdump --mattr=+xcvmac --no-print-imm-hex -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-INSTR %s
-# RUN: not llvm-mc -triple riscv32 %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 %s
cv.mac t0, t1, t2
# CHECK-INSTR: cv.mac t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mac t0, t1, zero
# CHECK-INSTR: cv.mac t0, t1, zero
# CHECK-ENCODING: [0xab,0x32,0x03,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhsn t0, t1, t2, 0
# CHECK-INSTR: cv.machhsn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x62,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhsn t0, t1, zero, 16
# CHECK-INSTR: cv.machhsn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x62,0x03,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhsn t0, t1, zero, 31
# CHECK-INSTR: cv.machhsn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x62,0x03,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhsrn t0, t1, t2, 0
# CHECK-INSTR: cv.machhsrn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x62,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhsrn t0, t1, zero, 16
# CHECK-INSTR: cv.machhsrn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x62,0x03,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhsrn t0, t1, zero, 31
# CHECK-INSTR: cv.machhsrn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x62,0x03,0xfe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhun t0, t1, t2, 0
# CHECK-INSTR: cv.machhun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x72,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhun t0, t1, zero, 16
# CHECK-INSTR: cv.machhun t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x72,0x03,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhun t0, t1, zero, 31
# CHECK-INSTR: cv.machhun t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x72,0x03,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhurn t0, t1, t2, 0
# CHECK-INSTR: cv.machhurn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x72,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhurn t0, t1, zero, 16
# CHECK-INSTR: cv.machhurn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x72,0x03,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.machhurn t0, t1, zero, 31
# CHECK-INSTR: cv.machhurn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x72,0x03,0xfe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macsn t0, t1, t2, 0
# CHECK-INSTR: cv.macsn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x62,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macsn t0, t1, zero, 16
# CHECK-INSTR: cv.macsn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x62,0x03,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macsn t0, t1, zero, 31
# CHECK-INSTR: cv.macsn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x62,0x03,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macsrn t0, t1, t2, 0
# CHECK-INSTR: cv.macsrn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x62,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macsrn t0, t1, zero, 16
# CHECK-INSTR: cv.macsrn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x62,0x03,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macsrn t0, t1, zero, 31
# CHECK-INSTR: cv.macsrn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x62,0x03,0xbe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macun t0, t1, t2, 0
# CHECK-INSTR: cv.macun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x72,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macun t0, t1, zero, 16
# CHECK-INSTR: cv.macun t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x72,0x03,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macun t0, t1, zero, 31
# CHECK-INSTR: cv.macun t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x72,0x03,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macurn t0, t1, t2, 0
# CHECK-INSTR: cv.macurn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x72,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macurn t0, t1, zero, 16
# CHECK-INSTR: cv.macurn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x72,0x03,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.macurn t0, t1, zero, 31
# CHECK-INSTR: cv.macurn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x72,0x03,0xbe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.msu t0, t1, t2
# CHECK-INSTR: cv.msu t0, t1, t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x92]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.msu t0, t1, zero
# CHECK-INSTR: cv.msu t0, t1, zero
# CHECK-ENCODING: [0xab,0x32,0x03,0x92]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhs t0, t1, t2
# CHECK-INSTR: cv.mulhhsn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x42,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhs t0, t1, zero
# CHECK-INSTR: cv.mulhhsn t0, t1, zero, 0
# CHECK-ENCODING: [0xdb,0x42,0x03,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhsn t0, t1, t2, 0
# CHECK-INSTR: cv.mulhhsn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x42,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhsn t0, t1, zero, 16
# CHECK-INSTR: cv.mulhhsn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x42,0x03,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhsn t0, t1, zero, 31
# CHECK-INSTR: cv.mulhhsn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x42,0x03,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhsrn t0, t1, t2, 0
# CHECK-INSTR: cv.mulhhsrn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x42,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhsrn t0, t1, zero, 16
# CHECK-INSTR: cv.mulhhsrn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x42,0x03,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhsrn t0, t1, zero, 31
# CHECK-INSTR: cv.mulhhsrn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x42,0x03,0xfe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhu t0, t1, t2
# CHECK-INSTR: cv.mulhhun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x52,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhu t0, t1, zero
# CHECK-INSTR: cv.mulhhun t0, t1, zero, 0
# CHECK-ENCODING: [0xdb,0x52,0x03,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhun t0, t1, t2, 0
# CHECK-INSTR: cv.mulhhun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x52,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhun t0, t1, zero, 16
# CHECK-INSTR: cv.mulhhun t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x52,0x03,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhun t0, t1, zero, 31
# CHECK-INSTR: cv.mulhhun t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x52,0x03,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhurn t0, t1, t2, 0
# CHECK-INSTR: cv.mulhhurn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x52,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhurn t0, t1, zero, 16
# CHECK-INSTR: cv.mulhhurn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x52,0x03,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulhhurn t0, t1, zero, 31
# CHECK-INSTR: cv.mulhhurn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x52,0x03,0xfe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.muls t0, t1, t2
# CHECK-INSTR: cv.mulsn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x42,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.muls t0, t1, zero
# CHECK-INSTR: cv.mulsn t0, t1, zero, 0
# CHECK-ENCODING: [0xdb,0x42,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulsn t0, t1, t2, 0
# CHECK-INSTR: cv.mulsn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x42,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulsn t0, t1, zero, 16
# CHECK-INSTR: cv.mulsn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x42,0x03,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulsn t0, t1, zero, 31
# CHECK-INSTR: cv.mulsn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x42,0x03,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulsrn t0, t1, t2, 0
# CHECK-INSTR: cv.mulsrn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x42,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulsrn t0, t1, zero, 16
# CHECK-INSTR: cv.mulsrn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x42,0x03,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulsrn t0, t1, zero, 31
# CHECK-INSTR: cv.mulsrn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x42,0x03,0xbe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulu t0, t1, t2
# CHECK-INSTR: cv.mulun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x52,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulu t0, t1, zero
# CHECK-INSTR: cv.mulun t0, t1, zero, 0
# CHECK-ENCODING: [0xdb,0x52,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulun t0, t1, t2, 0
# CHECK-INSTR: cv.mulun t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x52,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulun t0, t1, zero, 16
# CHECK-INSTR: cv.mulun t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x52,0x03,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulun t0, t1, zero, 31
# CHECK-INSTR: cv.mulun t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x52,0x03,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulurn t0, t1, t2, 0
# CHECK-INSTR: cv.mulurn t0, t1, t2, 0
# CHECK-ENCODING: [0xdb,0x52,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulurn t0, t1, zero, 16
# CHECK-INSTR: cv.mulurn t0, t1, zero, 16
# CHECK-ENCODING: [0xdb,0x52,0x03,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
cv.mulurn t0, t1, zero, 31
# CHECK-INSTR: cv.mulurn t0, t1, zero, 31
# CHECK-ENCODING: [0xdb,0x52,0x03,0xbe]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmac' (CORE-V Multiply-Accumulate)}}
diff --git a/llvm/test/MC/RISCV/corev/XCVmem-invalid.s b/llvm/test/MC/RISCV/corev/XCVmem-invalid.s
index 0941d97a3c4fbd..b4a59306b2a8a8 100644
--- a/llvm/test/MC/RISCV/corev/XCVmem-invalid.s
+++ b/llvm/test/MC/RISCV/corev/XCVmem-invalid.s
@@ -1,294 +1,293 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xcvmem %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xcvmem %s
cv.lb t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.lb 0, (t1), 0
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lb 0, (0), t2
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lb t0, (t1), -2049
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lb t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lb t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.lb 0, (t1), t1
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lb t0
-# CHECK-ERROR: :[[@LINE-1]]:9: error: too few operands for instruction
+# expected-error at -1:9 {{too few operands for instruction}}
cv.lb t0, (t2)
-# CHECK-ERROR: :[[@LINE-1]]:15: error: too few operands for instruction
+# expected-error at -1:15 {{too few operands for instruction}}
cv.lb t0, (t1), t2, t3
-# CHECK-ERROR: :[[@LINE-1]]:21: error: unexpected extra operand for instruction
+# expected-error at -1:21 {{unexpected extra operand for instruction}}
cv.lbu t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:12: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:12: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:12 {{invalid operand for instruction}}
+# expected-note at -3:12 {{expected '('}}
cv.lbu 0, (t1), 0
-# CHECK-ERROR: :[[@LINE-1]]:8: error: register must be a GPR
+# expected-error at -1:8 {{register must be a GPR}}
cv.lbu 0, (0), t0
-# CHECK-ERROR: :[[@LINE-1]]:8: error: register must be a GPR
+# expected-error at -1:8 {{register must be a GPR}}
cv.lbu t0, (t1), -2049
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:18: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:18: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:18 {{register must be a GPR}}
+# expected-note at -3:18 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lbu t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:18: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:18: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:18 {{register must be a GPR}}
+# expected-note at -3:18 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lbu t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:12: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:12: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:12 {{invalid operand for instruction}}
+# expected-note at -3:12 {{expected '('}}
cv.lbu 0, (t1), t1
-# CHECK-ERROR: :[[@LINE-1]]:8: error: register must be a GPR
+# expected-error at -1:8 {{register must be a GPR}}
cv.lbu t0
-# CHECK-ERROR: :[[@LINE-1]]:10: error: too few operands for instruction
+# expected-error at -1:10 {{too few operands for instruction}}
cv.lbu t0, (t2)
-# CHECK-ERROR: :[[@LINE-1]]:16: error: too few operands for instruction
+# expected-error at -1:16 {{too few operands for instruction}}
cv.lbu t0, (t1), t2, t3
-# CHECK-ERROR: :[[@LINE-1]]:22: error: unexpected extra operand for instruction
+# expected-error at -1:22 {{unexpected extra operand for instruction}}
cv.lh t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.lh 0, (t1), 0
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lh 0, (0), t2
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lh t0, (t1), -2049
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lh t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lh t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.lh t0, t1(0)
-# CHECK-ERROR: :[[@LINE-1]]:14: error: expected GPR register
+# expected-error at -1:14 {{expected GPR register}}
cv.lh 0, (t1), t1
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lh t0
-# CHECK-ERROR: :[[@LINE-1]]:9: error: too few operands for instruction
+# expected-error at -1:9 {{too few operands for instruction}}
cv.lh t0, (t1)
-# CHECK-ERROR: :[[@LINE-1]]:15: error: too few operands for instruction
+# expected-error at -1:15 {{too few operands for instruction}}
cv.lh t0, (t1), t2, t3
-# CHECK-ERROR: :[[@LINE-1]]:21: error: unexpected extra operand for instruction
+# expected-error at -1:21 {{unexpected extra operand for instruction}}
cv.lhu t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:12: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:12: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:12 {{invalid operand for instruction}}
+# expected-note at -3:12 {{expected '('}}
cv.lhu 0, (t1), 0
-# CHECK-ERROR: :[[@LINE-1]]:8: error: register must be a GPR
+# expected-error at -1:8 {{register must be a GPR}}
cv.lhu 0, 0(t1)
-# CHECK-ERROR: :[[@LINE-1]]:8: error: register must be a GPR
+# expected-error at -1:8 {{register must be a GPR}}
cv.lhu t0, (t1), -2049
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:18: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:18: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:18 {{register must be a GPR}}
+# expected-note at -3:18 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lhu t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:18: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:18: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:18 {{register must be a GPR}}
+# expected-note at -3:18 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lhu t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:12: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:12: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:12 {{invalid operand for instruction}}
+# expected-note at -3:12 {{expected '('}}
cv.lhu t0, t1(0)
-# CHECK-ERROR: :[[@LINE-1]]:15: error: expected GPR register
+# expected-error at -1:15 {{expected GPR register}}
cv.lhu 0, t0, t1
-# CHECK-ERROR: :[[@LINE-1]]:13: error: expected '(' or invalid operand
+# expected-error at -1:13 {{expected '(' or invalid operand}}
cv.lhu t0
-# CHECK-ERROR: :[[@LINE-1]]:10: error: too few operands for instruction
+# expected-error at -1:10 {{too few operands for instruction}}
cv.lhu t0, (t1)
-# CHECK-ERROR: :[[@LINE-1]]:16: error: too few operands for instruction
+# expected-error at -1:16 {{too few operands for instruction}}
cv.lhu t0, (t1), t2, t3
-# CHECK-ERROR: :[[@LINE-1]]:22: error: unexpected extra operand for instruction
+# expected-error at -1:22 {{unexpected extra operand for instruction}}
cv.lw t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.lw 0, (t1), 0
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lw 0, (0), t2
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lw t0, (t1), -2049
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lw t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.lw t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.lw t0, t1(0)
-# CHECK-ERROR: :[[@LINE-1]]:14: error: expected GPR register
+# expected-error at -1:14 {{expected GPR register}}
cv.lw 0, (t0), t1
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.lw t0
-# CHECK-ERROR: :[[@LINE-1]]:9: error: too few operands for instruction
+# expected-error at -1:9 {{too few operands for instruction}}
cv.lw t0, (t1)
-# CHECK-ERROR: :[[@LINE-1]]:15: error: too few operands for instruction
+# expected-error at -1:15 {{too few operands for instruction}}
cv.lw t0, (t1), t2, t3
-# CHECK-ERROR: :[[@LINE-1]]:21: error: unexpected extra operand for instruction
+# expected-error at -1:21 {{unexpected extra operand for instruction}}
cv.sb t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sb 0, (t0), 0
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.sb t0, 0(t1)
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sb t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.sb t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sb 0, (t1), t1
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.sb t0
-# CHECK-ERROR: :[[@LINE-1]]:9: error: too few operands for instruction
+# expected-error at -1:9 {{too few operands for instruction}}
cv.sh t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sh 0, (t1), 0
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.sh t0, 0(t1)
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sh t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.sh t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sh 0, (t1), t1
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.sh t0
-# CHECK-ERROR: :[[@LINE-1]]:9: error: too few operands for instruction
+# expected-error at -1:9 {{too few operands for instruction}}
cv.sw t0, (0), 0
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sw 0, (t1), 0
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.sw t0, 0(t1)
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sw t0, (t1), 2048
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:17: note: register must be a GPR
-# CHECK-ERROR: :[[@LINE-3]]:17: note: immediate must be an integer in the range [-2048, 2047]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:17 {{register must be a GPR}}
+# expected-note at -3:17 {{immediate must be an integer in the range [-2048, 2047]}}
cv.sw t0, (0), t1
-# CHECK-ERROR: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ERROR: :[[@LINE-2]]:11: note: invalid operand for instruction
-# CHECK-ERROR: :[[@LINE-3]]:11: note: expected '('
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{invalid operand for instruction}}
+# expected-note at -3:11 {{expected '('}}
cv.sw 0, (t1), t1
-# CHECK-ERROR: :[[@LINE-1]]:7: error: register must be a GPR
+# expected-error at -1:7 {{register must be a GPR}}
cv.sw t0
-# CHECK-ERROR: :[[@LINE-1]]:9: error: too few operands for instruction
+# expected-error at -1:9 {{too few operands for instruction}}
cv.lb t0, f0(t1)
-# CHECK-ERROR: :[[@LINE-1]]:11: error: expected GPR register
+# expected-error at -1:11 {{expected GPR register}}
cv.sb t0, t0(f1)
-# CHECK-ERROR: :[[@LINE-1]]:14: error: expected GPR register
+# expected-error at -1:14 {{expected GPR register}}
diff --git a/llvm/test/MC/RISCV/corev/XCVmem-valid.s b/llvm/test/MC/RISCV/corev/XCVmem-valid.s
index b499e2d1be75fd..0af9cea38b7d3e 100644
--- a/llvm/test/MC/RISCV/corev/XCVmem-valid.s
+++ b/llvm/test/MC/RISCV/corev/XCVmem-valid.s
@@ -3,245 +3,244 @@
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xcvmem < %s \
# RUN: | llvm-objdump --no-print-imm-hex --mattr=+xcvmem -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-INSTR %s
-# RUN: not llvm-mc -triple riscv32 %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 %s
cv.lb t0, (t1), 0
# CHECK-INSTR: cv.lb t0, (t1), 0
# CHECK-ENCODING: [0x8b,0x02,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lb a0, (a1), 2047
# CHECK-INSTR: cv.lb a0, (a1), 2047
# CHECK-ENCODING: [0x0b,0x85,0xf5,0x7f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lb t0, (t1), t2
# CHECK-INSTR: cv.lb t0, (t1), t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lb a0, (a1), a2
# CHECK-INSTR: cv.lb a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lb t0, t2(t1)
# CHECK-INSTR: cv.lb t0, t2(t1)
# CHECK-ENCODING: [0xab,0x32,0x73,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lb a0, a2(a1)
# CHECK-INSTR: cv.lb a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lbu t0, (t1), 0
# CHECK-INSTR: cv.lbu t0, (t1), 0
# CHECK-ENCODING: [0x8b,0x42,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lbu a0, (a1), 2047
# CHECK-INSTR: cv.lbu a0, (a1), 2047
# CHECK-ENCODING: [0x0b,0xc5,0xf5,0x7f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lbu t0, (t1), t2
# CHECK-INSTR: cv.lbu t0, (t1), t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lbu a0, (a1), a2
# CHECK-INSTR: cv.lbu a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lbu t0, t2(t1)
# CHECK-INSTR: cv.lbu t0, t2(t1)
# CHECK-ENCODING: [0xab,0x32,0x73,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lbu a0, a2(a1)
# CHECK-INSTR: cv.lbu a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lh t0, (t1), 0
# CHECK-INSTR: cv.lh t0, (t1), 0
# CHECK-ENCODING: [0x8b,0x12,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lh a0, (a1), 2047
# CHECK-INSTR: cv.lh a0, (a1), 2047
# CHECK-ENCODING: [0x0b,0x95,0xf5,0x7f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lh t0, (t1), t2
# CHECK-INSTR: cv.lh t0, (t1), t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x02]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lh a0, (a1), a2
# CHECK-INSTR: cv.lh a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x02]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lh t0, t2(t1)
# CHECK-INSTR: cv.lh t0, t2(t1)
# CHECK-ENCODING: [0xab,0x32,0x73,0x0a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lh a0, a2(a1)
# CHECK-INSTR: cv.lh a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x0a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lhu t0, (t1), 0
# CHECK-INSTR: cv.lhu t0, (t1), 0
# CHECK-ENCODING: [0x8b,0x52,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lhu a0, (a1), 2047
# CHECK-INSTR: cv.lhu a0, (a1), 2047
# CHECK-ENCODING: [0x0b,0xd5,0xf5,0x7f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lhu t0, (t1), t2
# CHECK-INSTR: cv.lhu t0, (t1), t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x12]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lhu a0, (a1), a2
# CHECK-INSTR: cv.lhu a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x12]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lhu t0, t2(t1)
# CHECK-INSTR: cv.lhu t0, t2(t1)
# CHECK-ENCODING: [0xab,0x32,0x73,0x1a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lhu a0, a2(a1)
# CHECK-INSTR: cv.lhu a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x1a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lw t0, (t1), 0
# CHECK-INSTR: cv.lw t0, (t1), 0
# CHECK-ENCODING: [0x8b,0x22,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lw a0, (a1), 2047
# CHECK-INSTR: cv.lw a0, (a1), 2047
# CHECK-ENCODING: [0x0b,0xa5,0xf5,0x7f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lw t0, (t1), t2
# CHECK-INSTR: cv.lw t0, (t1), t2
# CHECK-ENCODING: [0xab,0x32,0x73,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lw a0, (a1), a2
# CHECK-INSTR: cv.lw a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lw t0, t2(t1)
# CHECK-INSTR: cv.lw t0, t2(t1)
# CHECK-ENCODING: [0xab,0x32,0x73,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.lw a0, a2(a1)
# CHECK-INSTR: cv.lw a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb5,0xc5,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sb t0, (t1), 0
# CHECK-INSTR: cv.sb t0, (t1), 0
# CHECK-ENCODING: [0x2b,0x00,0x53,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sb a0, (a1), 2047
# CHECK-INSTR: cv.sb a0, (a1), 2047
# CHECK-ENCODING: [0xab,0x8f,0xa5,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sb t0, (t1), t2
# CHECK-INSTR: cv.sb t0, (t1), t2
# CHECK-ENCODING: [0xab,0x33,0x53,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sb a0, (a1), a2
# CHECK-INSTR: cv.sb a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb6,0xa5,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sb t0, t2(t1)
# CHECK-INSTR: cv.sb t0, t2(t1)
# CHECK-ENCODING: [0xab,0x33,0x53,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sb a0, a2(a1)
# CHECK-INSTR: cv.sb a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb6,0xa5,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sh t0, (t1), 0
# CHECK-INSTR: cv.sh t0, (t1), 0
# CHECK-ENCODING: [0x2b,0x10,0x53,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sh a0, (a1), 2047
# CHECK-INSTR: cv.sh a0, (a1), 2047
# CHECK-ENCODING: [0xab,0x9f,0xa5,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sh t0, (t1), t2
# CHECK-INSTR: cv.sh t0, (t1), t2
# CHECK-ENCODING: [0xab,0x33,0x53,0x22]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sh a0, (a1), a2
# CHECK-INSTR: cv.sh a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb6,0xa5,0x22]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sh t0, t2(t1)
# CHECK-INSTR: cv.sh t0, t2(t1)
# CHECK-ENCODING: [0xab,0x33,0x53,0x2a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sh a0, a2(a1)
# CHECK-INSTR: cv.sh a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb6,0xa5,0x2a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sw t0, (t1), 0
# CHECK-INSTR: cv.sw t0, (t1), 0
# CHECK-ENCODING: [0x2b,0x20,0x53,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sw a0, (a1), 2047
# CHECK-INSTR: cv.sw a0, (a1), 2047
# CHECK-ENCODING: [0xab,0xaf,0xa5,0x7e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sw t0, (t1), t2
# CHECK-INSTR: cv.sw t0, (t1), t2
# CHECK-ENCODING: [0xab,0x33,0x53,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sw a0, (a1), a2
# CHECK-INSTR: cv.sw a0, (a1), a2
# CHECK-ENCODING: [0x2b,0xb6,0xa5,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sw t0, t2(t1)
# CHECK-INSTR: cv.sw t0, t2(t1)
# CHECK-ENCODING: [0xab,0x33,0x53,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
cv.sw a0, a2(a1)
# CHECK-INSTR: cv.sw a0, a2(a1)
# CHECK-ENCODING: [0x2b,0xb6,0xa5,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVmem' (CORE-V Post-incrementing Load & Store)}}
diff --git a/llvm/test/MC/RISCV/corev/XCVsimd-invalid.s b/llvm/test/MC/RISCV/corev/XCVsimd-invalid.s
index bebf7e97c82360..98b68fe5085e4c 100644
--- a/llvm/test/MC/RISCV/corev/XCVsimd-invalid.s
+++ b/llvm/test/MC/RISCV/corev/XCVsimd-invalid.s
@@ -1,4947 +1,4946 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xcvsimd %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xcvsimd %s
//===----------------------------------------------------------------------===//
// cv.add.h
//===----------------------------------------------------------------------===//
cv.add.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.add.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.b
//===----------------------------------------------------------------------===//
cv.add.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.add.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.sc.h
//===----------------------------------------------------------------------===//
cv.add.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.add.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.sc.b
//===----------------------------------------------------------------------===//
cv.add.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.add.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.sci.h
//===----------------------------------------------------------------------===//
cv.add.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.add.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.add.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.add.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.sci.b
//===----------------------------------------------------------------------===//
cv.add.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.add.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.add.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.add.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.h
//===----------------------------------------------------------------------===//
cv.sub.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sub.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.b
//===----------------------------------------------------------------------===//
cv.sub.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sub.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.sc.h
//===----------------------------------------------------------------------===//
cv.sub.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sub.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.sc.b
//===----------------------------------------------------------------------===//
cv.sub.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sub.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.sci.h
//===----------------------------------------------------------------------===//
cv.sub.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sub.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sub.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sub.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.sci.b
//===----------------------------------------------------------------------===//
cv.sub.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sub.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sub.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sub.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avg.h
//===----------------------------------------------------------------------===//
cv.avg.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avg.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avg.b
//===----------------------------------------------------------------------===//
cv.avg.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avg.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avg.sc.h
//===----------------------------------------------------------------------===//
cv.avg.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avg.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avg.sc.b
//===----------------------------------------------------------------------===//
cv.avg.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avg.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avg.sci.h
//===----------------------------------------------------------------------===//
cv.avg.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.avg.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.avg.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.avg.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avg.sci.b
//===----------------------------------------------------------------------===//
cv.avg.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avg.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.avg.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.avg.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.avg.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avgu.h
//===----------------------------------------------------------------------===//
cv.avgu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avgu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avgu.b
//===----------------------------------------------------------------------===//
cv.avgu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avgu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avgu.sc.h
//===----------------------------------------------------------------------===//
cv.avgu.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avgu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avgu.sc.b
//===----------------------------------------------------------------------===//
cv.avgu.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.avgu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avgu.sci.h
//===----------------------------------------------------------------------===//
cv.avgu.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.avgu.sci.b
//===----------------------------------------------------------------------===//
cv.avgu.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.avgu.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.avgu.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.min.h
//===----------------------------------------------------------------------===//
cv.min.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.min.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.min.b
//===----------------------------------------------------------------------===//
cv.min.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.min.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.min.sc.h
//===----------------------------------------------------------------------===//
cv.min.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.min.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.min.sc.b
//===----------------------------------------------------------------------===//
cv.min.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.min.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.min.sci.h
//===----------------------------------------------------------------------===//
cv.min.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.min.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.min.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.min.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.min.sci.b
//===----------------------------------------------------------------------===//
cv.min.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.min.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.min.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.min.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.min.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.minu.h
//===----------------------------------------------------------------------===//
cv.minu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.minu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.minu.b
//===----------------------------------------------------------------------===//
cv.minu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.minu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.minu.sc.h
//===----------------------------------------------------------------------===//
cv.minu.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.minu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.minu.sc.b
//===----------------------------------------------------------------------===//
cv.minu.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.minu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.minu.sci.h
//===----------------------------------------------------------------------===//
cv.minu.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.minu.sci.b
//===----------------------------------------------------------------------===//
cv.minu.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.minu.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.minu.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.max.h
//===----------------------------------------------------------------------===//
cv.max.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.max.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.max.b
//===----------------------------------------------------------------------===//
cv.max.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.max.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.max.sc.h
//===----------------------------------------------------------------------===//
cv.max.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.max.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.max.sc.b
//===----------------------------------------------------------------------===//
cv.max.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.max.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.max.sci.h
//===----------------------------------------------------------------------===//
cv.max.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.max.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.max.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.max.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.max.sci.b
//===----------------------------------------------------------------------===//
cv.max.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.max.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.max.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.max.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.max.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.maxu.h
//===----------------------------------------------------------------------===//
cv.maxu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.maxu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.maxu.b
//===----------------------------------------------------------------------===//
cv.maxu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.maxu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.maxu.sc.h
//===----------------------------------------------------------------------===//
cv.maxu.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.maxu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.maxu.sc.b
//===----------------------------------------------------------------------===//
cv.maxu.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.maxu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.maxu.sci.h
//===----------------------------------------------------------------------===//
cv.maxu.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.maxu.sci.b
//===----------------------------------------------------------------------===//
cv.maxu.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.maxu.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.maxu.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.srl.h
//===----------------------------------------------------------------------===//
cv.srl.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.srl.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.srl.b
//===----------------------------------------------------------------------===//
cv.srl.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.srl.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.srl.sc.h
//===----------------------------------------------------------------------===//
cv.srl.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.srl.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.srl.sc.b
//===----------------------------------------------------------------------===//
cv.srl.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.srl.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.srl.sci.h
//===----------------------------------------------------------------------===//
cv.srl.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.srl.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.srl.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.srl.sci.h t0, t1, 16
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.srl.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.srl.sci.b
//===----------------------------------------------------------------------===//
cv.srl.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.srl.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.srl.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.srl.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.srl.sci.b t0, t1, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.srl.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sra.h
//===----------------------------------------------------------------------===//
cv.sra.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sra.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sra.b
//===----------------------------------------------------------------------===//
cv.sra.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sra.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sra.sc.h
//===----------------------------------------------------------------------===//
cv.sra.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sra.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sra.sc.b
//===----------------------------------------------------------------------===//
cv.sra.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sra.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sra.sci.h
//===----------------------------------------------------------------------===//
cv.sra.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sra.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sra.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sra.sci.h t0, t1, 16
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sra.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sra.sci.b
//===----------------------------------------------------------------------===//
cv.sra.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sra.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sra.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sra.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sra.sci.b t0, t1, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sra.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sll.h
//===----------------------------------------------------------------------===//
cv.sll.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sll.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sll.b
//===----------------------------------------------------------------------===//
cv.sll.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sll.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sll.sc.h
//===----------------------------------------------------------------------===//
cv.sll.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sll.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sll.sc.b
//===----------------------------------------------------------------------===//
cv.sll.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sll.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sll.sci.h
//===----------------------------------------------------------------------===//
cv.sll.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sll.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sll.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sll.sci.h t0, t1, 16
-# CHECK-ERROR: immediate must be an integer in the range [0, 15]
+# expected-error at -1 {{immediate must be an integer in the range [0, 15]}}
cv.sll.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sll.sci.b
//===----------------------------------------------------------------------===//
cv.sll.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sll.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sll.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sll.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sll.sci.b t0, t1, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 7]
+# expected-error at -1 {{immediate must be an integer in the range [0, 7]}}
cv.sll.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.or.h
//===----------------------------------------------------------------------===//
cv.or.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.or.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.or.b
//===----------------------------------------------------------------------===//
cv.or.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.or.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.or.sc.h
//===----------------------------------------------------------------------===//
cv.or.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.or.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.or.sc.b
//===----------------------------------------------------------------------===//
cv.or.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.or.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.or.sci.h
//===----------------------------------------------------------------------===//
cv.or.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.or.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.or.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.or.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.or.sci.b
//===----------------------------------------------------------------------===//
cv.or.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.or.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.or.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.or.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.or.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.xor.h
//===----------------------------------------------------------------------===//
cv.xor.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.xor.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.xor.b
//===----------------------------------------------------------------------===//
cv.xor.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.xor.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.xor.sc.h
//===----------------------------------------------------------------------===//
cv.xor.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.xor.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.xor.sc.b
//===----------------------------------------------------------------------===//
cv.xor.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.xor.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.xor.sci.h
//===----------------------------------------------------------------------===//
cv.xor.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.xor.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.xor.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.xor.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.xor.sci.b
//===----------------------------------------------------------------------===//
cv.xor.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.xor.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.xor.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.xor.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.xor.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.and.h
//===----------------------------------------------------------------------===//
cv.and.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.and.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.and.b
//===----------------------------------------------------------------------===//
cv.and.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.and.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.and.sc.h
//===----------------------------------------------------------------------===//
cv.and.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.and.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.and.sc.b
//===----------------------------------------------------------------------===//
cv.and.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.and.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.and.sci.h
//===----------------------------------------------------------------------===//
cv.and.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.and.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.and.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.and.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.and.sci.b
//===----------------------------------------------------------------------===//
cv.and.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.and.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.and.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.and.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.and.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.abs.h
//===----------------------------------------------------------------------===//
cv.abs.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.abs.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.abs.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.abs.h t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.abs.h t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.abs.h t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
//===----------------------------------------------------------------------===//
// cv.abs.b
//===----------------------------------------------------------------------===//
cv.abs.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.abs.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.abs.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.abs.b t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.abs.b t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.abs.b t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotup.h
//===----------------------------------------------------------------------===//
cv.dotup.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotup.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotup.b
//===----------------------------------------------------------------------===//
cv.dotup.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotup.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotup.sc.h
//===----------------------------------------------------------------------===//
cv.dotup.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotup.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotup.sc.b
//===----------------------------------------------------------------------===//
cv.dotup.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotup.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotup.sci.h
//===----------------------------------------------------------------------===//
cv.dotup.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotup.sci.b
//===----------------------------------------------------------------------===//
cv.dotup.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotup.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.dotup.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotusp.h
//===----------------------------------------------------------------------===//
cv.dotusp.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotusp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotusp.b
//===----------------------------------------------------------------------===//
cv.dotusp.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotusp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sc.h
//===----------------------------------------------------------------------===//
cv.dotusp.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotusp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sc.b
//===----------------------------------------------------------------------===//
cv.dotusp.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotusp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sci.h
//===----------------------------------------------------------------------===//
cv.dotusp.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotusp.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotusp.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotusp.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sci.b
//===----------------------------------------------------------------------===//
cv.dotusp.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotusp.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotusp.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotusp.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotusp.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotsp.h
//===----------------------------------------------------------------------===//
cv.dotsp.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotsp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotsp.b
//===----------------------------------------------------------------------===//
cv.dotsp.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotsp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sc.h
//===----------------------------------------------------------------------===//
cv.dotsp.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotsp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sc.b
//===----------------------------------------------------------------------===//
cv.dotsp.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.dotsp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sci.h
//===----------------------------------------------------------------------===//
cv.dotsp.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotsp.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotsp.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotsp.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sci.b
//===----------------------------------------------------------------------===//
cv.dotsp.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.dotsp.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotsp.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotsp.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.dotsp.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotup.h
//===----------------------------------------------------------------------===//
cv.sdotup.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotup.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotup.b
//===----------------------------------------------------------------------===//
cv.sdotup.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotup.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sc.h
//===----------------------------------------------------------------------===//
cv.sdotup.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotup.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sc.b
//===----------------------------------------------------------------------===//
cv.sdotup.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotup.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sci.h
//===----------------------------------------------------------------------===//
cv.sdotup.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sci.b
//===----------------------------------------------------------------------===//
cv.sdotup.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotup.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.sdotup.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.h
//===----------------------------------------------------------------------===//
cv.sdotusp.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotusp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.b
//===----------------------------------------------------------------------===//
cv.sdotusp.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotusp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sc.h
//===----------------------------------------------------------------------===//
cv.sdotusp.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotusp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sc.b
//===----------------------------------------------------------------------===//
cv.sdotusp.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotusp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sci.h
//===----------------------------------------------------------------------===//
cv.sdotusp.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotusp.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotusp.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotusp.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sci.b
//===----------------------------------------------------------------------===//
cv.sdotusp.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotusp.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotusp.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotusp.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotusp.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.h
//===----------------------------------------------------------------------===//
cv.sdotsp.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotsp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.b
//===----------------------------------------------------------------------===//
cv.sdotsp.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotsp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sc.h
//===----------------------------------------------------------------------===//
cv.sdotsp.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotsp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sc.b
//===----------------------------------------------------------------------===//
cv.sdotsp.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sdotsp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sci.h
//===----------------------------------------------------------------------===//
cv.sdotsp.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotsp.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotsp.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotsp.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sci.b
//===----------------------------------------------------------------------===//
cv.sdotsp.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sdotsp.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotsp.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotsp.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.sdotsp.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.extract.h
//===----------------------------------------------------------------------===//
cv.extract.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extract.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extract.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extract.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extract.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extract.h t0, t1, 2
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extract.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.extract.b
//===----------------------------------------------------------------------===//
cv.extract.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extract.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extract.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extract.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extract.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extract.b t0, t1, 4
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extract.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.extractu.h
//===----------------------------------------------------------------------===//
cv.extractu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractu.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extractu.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extractu.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extractu.h t0, t1, 2
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.extractu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.extractu.b
//===----------------------------------------------------------------------===//
cv.extractu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.extractu.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extractu.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extractu.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extractu.b t0, t1, 4
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.extractu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.insert.h
//===----------------------------------------------------------------------===//
cv.insert.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.insert.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.insert.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.insert.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.insert.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.insert.h t0, t1, 2
-# CHECK-ERROR: immediate must be an integer in the range [0, 1]
+# expected-error at -1 {{immediate must be an integer in the range [0, 1]}}
cv.insert.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.insert.b
//===----------------------------------------------------------------------===//
cv.insert.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.insert.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.insert.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.insert.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.insert.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.insert.b t0, t1, 4
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.insert.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffle.h
//===----------------------------------------------------------------------===//
cv.shuffle.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.shuffle.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffle.b
//===----------------------------------------------------------------------===//
cv.shuffle.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.shuffle.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffle.sci.h
//===----------------------------------------------------------------------===//
cv.shuffle.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.shuffle.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.shuffle.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.shuffle.sci.h t0, t1, 4
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
cv.shuffle.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffleI0.sci.b
//===----------------------------------------------------------------------===//
cv.shuffleI0.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI0.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI0.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI0.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI0.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI0.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI0.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffleI1.sci.b
//===----------------------------------------------------------------------===//
cv.shuffleI1.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI1.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI1.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI1.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI1.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI1.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI1.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffleI2.sci.b
//===----------------------------------------------------------------------===//
cv.shuffleI2.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI2.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI2.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI2.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI2.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI2.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI2.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffleI3.sci.b
//===----------------------------------------------------------------------===//
cv.shuffleI3.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI3.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffleI3.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI3.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI3.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI3.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.shuffleI3.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffle2.h
//===----------------------------------------------------------------------===//
cv.shuffle2.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.shuffle2.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.shuffle2.b
//===----------------------------------------------------------------------===//
cv.shuffle2.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.shuffle2.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.shuffle2.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.pack
//===----------------------------------------------------------------------===//
cv.pack 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.pack t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.pack.h
//===----------------------------------------------------------------------===//
cv.pack.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.pack.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.pack.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.packhi.b
//===----------------------------------------------------------------------===//
cv.packhi.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packhi.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packhi.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.packhi.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packhi.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packhi.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.packlo.b
//===----------------------------------------------------------------------===//
cv.packlo.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packlo.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packlo.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.packlo.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packlo.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.packlo.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.h
//===----------------------------------------------------------------------===//
cv.cmpeq.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpeq.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.b
//===----------------------------------------------------------------------===//
cv.cmpeq.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpeq.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sc.h
//===----------------------------------------------------------------------===//
cv.cmpeq.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpeq.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sc.b
//===----------------------------------------------------------------------===//
cv.cmpeq.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpeq.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sci.h
//===----------------------------------------------------------------------===//
cv.cmpeq.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpeq.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpeq.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpeq.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sci.b
//===----------------------------------------------------------------------===//
cv.cmpeq.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpeq.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpeq.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpeq.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpeq.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpne.h
//===----------------------------------------------------------------------===//
cv.cmpne.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpne.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpne.b
//===----------------------------------------------------------------------===//
cv.cmpne.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpne.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sc.h
//===----------------------------------------------------------------------===//
cv.cmpne.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpne.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sc.b
//===----------------------------------------------------------------------===//
cv.cmpne.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpne.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sci.h
//===----------------------------------------------------------------------===//
cv.cmpne.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpne.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpne.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpne.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sci.b
//===----------------------------------------------------------------------===//
cv.cmpne.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpne.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpne.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpne.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpne.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.h
//===----------------------------------------------------------------------===//
cv.cmpgt.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgt.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.b
//===----------------------------------------------------------------------===//
cv.cmpgt.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgt.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sc.h
//===----------------------------------------------------------------------===//
cv.cmpgt.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgt.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sc.b
//===----------------------------------------------------------------------===//
cv.cmpgt.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgt.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sci.h
//===----------------------------------------------------------------------===//
cv.cmpgt.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpgt.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpgt.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpgt.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sci.b
//===----------------------------------------------------------------------===//
cv.cmpgt.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgt.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpgt.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpgt.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpgt.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpge.h
//===----------------------------------------------------------------------===//
cv.cmpge.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpge.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpge.b
//===----------------------------------------------------------------------===//
cv.cmpge.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpge.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sc.h
//===----------------------------------------------------------------------===//
cv.cmpge.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpge.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sc.b
//===----------------------------------------------------------------------===//
cv.cmpge.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpge.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sci.h
//===----------------------------------------------------------------------===//
cv.cmpge.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpge.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpge.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpge.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sci.b
//===----------------------------------------------------------------------===//
cv.cmpge.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpge.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpge.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpge.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmpge.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmplt.h
//===----------------------------------------------------------------------===//
cv.cmplt.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmplt.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmplt.b
//===----------------------------------------------------------------------===//
cv.cmplt.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmplt.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sc.h
//===----------------------------------------------------------------------===//
cv.cmplt.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmplt.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sc.b
//===----------------------------------------------------------------------===//
cv.cmplt.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmplt.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sci.h
//===----------------------------------------------------------------------===//
cv.cmplt.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmplt.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmplt.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmplt.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sci.b
//===----------------------------------------------------------------------===//
cv.cmplt.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmplt.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmplt.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmplt.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmplt.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmple.h
//===----------------------------------------------------------------------===//
cv.cmple.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmple.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmple.b
//===----------------------------------------------------------------------===//
cv.cmple.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmple.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmple.sc.h
//===----------------------------------------------------------------------===//
cv.cmple.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmple.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmple.sc.b
//===----------------------------------------------------------------------===//
cv.cmple.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmple.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmple.sci.h
//===----------------------------------------------------------------------===//
cv.cmple.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmple.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmple.sci.h t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmple.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmple.sci.b
//===----------------------------------------------------------------------===//
cv.cmple.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmple.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmple.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmple.sci.b t0, t1, 63
-# CHECK-ERROR: immediate must be an integer in the range [-32, 31]
+# expected-error at -1 {{immediate must be an integer in the range [-32, 31]}}
cv.cmple.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.h
//===----------------------------------------------------------------------===//
cv.cmpgtu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgtu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.b
//===----------------------------------------------------------------------===//
cv.cmpgtu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgtu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sc.h
//===----------------------------------------------------------------------===//
cv.cmpgtu.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgtu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sc.b
//===----------------------------------------------------------------------===//
cv.cmpgtu.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgtu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sci.h
//===----------------------------------------------------------------------===//
cv.cmpgtu.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sci.b
//===----------------------------------------------------------------------===//
cv.cmpgtu.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgtu.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgtu.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.h
//===----------------------------------------------------------------------===//
cv.cmpgeu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgeu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.b
//===----------------------------------------------------------------------===//
cv.cmpgeu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgeu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sc.h
//===----------------------------------------------------------------------===//
cv.cmpgeu.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgeu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sc.b
//===----------------------------------------------------------------------===//
cv.cmpgeu.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpgeu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sci.h
//===----------------------------------------------------------------------===//
cv.cmpgeu.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sci.b
//===----------------------------------------------------------------------===//
cv.cmpgeu.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpgeu.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpgeu.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.h
//===----------------------------------------------------------------------===//
cv.cmpltu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpltu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.b
//===----------------------------------------------------------------------===//
cv.cmpltu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpltu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sc.h
//===----------------------------------------------------------------------===//
cv.cmpltu.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpltu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sc.b
//===----------------------------------------------------------------------===//
cv.cmpltu.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpltu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sci.h
//===----------------------------------------------------------------------===//
cv.cmpltu.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sci.b
//===----------------------------------------------------------------------===//
cv.cmpltu.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpltu.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpltu.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.h
//===----------------------------------------------------------------------===//
cv.cmpleu.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpleu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.b
//===----------------------------------------------------------------------===//
cv.cmpleu.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpleu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sc.h
//===----------------------------------------------------------------------===//
cv.cmpleu.sc.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.h t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpleu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.h t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sc.b
//===----------------------------------------------------------------------===//
cv.cmpleu.sc.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.b t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cmpleu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.b t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sc.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sci.h
//===----------------------------------------------------------------------===//
cv.cmpleu.sci.h 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sci.h t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sci.h t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.h t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.h t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.h t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.h t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sci.b
//===----------------------------------------------------------------------===//
cv.cmpleu.sci.b 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sci.b t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cmpleu.sci.b t0, t1, t2, t3
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.b t0, t1, t2
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.b t0, t1, -1
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.b t0, t1, 64
-# CHECK-ERROR: immediate must be an integer in the range [0, 63]
+# expected-error at -1 {{immediate must be an integer in the range [0, 63]}}
cv.cmpleu.sci.b t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r
//===----------------------------------------------------------------------===//
cv.cplxmul.r 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.r t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i
//===----------------------------------------------------------------------===//
cv.cplxmul.i 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.i t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r.div2
//===----------------------------------------------------------------------===//
cv.cplxmul.r.div2 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div2 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div2 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.r.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div2 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i.div2
//===----------------------------------------------------------------------===//
cv.cplxmul.i.div2 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div2 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div2 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.i.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div2 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r.div4
//===----------------------------------------------------------------------===//
cv.cplxmul.r.div4 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div4 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div4 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.r.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div4 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i.div4
//===----------------------------------------------------------------------===//
cv.cplxmul.i.div4 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div4 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div4 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.i.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div4 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r.div8
//===----------------------------------------------------------------------===//
cv.cplxmul.r.div8 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div8 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div8 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.r.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.r.div8 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i.div8
//===----------------------------------------------------------------------===//
cv.cplxmul.i.div8 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div8 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div8 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxmul.i.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxmul.i.div8 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.cplxconj
//===----------------------------------------------------------------------===//
cv.cplxconj 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxconj t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.cplxconj t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxconj t0, t1, t2
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxconj t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.cplxconj t0, t1, 0
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
//===----------------------------------------------------------------------===//
// cv.subrotmj
//===----------------------------------------------------------------------===//
cv.subrotmj 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subrotmj t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.subrotmj.div2
//===----------------------------------------------------------------------===//
cv.subrotmj.div2 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div2 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div2 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subrotmj.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div2 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.subrotmj.div4
//===----------------------------------------------------------------------===//
cv.subrotmj.div4 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div4 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div4 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subrotmj.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div4 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.subrotmj.div8
//===----------------------------------------------------------------------===//
cv.subrotmj.div8 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div8 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div8 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.subrotmj.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.subrotmj.div8 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.div2
//===----------------------------------------------------------------------===//
cv.add.div2 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div2 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div2 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.add.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div2 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.div4
//===----------------------------------------------------------------------===//
cv.add.div4 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div4 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div4 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.add.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div4 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.add.div8
//===----------------------------------------------------------------------===//
cv.add.div8 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div8 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div8 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.add.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.add.div8 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.div2
//===----------------------------------------------------------------------===//
cv.sub.div2 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div2 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div2 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sub.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div2 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div2 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.div4
//===----------------------------------------------------------------------===//
cv.sub.div4 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div4 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div4 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sub.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div4 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div4 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
//===----------------------------------------------------------------------===//
// cv.sub.div8
//===----------------------------------------------------------------------===//
cv.sub.div8 0, t1, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div8 t0, 0, t2
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div8 t0, t1, t2, t3
-# CHECK-ERROR: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
cv.sub.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div8 t0, t1, 0
-# CHECK-ERROR: register must be a GPR
+# expected-error at -1 {{register must be a GPR}}
cv.sub.div8 t0, t1
-# CHECK-ERROR: too few operands for instruction
+# expected-error at -1 {{too few operands for instruction}}
diff --git a/llvm/test/MC/RISCV/corev/XCVsimd.s b/llvm/test/MC/RISCV/corev/XCVsimd.s
index 198c576344d727..afe57956c47a38 100644
--- a/llvm/test/MC/RISCV/corev/XCVsimd.s
+++ b/llvm/test/MC/RISCV/corev/XCVsimd.s
@@ -3,8 +3,7 @@
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xcvsimd < %s \
# RUN: | llvm-objdump --mattr=+xcvsimd --no-print-imm-hex -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-INSTR %s
-# RUN: not llvm-mc -triple riscv32 %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 %s
//===----------------------------------------------------------------------===//
// cv.add.h
@@ -13,22 +12,22 @@
cv.add.h t0, t1, t2
# CHECK-INSTR: cv.add.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.h t3, t4, t5
# CHECK-INSTR: cv.add.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.h a0, a1, a2
# CHECK-INSTR: cv.add.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.h s0, s1, s2
# CHECK-INSTR: cv.add.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.b
@@ -37,22 +36,22 @@ cv.add.h s0, s1, s2
cv.add.b t0, t1, t2
# CHECK-INSTR: cv.add.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.b t3, t4, t5
# CHECK-INSTR: cv.add.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.b a0, a1, a2
# CHECK-INSTR: cv.add.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.b s0, s1, s2
# CHECK-INSTR: cv.add.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.sc.h
@@ -61,22 +60,22 @@ cv.add.b s0, s1, s2
cv.add.sc.h t0, t1, t2
# CHECK-INSTR: cv.add.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sc.h t3, t4, t5
# CHECK-INSTR: cv.add.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sc.h a0, a1, a2
# CHECK-INSTR: cv.add.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sc.h s0, s1, s2
# CHECK-INSTR: cv.add.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.sc.b
@@ -85,22 +84,22 @@ cv.add.sc.h s0, s1, s2
cv.add.sc.b t0, t1, t2
# CHECK-INSTR: cv.add.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sc.b t3, t4, t5
# CHECK-INSTR: cv.add.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sc.b a0, a1, a2
# CHECK-INSTR: cv.add.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sc.b s0, s1, s2
# CHECK-INSTR: cv.add.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.sci.h
@@ -109,22 +108,22 @@ cv.add.sc.b s0, s1, s2
cv.add.sci.h t0, t1, 0
# CHECK-INSTR: cv.add.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sci.h t3, t4, -32
# CHECK-INSTR: cv.add.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sci.h a0, a1, 7
# CHECK-INSTR: cv.add.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x02]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sci.h s0, s1, -1
# CHECK-INSTR: cv.add.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x03]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.sci.b
@@ -133,22 +132,22 @@ cv.add.sci.h s0, s1, -1
cv.add.sci.b t0, t1, 0
# CHECK-INSTR: cv.add.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x00]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sci.b t3, t4, -32
# CHECK-INSTR: cv.add.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x01]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sci.b a0, a1, 7
# CHECK-INSTR: cv.add.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x02]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.sci.b s0, s1, -1
# CHECK-INSTR: cv.add.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x03]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.h
@@ -157,22 +156,22 @@ cv.add.sci.b s0, s1, -1
cv.sub.h t0, t1, t2
# CHECK-INSTR: cv.sub.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.h t3, t4, t5
# CHECK-INSTR: cv.sub.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.h a0, a1, a2
# CHECK-INSTR: cv.sub.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.h s0, s1, s2
# CHECK-INSTR: cv.sub.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.b
@@ -181,22 +180,22 @@ cv.sub.h s0, s1, s2
cv.sub.b t0, t1, t2
# CHECK-INSTR: cv.sub.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.b t3, t4, t5
# CHECK-INSTR: cv.sub.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.b a0, a1, a2
# CHECK-INSTR: cv.sub.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.b s0, s1, s2
# CHECK-INSTR: cv.sub.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.sc.h
@@ -205,22 +204,22 @@ cv.sub.b s0, s1, s2
cv.sub.sc.h t0, t1, t2
# CHECK-INSTR: cv.sub.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sc.h t3, t4, t5
# CHECK-INSTR: cv.sub.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sc.h a0, a1, a2
# CHECK-INSTR: cv.sub.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sc.h s0, s1, s2
# CHECK-INSTR: cv.sub.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.sc.b
@@ -229,22 +228,22 @@ cv.sub.sc.h s0, s1, s2
cv.sub.sc.b t0, t1, t2
# CHECK-INSTR: cv.sub.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sc.b t3, t4, t5
# CHECK-INSTR: cv.sub.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sc.b a0, a1, a2
# CHECK-INSTR: cv.sub.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sc.b s0, s1, s2
# CHECK-INSTR: cv.sub.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.sci.h
@@ -253,22 +252,22 @@ cv.sub.sc.b s0, s1, s2
cv.sub.sci.h t0, t1, 0
# CHECK-INSTR: cv.sub.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sci.h t3, t4, -32
# CHECK-INSTR: cv.sub.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sci.h a0, a1, 7
# CHECK-INSTR: cv.sub.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x0a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sci.h s0, s1, -1
# CHECK-INSTR: cv.sub.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x0b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.sci.b
@@ -277,22 +276,22 @@ cv.sub.sci.h s0, s1, -1
cv.sub.sci.b t0, t1, 0
# CHECK-INSTR: cv.sub.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x08]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sci.b t3, t4, -32
# CHECK-INSTR: cv.sub.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x09]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sci.b a0, a1, 7
# CHECK-INSTR: cv.sub.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x0a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.sci.b s0, s1, -1
# CHECK-INSTR: cv.sub.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x0b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avg.h
@@ -301,22 +300,22 @@ cv.sub.sci.b s0, s1, -1
cv.avg.h t0, t1, t2
# CHECK-INSTR: cv.avg.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.h t3, t4, t5
# CHECK-INSTR: cv.avg.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.h a0, a1, a2
# CHECK-INSTR: cv.avg.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.h s0, s1, s2
# CHECK-INSTR: cv.avg.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avg.b
@@ -325,22 +324,22 @@ cv.avg.h s0, s1, s2
cv.avg.b t0, t1, t2
# CHECK-INSTR: cv.avg.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.b t3, t4, t5
# CHECK-INSTR: cv.avg.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.b a0, a1, a2
# CHECK-INSTR: cv.avg.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.b s0, s1, s2
# CHECK-INSTR: cv.avg.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avg.sc.h
@@ -349,22 +348,22 @@ cv.avg.b s0, s1, s2
cv.avg.sc.h t0, t1, t2
# CHECK-INSTR: cv.avg.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sc.h t3, t4, t5
# CHECK-INSTR: cv.avg.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sc.h a0, a1, a2
# CHECK-INSTR: cv.avg.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sc.h s0, s1, s2
# CHECK-INSTR: cv.avg.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avg.sc.b
@@ -373,22 +372,22 @@ cv.avg.sc.h s0, s1, s2
cv.avg.sc.b t0, t1, t2
# CHECK-INSTR: cv.avg.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sc.b t3, t4, t5
# CHECK-INSTR: cv.avg.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sc.b a0, a1, a2
# CHECK-INSTR: cv.avg.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sc.b s0, s1, s2
# CHECK-INSTR: cv.avg.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avg.sci.h
@@ -397,22 +396,22 @@ cv.avg.sc.b s0, s1, s2
cv.avg.sci.h t0, t1, 0
# CHECK-INSTR: cv.avg.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sci.h t3, t4, -32
# CHECK-INSTR: cv.avg.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sci.h a0, a1, 7
# CHECK-INSTR: cv.avg.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x12]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sci.h s0, s1, -1
# CHECK-INSTR: cv.avg.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x13]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avg.sci.b
@@ -421,22 +420,22 @@ cv.avg.sci.h s0, s1, -1
cv.avg.sci.b t0, t1, 0
# CHECK-INSTR: cv.avg.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x10]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sci.b t3, t4, -32
# CHECK-INSTR: cv.avg.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x11]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sci.b a0, a1, 7
# CHECK-INSTR: cv.avg.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x12]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avg.sci.b s0, s1, -1
# CHECK-INSTR: cv.avg.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x13]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avgu.h
@@ -445,22 +444,22 @@ cv.avg.sci.b s0, s1, -1
cv.avgu.h t0, t1, t2
# CHECK-INSTR: cv.avgu.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.h t3, t4, t5
# CHECK-INSTR: cv.avgu.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.h a0, a1, a2
# CHECK-INSTR: cv.avgu.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.h s0, s1, s2
# CHECK-INSTR: cv.avgu.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avgu.b
@@ -469,22 +468,22 @@ cv.avgu.h s0, s1, s2
cv.avgu.b t0, t1, t2
# CHECK-INSTR: cv.avgu.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.b t3, t4, t5
# CHECK-INSTR: cv.avgu.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.b a0, a1, a2
# CHECK-INSTR: cv.avgu.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.b s0, s1, s2
# CHECK-INSTR: cv.avgu.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avgu.sc.h
@@ -493,22 +492,22 @@ cv.avgu.b s0, s1, s2
cv.avgu.sc.h t0, t1, t2
# CHECK-INSTR: cv.avgu.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sc.h t3, t4, t5
# CHECK-INSTR: cv.avgu.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sc.h a0, a1, a2
# CHECK-INSTR: cv.avgu.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sc.h s0, s1, s2
# CHECK-INSTR: cv.avgu.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avgu.sc.b
@@ -517,22 +516,22 @@ cv.avgu.sc.h s0, s1, s2
cv.avgu.sc.b t0, t1, t2
# CHECK-INSTR: cv.avgu.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sc.b t3, t4, t5
# CHECK-INSTR: cv.avgu.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sc.b a0, a1, a2
# CHECK-INSTR: cv.avgu.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sc.b s0, s1, s2
# CHECK-INSTR: cv.avgu.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avgu.sci.h
@@ -541,22 +540,22 @@ cv.avgu.sc.b s0, s1, s2
cv.avgu.sci.h t0, t1, 0
# CHECK-INSTR: cv.avgu.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sci.h t3, t4, 32
# CHECK-INSTR: cv.avgu.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sci.h a0, a1, 7
# CHECK-INSTR: cv.avgu.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x1a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sci.h s0, s1, 63
# CHECK-INSTR: cv.avgu.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x1b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.avgu.sci.b
@@ -565,22 +564,22 @@ cv.avgu.sci.h s0, s1, 63
cv.avgu.sci.b t0, t1, 0
# CHECK-INSTR: cv.avgu.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x18]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sci.b t3, t4, 32
# CHECK-INSTR: cv.avgu.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x19]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sci.b a0, a1, 7
# CHECK-INSTR: cv.avgu.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x1a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.avgu.sci.b s0, s1, 63
# CHECK-INSTR: cv.avgu.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x1b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.min.h
@@ -589,22 +588,22 @@ cv.avgu.sci.b s0, s1, 63
cv.min.h t0, t1, t2
# CHECK-INSTR: cv.min.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.h t3, t4, t5
# CHECK-INSTR: cv.min.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.h a0, a1, a2
# CHECK-INSTR: cv.min.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.h s0, s1, s2
# CHECK-INSTR: cv.min.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.min.b
@@ -613,22 +612,22 @@ cv.min.h s0, s1, s2
cv.min.b t0, t1, t2
# CHECK-INSTR: cv.min.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.b t3, t4, t5
# CHECK-INSTR: cv.min.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.b a0, a1, a2
# CHECK-INSTR: cv.min.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.b s0, s1, s2
# CHECK-INSTR: cv.min.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.min.sc.h
@@ -637,22 +636,22 @@ cv.min.b s0, s1, s2
cv.min.sc.h t0, t1, t2
# CHECK-INSTR: cv.min.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sc.h t3, t4, t5
# CHECK-INSTR: cv.min.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sc.h a0, a1, a2
# CHECK-INSTR: cv.min.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sc.h s0, s1, s2
# CHECK-INSTR: cv.min.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.min.sc.b
@@ -661,22 +660,22 @@ cv.min.sc.h s0, s1, s2
cv.min.sc.b t0, t1, t2
# CHECK-INSTR: cv.min.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sc.b t3, t4, t5
# CHECK-INSTR: cv.min.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sc.b a0, a1, a2
# CHECK-INSTR: cv.min.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sc.b s0, s1, s2
# CHECK-INSTR: cv.min.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.min.sci.h
@@ -685,22 +684,22 @@ cv.min.sc.b s0, s1, s2
cv.min.sci.h t0, t1, 0
# CHECK-INSTR: cv.min.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sci.h t3, t4, -32
# CHECK-INSTR: cv.min.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sci.h a0, a1, 7
# CHECK-INSTR: cv.min.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x22]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sci.h s0, s1, -1
# CHECK-INSTR: cv.min.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x23]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.min.sci.b
@@ -709,22 +708,22 @@ cv.min.sci.h s0, s1, -1
cv.min.sci.b t0, t1, 0
# CHECK-INSTR: cv.min.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x20]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sci.b t3, t4, -32
# CHECK-INSTR: cv.min.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x21]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sci.b a0, a1, 7
# CHECK-INSTR: cv.min.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x22]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.min.sci.b s0, s1, -1
# CHECK-INSTR: cv.min.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x23]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.minu.h
@@ -733,22 +732,22 @@ cv.min.sci.b s0, s1, -1
cv.minu.h t0, t1, t2
# CHECK-INSTR: cv.minu.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.h t3, t4, t5
# CHECK-INSTR: cv.minu.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.h a0, a1, a2
# CHECK-INSTR: cv.minu.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.h s0, s1, s2
# CHECK-INSTR: cv.minu.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.minu.b
@@ -757,22 +756,22 @@ cv.minu.h s0, s1, s2
cv.minu.b t0, t1, t2
# CHECK-INSTR: cv.minu.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.b t3, t4, t5
# CHECK-INSTR: cv.minu.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.b a0, a1, a2
# CHECK-INSTR: cv.minu.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.b s0, s1, s2
# CHECK-INSTR: cv.minu.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.minu.sc.h
@@ -781,22 +780,22 @@ cv.minu.b s0, s1, s2
cv.minu.sc.h t0, t1, t2
# CHECK-INSTR: cv.minu.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sc.h t3, t4, t5
# CHECK-INSTR: cv.minu.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sc.h a0, a1, a2
# CHECK-INSTR: cv.minu.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sc.h s0, s1, s2
# CHECK-INSTR: cv.minu.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.minu.sc.b
@@ -805,22 +804,22 @@ cv.minu.sc.h s0, s1, s2
cv.minu.sc.b t0, t1, t2
# CHECK-INSTR: cv.minu.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sc.b t3, t4, t5
# CHECK-INSTR: cv.minu.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sc.b a0, a1, a2
# CHECK-INSTR: cv.minu.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sc.b s0, s1, s2
# CHECK-INSTR: cv.minu.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.minu.sci.h
@@ -829,22 +828,22 @@ cv.minu.sc.b s0, s1, s2
cv.minu.sci.h t0, t1, 0
# CHECK-INSTR: cv.minu.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sci.h t3, t4, 32
# CHECK-INSTR: cv.minu.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sci.h a0, a1, 7
# CHECK-INSTR: cv.minu.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x2a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sci.h s0, s1, 63
# CHECK-INSTR: cv.minu.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x2b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.minu.sci.b
@@ -853,22 +852,22 @@ cv.minu.sci.h s0, s1, 63
cv.minu.sci.b t0, t1, 0
# CHECK-INSTR: cv.minu.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x28]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sci.b t3, t4, 32
# CHECK-INSTR: cv.minu.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x29]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sci.b a0, a1, 7
# CHECK-INSTR: cv.minu.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x2a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.minu.sci.b s0, s1, 63
# CHECK-INSTR: cv.minu.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x2b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.max.h
@@ -877,22 +876,22 @@ cv.minu.sci.b s0, s1, 63
cv.max.h t0, t1, t2
# CHECK-INSTR: cv.max.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.h t3, t4, t5
# CHECK-INSTR: cv.max.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.h a0, a1, a2
# CHECK-INSTR: cv.max.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.h s0, s1, s2
# CHECK-INSTR: cv.max.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.max.b
@@ -901,22 +900,22 @@ cv.max.h s0, s1, s2
cv.max.b t0, t1, t2
# CHECK-INSTR: cv.max.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.b t3, t4, t5
# CHECK-INSTR: cv.max.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.b a0, a1, a2
# CHECK-INSTR: cv.max.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.b s0, s1, s2
# CHECK-INSTR: cv.max.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.max.sc.h
@@ -925,22 +924,22 @@ cv.max.b s0, s1, s2
cv.max.sc.h t0, t1, t2
# CHECK-INSTR: cv.max.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sc.h t3, t4, t5
# CHECK-INSTR: cv.max.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sc.h a0, a1, a2
# CHECK-INSTR: cv.max.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sc.h s0, s1, s2
# CHECK-INSTR: cv.max.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.max.sc.b
@@ -949,22 +948,22 @@ cv.max.sc.h s0, s1, s2
cv.max.sc.b t0, t1, t2
# CHECK-INSTR: cv.max.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sc.b t3, t4, t5
# CHECK-INSTR: cv.max.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sc.b a0, a1, a2
# CHECK-INSTR: cv.max.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sc.b s0, s1, s2
# CHECK-INSTR: cv.max.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.max.sci.h
@@ -973,22 +972,22 @@ cv.max.sc.b s0, s1, s2
cv.max.sci.h t0, t1, 0
# CHECK-INSTR: cv.max.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sci.h t3, t4, -32
# CHECK-INSTR: cv.max.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sci.h a0, a1, 7
# CHECK-INSTR: cv.max.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x32]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sci.h s0, s1, -1
# CHECK-INSTR: cv.max.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x33]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.max.sci.b
@@ -997,22 +996,22 @@ cv.max.sci.h s0, s1, -1
cv.max.sci.b t0, t1, 0
# CHECK-INSTR: cv.max.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x30]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sci.b t3, t4, -32
# CHECK-INSTR: cv.max.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x31]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sci.b a0, a1, 7
# CHECK-INSTR: cv.max.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x32]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.max.sci.b s0, s1, -1
# CHECK-INSTR: cv.max.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x33]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.maxu.h
@@ -1021,22 +1020,22 @@ cv.max.sci.b s0, s1, -1
cv.maxu.h t0, t1, t2
# CHECK-INSTR: cv.maxu.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.h t3, t4, t5
# CHECK-INSTR: cv.maxu.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.h a0, a1, a2
# CHECK-INSTR: cv.maxu.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.h s0, s1, s2
# CHECK-INSTR: cv.maxu.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.maxu.b
@@ -1045,22 +1044,22 @@ cv.maxu.h s0, s1, s2
cv.maxu.b t0, t1, t2
# CHECK-INSTR: cv.maxu.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.b t3, t4, t5
# CHECK-INSTR: cv.maxu.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.b a0, a1, a2
# CHECK-INSTR: cv.maxu.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.b s0, s1, s2
# CHECK-INSTR: cv.maxu.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.maxu.sc.h
@@ -1069,22 +1068,22 @@ cv.maxu.b s0, s1, s2
cv.maxu.sc.h t0, t1, t2
# CHECK-INSTR: cv.maxu.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sc.h t3, t4, t5
# CHECK-INSTR: cv.maxu.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sc.h a0, a1, a2
# CHECK-INSTR: cv.maxu.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sc.h s0, s1, s2
# CHECK-INSTR: cv.maxu.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.maxu.sc.b
@@ -1093,22 +1092,22 @@ cv.maxu.sc.h s0, s1, s2
cv.maxu.sc.b t0, t1, t2
# CHECK-INSTR: cv.maxu.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sc.b t3, t4, t5
# CHECK-INSTR: cv.maxu.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sc.b a0, a1, a2
# CHECK-INSTR: cv.maxu.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sc.b s0, s1, s2
# CHECK-INSTR: cv.maxu.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.maxu.sci.h
@@ -1117,22 +1116,22 @@ cv.maxu.sc.b s0, s1, s2
cv.maxu.sci.h t0, t1, 0
# CHECK-INSTR: cv.maxu.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sci.h t3, t4, 32
# CHECK-INSTR: cv.maxu.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sci.h a0, a1, 7
# CHECK-INSTR: cv.maxu.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x3a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sci.h s0, s1, 63
# CHECK-INSTR: cv.maxu.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x3b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.maxu.sci.b
@@ -1141,22 +1140,22 @@ cv.maxu.sci.h s0, s1, 63
cv.maxu.sci.b t0, t1, 0
# CHECK-INSTR: cv.maxu.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x38]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sci.b t3, t4, 32
# CHECK-INSTR: cv.maxu.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x39]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sci.b a0, a1, 7
# CHECK-INSTR: cv.maxu.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x3a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.maxu.sci.b s0, s1, 63
# CHECK-INSTR: cv.maxu.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x3b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.srl.h
@@ -1165,22 +1164,22 @@ cv.maxu.sci.b s0, s1, 63
cv.srl.h t0, t1, t2
# CHECK-INSTR: cv.srl.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.h t3, t4, t5
# CHECK-INSTR: cv.srl.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.h a0, a1, a2
# CHECK-INSTR: cv.srl.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.h s0, s1, s2
# CHECK-INSTR: cv.srl.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.srl.b
@@ -1189,22 +1188,22 @@ cv.srl.h s0, s1, s2
cv.srl.b t0, t1, t2
# CHECK-INSTR: cv.srl.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.b t3, t4, t5
# CHECK-INSTR: cv.srl.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.b a0, a1, a2
# CHECK-INSTR: cv.srl.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.b s0, s1, s2
# CHECK-INSTR: cv.srl.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.srl.sc.h
@@ -1213,22 +1212,22 @@ cv.srl.b s0, s1, s2
cv.srl.sc.h t0, t1, t2
# CHECK-INSTR: cv.srl.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sc.h t3, t4, t5
# CHECK-INSTR: cv.srl.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sc.h a0, a1, a2
# CHECK-INSTR: cv.srl.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sc.h s0, s1, s2
# CHECK-INSTR: cv.srl.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.srl.sc.b
@@ -1237,22 +1236,22 @@ cv.srl.sc.h s0, s1, s2
cv.srl.sc.b t0, t1, t2
# CHECK-INSTR: cv.srl.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sc.b t3, t4, t5
# CHECK-INSTR: cv.srl.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sc.b a0, a1, a2
# CHECK-INSTR: cv.srl.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sc.b s0, s1, s2
# CHECK-INSTR: cv.srl.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x41]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.srl.sci.h
@@ -1261,22 +1260,22 @@ cv.srl.sc.b s0, s1, s2
cv.srl.sci.h t0, t1, 0
# CHECK-INSTR: cv.srl.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sci.h t3, t4, 0
# CHECK-INSTR: cv.srl.sci.h t3, t4, 0
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sci.h a0, a1, 7
# CHECK-INSTR: cv.srl.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x42]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sci.h s0, s1, 15
# CHECK-INSTR: cv.srl.sci.h s0, s1, 15
# CHECK-ENCODING: [0x7b,0xe4,0x74,0x42]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.srl.sci.b
@@ -1285,22 +1284,22 @@ cv.srl.sci.h s0, s1, 15
cv.srl.sci.b t0, t1, 0
# CHECK-INSTR: cv.srl.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sci.b t3, t4, 0
# CHECK-INSTR: cv.srl.sci.b t3, t4, 0
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x40]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sci.b a0, a1, 7
# CHECK-INSTR: cv.srl.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x42]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.srl.sci.b s0, s1, 7
# CHECK-INSTR: cv.srl.sci.b s0, s1, 7
# CHECK-ENCODING: [0x7b,0xf4,0x34,0x42]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sra.h
@@ -1309,22 +1308,22 @@ cv.srl.sci.b s0, s1, 7
cv.sra.h t0, t1, t2
# CHECK-INSTR: cv.sra.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.h t3, t4, t5
# CHECK-INSTR: cv.sra.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.h a0, a1, a2
# CHECK-INSTR: cv.sra.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.h s0, s1, s2
# CHECK-INSTR: cv.sra.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sra.b
@@ -1333,22 +1332,22 @@ cv.sra.h s0, s1, s2
cv.sra.b t0, t1, t2
# CHECK-INSTR: cv.sra.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.b t3, t4, t5
# CHECK-INSTR: cv.sra.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.b a0, a1, a2
# CHECK-INSTR: cv.sra.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.b s0, s1, s2
# CHECK-INSTR: cv.sra.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sra.sc.h
@@ -1357,22 +1356,22 @@ cv.sra.b s0, s1, s2
cv.sra.sc.h t0, t1, t2
# CHECK-INSTR: cv.sra.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sc.h t3, t4, t5
# CHECK-INSTR: cv.sra.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sc.h a0, a1, a2
# CHECK-INSTR: cv.sra.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sc.h s0, s1, s2
# CHECK-INSTR: cv.sra.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sra.sc.b
@@ -1381,22 +1380,22 @@ cv.sra.sc.h s0, s1, s2
cv.sra.sc.b t0, t1, t2
# CHECK-INSTR: cv.sra.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sc.b t3, t4, t5
# CHECK-INSTR: cv.sra.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sc.b a0, a1, a2
# CHECK-INSTR: cv.sra.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sc.b s0, s1, s2
# CHECK-INSTR: cv.sra.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x49]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sra.sci.h
@@ -1405,22 +1404,22 @@ cv.sra.sc.b s0, s1, s2
cv.sra.sci.h t0, t1, 0
# CHECK-INSTR: cv.sra.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sci.h t3, t4, 0
# CHECK-INSTR: cv.sra.sci.h t3, t4, 0
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sci.h a0, a1, 7
# CHECK-INSTR: cv.sra.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x4a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sci.h s0, s1, 15
# CHECK-INSTR: cv.sra.sci.h s0, s1, 15
# CHECK-ENCODING: [0x7b,0xe4,0x74,0x4a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sra.sci.b
@@ -1429,22 +1428,22 @@ cv.sra.sci.h s0, s1, 15
cv.sra.sci.b t0, t1, 0
# CHECK-INSTR: cv.sra.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sci.b t3, t4, 0
# CHECK-INSTR: cv.sra.sci.b t3, t4, 0
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x48]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sci.b a0, a1, 7
# CHECK-INSTR: cv.sra.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x4a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sra.sci.b s0, s1, 7
# CHECK-INSTR: cv.sra.sci.b s0, s1, 7
# CHECK-ENCODING: [0x7b,0xf4,0x34,0x4a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sll.h
@@ -1453,22 +1452,22 @@ cv.sra.sci.b s0, s1, 7
cv.sll.h t0, t1, t2
# CHECK-INSTR: cv.sll.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.h t3, t4, t5
# CHECK-INSTR: cv.sll.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.h a0, a1, a2
# CHECK-INSTR: cv.sll.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.h s0, s1, s2
# CHECK-INSTR: cv.sll.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sll.b
@@ -1477,22 +1476,22 @@ cv.sll.h s0, s1, s2
cv.sll.b t0, t1, t2
# CHECK-INSTR: cv.sll.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.b t3, t4, t5
# CHECK-INSTR: cv.sll.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.b a0, a1, a2
# CHECK-INSTR: cv.sll.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.b s0, s1, s2
# CHECK-INSTR: cv.sll.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sll.sc.h
@@ -1501,22 +1500,22 @@ cv.sll.b s0, s1, s2
cv.sll.sc.h t0, t1, t2
# CHECK-INSTR: cv.sll.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sc.h t3, t4, t5
# CHECK-INSTR: cv.sll.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sc.h a0, a1, a2
# CHECK-INSTR: cv.sll.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sc.h s0, s1, s2
# CHECK-INSTR: cv.sll.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sll.sc.b
@@ -1525,22 +1524,22 @@ cv.sll.sc.h s0, s1, s2
cv.sll.sc.b t0, t1, t2
# CHECK-INSTR: cv.sll.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sc.b t3, t4, t5
# CHECK-INSTR: cv.sll.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sc.b a0, a1, a2
# CHECK-INSTR: cv.sll.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sc.b s0, s1, s2
# CHECK-INSTR: cv.sll.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x51]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sll.sci.h
@@ -1549,22 +1548,22 @@ cv.sll.sc.b s0, s1, s2
cv.sll.sci.h t0, t1, 0
# CHECK-INSTR: cv.sll.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sci.h t3, t4, 0
# CHECK-INSTR: cv.sll.sci.h t3, t4, 0
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sci.h a0, a1, 7
# CHECK-INSTR: cv.sll.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x52]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sci.h s0, s1, 15
# CHECK-INSTR: cv.sll.sci.h s0, s1, 15
# CHECK-ENCODING: [0x7b,0xe4,0x74,0x52]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sll.sci.b
@@ -1573,22 +1572,22 @@ cv.sll.sci.h s0, s1, 15
cv.sll.sci.b t0, t1, 0
# CHECK-INSTR: cv.sll.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sci.b t3, t4, 0
# CHECK-INSTR: cv.sll.sci.b t3, t4, 0
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x50]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sci.b a0, a1, 7
# CHECK-INSTR: cv.sll.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x52]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sll.sci.b s0, s1, 7
# CHECK-INSTR: cv.sll.sci.b s0, s1, 7
# CHECK-ENCODING: [0x7b,0xf4,0x34,0x52]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.or.h
@@ -1597,22 +1596,22 @@ cv.sll.sci.b s0, s1, 7
cv.or.h t0, t1, t2
# CHECK-INSTR: cv.or.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.h t3, t4, t5
# CHECK-INSTR: cv.or.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.h a0, a1, a2
# CHECK-INSTR: cv.or.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.h s0, s1, s2
# CHECK-INSTR: cv.or.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.or.b
@@ -1621,22 +1620,22 @@ cv.or.h s0, s1, s2
cv.or.b t0, t1, t2
# CHECK-INSTR: cv.or.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.b t3, t4, t5
# CHECK-INSTR: cv.or.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.b a0, a1, a2
# CHECK-INSTR: cv.or.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.b s0, s1, s2
# CHECK-INSTR: cv.or.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.or.sc.h
@@ -1645,22 +1644,22 @@ cv.or.b s0, s1, s2
cv.or.sc.h t0, t1, t2
# CHECK-INSTR: cv.or.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sc.h t3, t4, t5
# CHECK-INSTR: cv.or.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sc.h a0, a1, a2
# CHECK-INSTR: cv.or.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sc.h s0, s1, s2
# CHECK-INSTR: cv.or.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.or.sc.b
@@ -1669,22 +1668,22 @@ cv.or.sc.h s0, s1, s2
cv.or.sc.b t0, t1, t2
# CHECK-INSTR: cv.or.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sc.b t3, t4, t5
# CHECK-INSTR: cv.or.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sc.b a0, a1, a2
# CHECK-INSTR: cv.or.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sc.b s0, s1, s2
# CHECK-INSTR: cv.or.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.or.sci.h
@@ -1693,22 +1692,22 @@ cv.or.sc.b s0, s1, s2
cv.or.sci.h t0, t1, 0
# CHECK-INSTR: cv.or.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sci.h t3, t4, -32
# CHECK-INSTR: cv.or.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sci.h a0, a1, 7
# CHECK-INSTR: cv.or.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x5a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sci.h s0, s1, -1
# CHECK-INSTR: cv.or.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x5b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.or.sci.b
@@ -1717,22 +1716,22 @@ cv.or.sci.h s0, s1, -1
cv.or.sci.b t0, t1, 0
# CHECK-INSTR: cv.or.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x58]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sci.b t3, t4, -32
# CHECK-INSTR: cv.or.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x59]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sci.b a0, a1, 7
# CHECK-INSTR: cv.or.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x5a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.or.sci.b s0, s1, -1
# CHECK-INSTR: cv.or.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x5b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.xor.h
@@ -1741,22 +1740,22 @@ cv.or.sci.b s0, s1, -1
cv.xor.h t0, t1, t2
# CHECK-INSTR: cv.xor.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.h t3, t4, t5
# CHECK-INSTR: cv.xor.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.h a0, a1, a2
# CHECK-INSTR: cv.xor.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.h s0, s1, s2
# CHECK-INSTR: cv.xor.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.xor.b
@@ -1765,22 +1764,22 @@ cv.xor.h s0, s1, s2
cv.xor.b t0, t1, t2
# CHECK-INSTR: cv.xor.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.b t3, t4, t5
# CHECK-INSTR: cv.xor.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.b a0, a1, a2
# CHECK-INSTR: cv.xor.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.b s0, s1, s2
# CHECK-INSTR: cv.xor.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.xor.sc.h
@@ -1789,22 +1788,22 @@ cv.xor.b s0, s1, s2
cv.xor.sc.h t0, t1, t2
# CHECK-INSTR: cv.xor.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sc.h t3, t4, t5
# CHECK-INSTR: cv.xor.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sc.h a0, a1, a2
# CHECK-INSTR: cv.xor.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sc.h s0, s1, s2
# CHECK-INSTR: cv.xor.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.xor.sc.b
@@ -1813,22 +1812,22 @@ cv.xor.sc.h s0, s1, s2
cv.xor.sc.b t0, t1, t2
# CHECK-INSTR: cv.xor.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sc.b t3, t4, t5
# CHECK-INSTR: cv.xor.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sc.b a0, a1, a2
# CHECK-INSTR: cv.xor.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sc.b s0, s1, s2
# CHECK-INSTR: cv.xor.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.xor.sci.h
@@ -1837,22 +1836,22 @@ cv.xor.sc.b s0, s1, s2
cv.xor.sci.h t0, t1, 0
# CHECK-INSTR: cv.xor.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sci.h t3, t4, -32
# CHECK-INSTR: cv.xor.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sci.h a0, a1, 7
# CHECK-INSTR: cv.xor.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x62]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sci.h s0, s1, -1
# CHECK-INSTR: cv.xor.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x63]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.xor.sci.b
@@ -1861,22 +1860,22 @@ cv.xor.sci.h s0, s1, -1
cv.xor.sci.b t0, t1, 0
# CHECK-INSTR: cv.xor.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x60]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sci.b t3, t4, -32
# CHECK-INSTR: cv.xor.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x61]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sci.b a0, a1, 7
# CHECK-INSTR: cv.xor.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x62]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.xor.sci.b s0, s1, -1
# CHECK-INSTR: cv.xor.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x63]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.and.h
@@ -1885,22 +1884,22 @@ cv.xor.sci.b s0, s1, -1
cv.and.h t0, t1, t2
# CHECK-INSTR: cv.and.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.h t3, t4, t5
# CHECK-INSTR: cv.and.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.h a0, a1, a2
# CHECK-INSTR: cv.and.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.h s0, s1, s2
# CHECK-INSTR: cv.and.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.and.b
@@ -1909,22 +1908,22 @@ cv.and.h s0, s1, s2
cv.and.b t0, t1, t2
# CHECK-INSTR: cv.and.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.b t3, t4, t5
# CHECK-INSTR: cv.and.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.b a0, a1, a2
# CHECK-INSTR: cv.and.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.b s0, s1, s2
# CHECK-INSTR: cv.and.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.and.sc.h
@@ -1933,22 +1932,22 @@ cv.and.b s0, s1, s2
cv.and.sc.h t0, t1, t2
# CHECK-INSTR: cv.and.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sc.h t3, t4, t5
# CHECK-INSTR: cv.and.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sc.h a0, a1, a2
# CHECK-INSTR: cv.and.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sc.h s0, s1, s2
# CHECK-INSTR: cv.and.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.and.sc.b
@@ -1957,22 +1956,22 @@ cv.and.sc.h s0, s1, s2
cv.and.sc.b t0, t1, t2
# CHECK-INSTR: cv.and.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sc.b t3, t4, t5
# CHECK-INSTR: cv.and.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sc.b a0, a1, a2
# CHECK-INSTR: cv.and.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sc.b s0, s1, s2
# CHECK-INSTR: cv.and.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.and.sci.h
@@ -1981,22 +1980,22 @@ cv.and.sc.b s0, s1, s2
cv.and.sci.h t0, t1, 0
# CHECK-INSTR: cv.and.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sci.h t3, t4, -32
# CHECK-INSTR: cv.and.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sci.h a0, a1, 7
# CHECK-INSTR: cv.and.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x6a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sci.h s0, s1, -1
# CHECK-INSTR: cv.and.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x6b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.and.sci.b
@@ -2005,22 +2004,22 @@ cv.and.sci.h s0, s1, -1
cv.and.sci.b t0, t1, 0
# CHECK-INSTR: cv.and.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x68]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sci.b t3, t4, -32
# CHECK-INSTR: cv.and.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x69]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sci.b a0, a1, 7
# CHECK-INSTR: cv.and.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x6a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.and.sci.b s0, s1, -1
# CHECK-INSTR: cv.and.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x6b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.abs.h
@@ -2029,22 +2028,22 @@ cv.and.sci.b s0, s1, -1
cv.abs.h t0, t1
# CHECK-INSTR: cv.abs.h t0, t1
# CHECK-ENCODING: [0xfb,0x02,0x03,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.abs.h t3, t4
# CHECK-INSTR: cv.abs.h t3, t4
# CHECK-ENCODING: [0x7b,0x8e,0x0e,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.abs.h a0, a1
# CHECK-INSTR: cv.abs.h a0, a1
# CHECK-ENCODING: [0x7b,0x85,0x05,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.abs.h s0, s1
# CHECK-INSTR: cv.abs.h s0, s1
# CHECK-ENCODING: [0x7b,0x84,0x04,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.abs.b
@@ -2053,22 +2052,22 @@ cv.abs.h s0, s1
cv.abs.b t0, t1
# CHECK-INSTR: cv.abs.b t0, t1
# CHECK-ENCODING: [0xfb,0x12,0x03,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.abs.b t3, t4
# CHECK-INSTR: cv.abs.b t3, t4
# CHECK-ENCODING: [0x7b,0x9e,0x0e,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.abs.b a0, a1
# CHECK-INSTR: cv.abs.b a0, a1
# CHECK-ENCODING: [0x7b,0x95,0x05,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.abs.b s0, s1
# CHECK-INSTR: cv.abs.b s0, s1
# CHECK-ENCODING: [0x7b,0x94,0x04,0x70]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotup.h
@@ -2077,22 +2076,22 @@ cv.abs.b s0, s1
cv.dotup.h t0, t1, t2
# CHECK-INSTR: cv.dotup.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.h t3, t4, t5
# CHECK-INSTR: cv.dotup.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.h a0, a1, a2
# CHECK-INSTR: cv.dotup.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.h s0, s1, s2
# CHECK-INSTR: cv.dotup.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotup.b
@@ -2101,22 +2100,22 @@ cv.dotup.h s0, s1, s2
cv.dotup.b t0, t1, t2
# CHECK-INSTR: cv.dotup.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.b t3, t4, t5
# CHECK-INSTR: cv.dotup.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.b a0, a1, a2
# CHECK-INSTR: cv.dotup.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.b s0, s1, s2
# CHECK-INSTR: cv.dotup.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotup.sc.h
@@ -2125,22 +2124,22 @@ cv.dotup.b s0, s1, s2
cv.dotup.sc.h t0, t1, t2
# CHECK-INSTR: cv.dotup.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sc.h t3, t4, t5
# CHECK-INSTR: cv.dotup.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sc.h a0, a1, a2
# CHECK-INSTR: cv.dotup.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sc.h s0, s1, s2
# CHECK-INSTR: cv.dotup.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotup.sc.b
@@ -2149,22 +2148,22 @@ cv.dotup.sc.h s0, s1, s2
cv.dotup.sc.b t0, t1, t2
# CHECK-INSTR: cv.dotup.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sc.b t3, t4, t5
# CHECK-INSTR: cv.dotup.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sc.b a0, a1, a2
# CHECK-INSTR: cv.dotup.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sc.b s0, s1, s2
# CHECK-INSTR: cv.dotup.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotup.sci.h
@@ -2173,22 +2172,22 @@ cv.dotup.sc.b s0, s1, s2
cv.dotup.sci.h t0, t1, 0
# CHECK-INSTR: cv.dotup.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sci.h t3, t4, 32
# CHECK-INSTR: cv.dotup.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sci.h a0, a1, 7
# CHECK-INSTR: cv.dotup.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x82]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sci.h s0, s1, 63
# CHECK-INSTR: cv.dotup.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x83]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotup.sci.b
@@ -2197,22 +2196,22 @@ cv.dotup.sci.h s0, s1, 63
cv.dotup.sci.b t0, t1, 0
# CHECK-INSTR: cv.dotup.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x80]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sci.b t3, t4, 32
# CHECK-INSTR: cv.dotup.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x81]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sci.b a0, a1, 7
# CHECK-INSTR: cv.dotup.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x82]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotup.sci.b s0, s1, 63
# CHECK-INSTR: cv.dotup.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x83]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotusp.h
@@ -2221,22 +2220,22 @@ cv.dotup.sci.b s0, s1, 63
cv.dotusp.h t0, t1, t2
# CHECK-INSTR: cv.dotusp.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.h t3, t4, t5
# CHECK-INSTR: cv.dotusp.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.h a0, a1, a2
# CHECK-INSTR: cv.dotusp.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.h s0, s1, s2
# CHECK-INSTR: cv.dotusp.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotusp.b
@@ -2245,22 +2244,22 @@ cv.dotusp.h s0, s1, s2
cv.dotusp.b t0, t1, t2
# CHECK-INSTR: cv.dotusp.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.b t3, t4, t5
# CHECK-INSTR: cv.dotusp.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.b a0, a1, a2
# CHECK-INSTR: cv.dotusp.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.b s0, s1, s2
# CHECK-INSTR: cv.dotusp.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sc.h
@@ -2269,22 +2268,22 @@ cv.dotusp.b s0, s1, s2
cv.dotusp.sc.h t0, t1, t2
# CHECK-INSTR: cv.dotusp.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sc.h t3, t4, t5
# CHECK-INSTR: cv.dotusp.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sc.h a0, a1, a2
# CHECK-INSTR: cv.dotusp.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sc.h s0, s1, s2
# CHECK-INSTR: cv.dotusp.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sc.b
@@ -2293,22 +2292,22 @@ cv.dotusp.sc.h s0, s1, s2
cv.dotusp.sc.b t0, t1, t2
# CHECK-INSTR: cv.dotusp.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sc.b t3, t4, t5
# CHECK-INSTR: cv.dotusp.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sc.b a0, a1, a2
# CHECK-INSTR: cv.dotusp.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sc.b s0, s1, s2
# CHECK-INSTR: cv.dotusp.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sci.h
@@ -2317,22 +2316,22 @@ cv.dotusp.sc.b s0, s1, s2
cv.dotusp.sci.h t0, t1, 0
# CHECK-INSTR: cv.dotusp.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sci.h t3, t4, -32
# CHECK-INSTR: cv.dotusp.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sci.h a0, a1, 7
# CHECK-INSTR: cv.dotusp.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x8a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sci.h s0, s1, -1
# CHECK-INSTR: cv.dotusp.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x8b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotusp.sci.b
@@ -2341,22 +2340,22 @@ cv.dotusp.sci.h s0, s1, -1
cv.dotusp.sci.b t0, t1, 0
# CHECK-INSTR: cv.dotusp.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x88]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sci.b t3, t4, -32
# CHECK-INSTR: cv.dotusp.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x89]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sci.b a0, a1, 7
# CHECK-INSTR: cv.dotusp.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x8a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotusp.sci.b s0, s1, -1
# CHECK-INSTR: cv.dotusp.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x8b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotsp.h
@@ -2365,22 +2364,22 @@ cv.dotusp.sci.b s0, s1, -1
cv.dotsp.h t0, t1, t2
# CHECK-INSTR: cv.dotsp.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.h t3, t4, t5
# CHECK-INSTR: cv.dotsp.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.h a0, a1, a2
# CHECK-INSTR: cv.dotsp.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.h s0, s1, s2
# CHECK-INSTR: cv.dotsp.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotsp.b
@@ -2389,22 +2388,22 @@ cv.dotsp.h s0, s1, s2
cv.dotsp.b t0, t1, t2
# CHECK-INSTR: cv.dotsp.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.b t3, t4, t5
# CHECK-INSTR: cv.dotsp.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.b a0, a1, a2
# CHECK-INSTR: cv.dotsp.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.b s0, s1, s2
# CHECK-INSTR: cv.dotsp.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sc.h
@@ -2413,22 +2412,22 @@ cv.dotsp.b s0, s1, s2
cv.dotsp.sc.h t0, t1, t2
# CHECK-INSTR: cv.dotsp.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sc.h t3, t4, t5
# CHECK-INSTR: cv.dotsp.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sc.h a0, a1, a2
# CHECK-INSTR: cv.dotsp.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sc.h s0, s1, s2
# CHECK-INSTR: cv.dotsp.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sc.b
@@ -2437,22 +2436,22 @@ cv.dotsp.sc.h s0, s1, s2
cv.dotsp.sc.b t0, t1, t2
# CHECK-INSTR: cv.dotsp.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sc.b t3, t4, t5
# CHECK-INSTR: cv.dotsp.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sc.b a0, a1, a2
# CHECK-INSTR: cv.dotsp.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sc.b s0, s1, s2
# CHECK-INSTR: cv.dotsp.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sci.h
@@ -2461,22 +2460,22 @@ cv.dotsp.sc.b s0, s1, s2
cv.dotsp.sci.h t0, t1, 0
# CHECK-INSTR: cv.dotsp.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sci.h t3, t4, -32
# CHECK-INSTR: cv.dotsp.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sci.h a0, a1, 7
# CHECK-INSTR: cv.dotsp.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x92]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sci.h s0, s1, -1
# CHECK-INSTR: cv.dotsp.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x93]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.dotsp.sci.b
@@ -2485,22 +2484,22 @@ cv.dotsp.sci.h s0, s1, -1
cv.dotsp.sci.b t0, t1, 0
# CHECK-INSTR: cv.dotsp.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x90]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sci.b t3, t4, -32
# CHECK-INSTR: cv.dotsp.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x91]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sci.b a0, a1, 7
# CHECK-INSTR: cv.dotsp.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x92]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.dotsp.sci.b s0, s1, -1
# CHECK-INSTR: cv.dotsp.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x93]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotup.h
@@ -2509,22 +2508,22 @@ cv.dotsp.sci.b s0, s1, -1
cv.sdotup.h t0, t1, t2
# CHECK-INSTR: cv.sdotup.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.h t3, t4, t5
# CHECK-INSTR: cv.sdotup.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.h a0, a1, a2
# CHECK-INSTR: cv.sdotup.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.h s0, s1, s2
# CHECK-INSTR: cv.sdotup.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotup.b
@@ -2533,22 +2532,22 @@ cv.sdotup.h s0, s1, s2
cv.sdotup.b t0, t1, t2
# CHECK-INSTR: cv.sdotup.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.b t3, t4, t5
# CHECK-INSTR: cv.sdotup.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.b a0, a1, a2
# CHECK-INSTR: cv.sdotup.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.b s0, s1, s2
# CHECK-INSTR: cv.sdotup.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sc.h
@@ -2557,22 +2556,22 @@ cv.sdotup.b s0, s1, s2
cv.sdotup.sc.h t0, t1, t2
# CHECK-INSTR: cv.sdotup.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sc.h t3, t4, t5
# CHECK-INSTR: cv.sdotup.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sc.h a0, a1, a2
# CHECK-INSTR: cv.sdotup.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sc.h s0, s1, s2
# CHECK-INSTR: cv.sdotup.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sc.b
@@ -2581,22 +2580,22 @@ cv.sdotup.sc.h s0, s1, s2
cv.sdotup.sc.b t0, t1, t2
# CHECK-INSTR: cv.sdotup.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sc.b t3, t4, t5
# CHECK-INSTR: cv.sdotup.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sc.b a0, a1, a2
# CHECK-INSTR: cv.sdotup.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sc.b s0, s1, s2
# CHECK-INSTR: cv.sdotup.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sci.h
@@ -2605,22 +2604,22 @@ cv.sdotup.sc.b s0, s1, s2
cv.sdotup.sci.h t0, t1, 0
# CHECK-INSTR: cv.sdotup.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sci.h t3, t4, 32
# CHECK-INSTR: cv.sdotup.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sci.h a0, a1, 7
# CHECK-INSTR: cv.sdotup.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x9a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sci.h s0, s1, 63
# CHECK-INSTR: cv.sdotup.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x9b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotup.sci.b
@@ -2629,22 +2628,22 @@ cv.sdotup.sci.h s0, s1, 63
cv.sdotup.sci.b t0, t1, 0
# CHECK-INSTR: cv.sdotup.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x98]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sci.b t3, t4, 32
# CHECK-INSTR: cv.sdotup.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x99]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sci.b a0, a1, 7
# CHECK-INSTR: cv.sdotup.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x9a]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotup.sci.b s0, s1, 63
# CHECK-INSTR: cv.sdotup.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x9b]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.h
@@ -2653,22 +2652,22 @@ cv.sdotup.sci.b s0, s1, 63
cv.sdotusp.h t0, t1, t2
# CHECK-INSTR: cv.sdotusp.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.h t3, t4, t5
# CHECK-INSTR: cv.sdotusp.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.h a0, a1, a2
# CHECK-INSTR: cv.sdotusp.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.h s0, s1, s2
# CHECK-INSTR: cv.sdotusp.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.b
@@ -2677,22 +2676,22 @@ cv.sdotusp.h s0, s1, s2
cv.sdotusp.b t0, t1, t2
# CHECK-INSTR: cv.sdotusp.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.b t3, t4, t5
# CHECK-INSTR: cv.sdotusp.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.b a0, a1, a2
# CHECK-INSTR: cv.sdotusp.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.b s0, s1, s2
# CHECK-INSTR: cv.sdotusp.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sc.h
@@ -2701,22 +2700,22 @@ cv.sdotusp.b s0, s1, s2
cv.sdotusp.sc.h t0, t1, t2
# CHECK-INSTR: cv.sdotusp.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sc.h t3, t4, t5
# CHECK-INSTR: cv.sdotusp.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sc.h a0, a1, a2
# CHECK-INSTR: cv.sdotusp.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sc.h s0, s1, s2
# CHECK-INSTR: cv.sdotusp.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sc.b
@@ -2725,22 +2724,22 @@ cv.sdotusp.sc.h s0, s1, s2
cv.sdotusp.sc.b t0, t1, t2
# CHECK-INSTR: cv.sdotusp.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sc.b t3, t4, t5
# CHECK-INSTR: cv.sdotusp.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sc.b a0, a1, a2
# CHECK-INSTR: cv.sdotusp.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sc.b s0, s1, s2
# CHECK-INSTR: cv.sdotusp.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sci.h
@@ -2749,22 +2748,22 @@ cv.sdotusp.sc.b s0, s1, s2
cv.sdotusp.sci.h t0, t1, 0
# CHECK-INSTR: cv.sdotusp.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sci.h t3, t4, -32
# CHECK-INSTR: cv.sdotusp.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sci.h a0, a1, 7
# CHECK-INSTR: cv.sdotusp.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0xa2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sci.h s0, s1, -1
# CHECK-INSTR: cv.sdotusp.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0xa3]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotusp.sci.b
@@ -2773,22 +2772,22 @@ cv.sdotusp.sci.h s0, s1, -1
cv.sdotusp.sci.b t0, t1, 0
# CHECK-INSTR: cv.sdotusp.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0xa0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sci.b t3, t4, -32
# CHECK-INSTR: cv.sdotusp.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0xa1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sci.b a0, a1, 7
# CHECK-INSTR: cv.sdotusp.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0xa2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotusp.sci.b s0, s1, -1
# CHECK-INSTR: cv.sdotusp.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0xa3]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.h
@@ -2797,22 +2796,22 @@ cv.sdotusp.sci.b s0, s1, -1
cv.sdotsp.h t0, t1, t2
# CHECK-INSTR: cv.sdotsp.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.h t3, t4, t5
# CHECK-INSTR: cv.sdotsp.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.h a0, a1, a2
# CHECK-INSTR: cv.sdotsp.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.h s0, s1, s2
# CHECK-INSTR: cv.sdotsp.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.b
@@ -2821,22 +2820,22 @@ cv.sdotsp.h s0, s1, s2
cv.sdotsp.b t0, t1, t2
# CHECK-INSTR: cv.sdotsp.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.b t3, t4, t5
# CHECK-INSTR: cv.sdotsp.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.b a0, a1, a2
# CHECK-INSTR: cv.sdotsp.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.b s0, s1, s2
# CHECK-INSTR: cv.sdotsp.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sc.h
@@ -2845,22 +2844,22 @@ cv.sdotsp.b s0, s1, s2
cv.sdotsp.sc.h t0, t1, t2
# CHECK-INSTR: cv.sdotsp.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sc.h t3, t4, t5
# CHECK-INSTR: cv.sdotsp.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sc.h a0, a1, a2
# CHECK-INSTR: cv.sdotsp.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sc.h s0, s1, s2
# CHECK-INSTR: cv.sdotsp.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sc.b
@@ -2869,22 +2868,22 @@ cv.sdotsp.sc.h s0, s1, s2
cv.sdotsp.sc.b t0, t1, t2
# CHECK-INSTR: cv.sdotsp.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sc.b t3, t4, t5
# CHECK-INSTR: cv.sdotsp.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sc.b a0, a1, a2
# CHECK-INSTR: cv.sdotsp.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sc.b s0, s1, s2
# CHECK-INSTR: cv.sdotsp.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sci.h
@@ -2893,22 +2892,22 @@ cv.sdotsp.sc.b s0, s1, s2
cv.sdotsp.sci.h t0, t1, 0
# CHECK-INSTR: cv.sdotsp.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sci.h t3, t4, -32
# CHECK-INSTR: cv.sdotsp.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sci.h a0, a1, 7
# CHECK-INSTR: cv.sdotsp.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0xaa]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sci.h s0, s1, -1
# CHECK-INSTR: cv.sdotsp.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0xab]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sdotsp.sci.b
@@ -2917,22 +2916,22 @@ cv.sdotsp.sci.h s0, s1, -1
cv.sdotsp.sci.b t0, t1, 0
# CHECK-INSTR: cv.sdotsp.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0xa8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sci.b t3, t4, -32
# CHECK-INSTR: cv.sdotsp.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0xa9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sci.b a0, a1, 7
# CHECK-INSTR: cv.sdotsp.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0xaa]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sdotsp.sci.b s0, s1, -1
# CHECK-INSTR: cv.sdotsp.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0xab]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.extract.h
@@ -2941,22 +2940,22 @@ cv.sdotsp.sci.b s0, s1, -1
cv.extract.h t0, t1, 0
# CHECK-INSTR: cv.extract.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x02,0x03,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extract.h t3, t4, 1
# CHECK-INSTR: cv.extract.h t3, t4, 1
# CHECK-ENCODING: [0x7b,0x8e,0x0e,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extract.h a0, a1, 0
# CHECK-INSTR: cv.extract.h a0, a1, 0
# CHECK-ENCODING: [0x7b,0x85,0x05,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extract.h s0, s1, 1
# CHECK-INSTR: cv.extract.h s0, s1, 1
# CHECK-ENCODING: [0x7b,0x84,0x04,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.extract.b
@@ -2965,22 +2964,22 @@ cv.extract.h s0, s1, 1
cv.extract.b t0, t1, 0
# CHECK-INSTR: cv.extract.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x12,0x03,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extract.b t3, t4, 1
# CHECK-INSTR: cv.extract.b t3, t4, 1
# CHECK-ENCODING: [0x7b,0x9e,0x0e,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extract.b a0, a1, 2
# CHECK-INSTR: cv.extract.b a0, a1, 2
# CHECK-ENCODING: [0x7b,0x95,0x15,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extract.b s0, s1, 3
# CHECK-INSTR: cv.extract.b s0, s1, 3
# CHECK-ENCODING: [0x7b,0x94,0x14,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.extractu.h
@@ -2989,22 +2988,22 @@ cv.extract.b s0, s1, 3
cv.extractu.h t0, t1, 0
# CHECK-INSTR: cv.extractu.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x22,0x03,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extractu.h t3, t4, 1
# CHECK-INSTR: cv.extractu.h t3, t4, 1
# CHECK-ENCODING: [0x7b,0xae,0x0e,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extractu.h a0, a1, 0
# CHECK-INSTR: cv.extractu.h a0, a1, 0
# CHECK-ENCODING: [0x7b,0xa5,0x05,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extractu.h s0, s1, 1
# CHECK-INSTR: cv.extractu.h s0, s1, 1
# CHECK-ENCODING: [0x7b,0xa4,0x04,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.extractu.b
@@ -3013,22 +3012,22 @@ cv.extractu.h s0, s1, 1
cv.extractu.b t0, t1, 0
# CHECK-INSTR: cv.extractu.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x32,0x03,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extractu.b t3, t4, 1
# CHECK-INSTR: cv.extractu.b t3, t4, 1
# CHECK-ENCODING: [0x7b,0xbe,0x0e,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extractu.b a0, a1, 2
# CHECK-INSTR: cv.extractu.b a0, a1, 2
# CHECK-ENCODING: [0x7b,0xb5,0x15,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.extractu.b s0, s1, 3
# CHECK-INSTR: cv.extractu.b s0, s1, 3
# CHECK-ENCODING: [0x7b,0xb4,0x14,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.insert.h
@@ -3037,22 +3036,22 @@ cv.extractu.b s0, s1, 3
cv.insert.h t0, t1, 0
# CHECK-INSTR: cv.insert.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x42,0x03,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.insert.h t3, t4, 1
# CHECK-INSTR: cv.insert.h t3, t4, 1
# CHECK-ENCODING: [0x7b,0xce,0x0e,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.insert.h a0, a1, 0
# CHECK-INSTR: cv.insert.h a0, a1, 0
# CHECK-ENCODING: [0x7b,0xc5,0x05,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.insert.h s0, s1, 1
# CHECK-INSTR: cv.insert.h s0, s1, 1
# CHECK-ENCODING: [0x7b,0xc4,0x04,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.insert.b
@@ -3061,22 +3060,22 @@ cv.insert.h s0, s1, 1
cv.insert.b t0, t1, 0
# CHECK-INSTR: cv.insert.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x52,0x03,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.insert.b t3, t4, 1
# CHECK-INSTR: cv.insert.b t3, t4, 1
# CHECK-ENCODING: [0x7b,0xde,0x0e,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.insert.b a0, a1, 2
# CHECK-INSTR: cv.insert.b a0, a1, 2
# CHECK-ENCODING: [0x7b,0xd5,0x15,0xb8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.insert.b s0, s1, 3
# CHECK-INSTR: cv.insert.b s0, s1, 3
# CHECK-ENCODING: [0x7b,0xd4,0x14,0xba]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffle.h
@@ -3085,22 +3084,22 @@ cv.insert.b s0, s1, 3
cv.shuffle.h t0, t1, t2
# CHECK-INSTR: cv.shuffle.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.h t3, t4, t5
# CHECK-INSTR: cv.shuffle.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0xc1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.h a0, a1, a2
# CHECK-INSTR: cv.shuffle.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.h s0, s1, s2
# CHECK-INSTR: cv.shuffle.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0xc1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffle.b
@@ -3109,22 +3108,22 @@ cv.shuffle.h s0, s1, s2
cv.shuffle.b t0, t1, t2
# CHECK-INSTR: cv.shuffle.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.b t3, t4, t5
# CHECK-INSTR: cv.shuffle.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0xc1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.b a0, a1, a2
# CHECK-INSTR: cv.shuffle.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.b s0, s1, s2
# CHECK-INSTR: cv.shuffle.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0xc1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffle.sci.h
@@ -3133,22 +3132,22 @@ cv.shuffle.b s0, s1, s2
cv.shuffle.sci.h t0, t1, 0
# CHECK-INSTR: cv.shuffle.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.sci.h t3, t4, 1
# CHECK-INSTR: cv.shuffle.sci.h t3, t4, 1
# CHECK-ENCODING: [0x7b,0xee,0x0e,0xc2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.sci.h a0, a1, 2
# CHECK-INSTR: cv.shuffle.sci.h a0, a1, 2
# CHECK-ENCODING: [0x7b,0xe5,0x15,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle.sci.h s0, s1, 3
# CHECK-INSTR: cv.shuffle.sci.h s0, s1, 3
# CHECK-ENCODING: [0x7b,0xe4,0x14,0xc2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffleI0.sci.b
@@ -3157,22 +3156,22 @@ cv.shuffle.sci.h s0, s1, 3
cv.shufflei0.sci.b t0, t1, 0
# CHECK-INSTR: cv.shufflei0.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0xc0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei0.sci.b t3, t4, 32
# CHECK-INSTR: cv.shufflei0.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0xc1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei0.sci.b a0, a1, 7
# CHECK-INSTR: cv.shufflei0.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0xc2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei0.sci.b s0, s1, 63
# CHECK-INSTR: cv.shufflei0.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0xc3]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffleI1.sci.b
@@ -3181,22 +3180,22 @@ cv.shufflei0.sci.b s0, s1, 63
cv.shufflei1.sci.b t0, t1, 0
# CHECK-INSTR: cv.shufflei1.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0xc8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei1.sci.b t3, t4, 32
# CHECK-INSTR: cv.shufflei1.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0xc9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei1.sci.b a0, a1, 7
# CHECK-INSTR: cv.shufflei1.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0xca]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei1.sci.b s0, s1, 63
# CHECK-INSTR: cv.shufflei1.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0xcb]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffleI2.sci.b
@@ -3205,22 +3204,22 @@ cv.shufflei1.sci.b s0, s1, 63
cv.shufflei2.sci.b t0, t1, 0
# CHECK-INSTR: cv.shufflei2.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0xd0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei2.sci.b t3, t4, 32
# CHECK-INSTR: cv.shufflei2.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0xd1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei2.sci.b a0, a1, 7
# CHECK-INSTR: cv.shufflei2.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0xd2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei2.sci.b s0, s1, 63
# CHECK-INSTR: cv.shufflei2.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0xd3]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffleI3.sci.b
@@ -3229,22 +3228,22 @@ cv.shufflei2.sci.b s0, s1, 63
cv.shufflei3.sci.b t0, t1, 0
# CHECK-INSTR: cv.shufflei3.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0xd8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei3.sci.b t3, t4, 32
# CHECK-INSTR: cv.shufflei3.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0xd9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei3.sci.b a0, a1, 7
# CHECK-INSTR: cv.shufflei3.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0xda]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shufflei3.sci.b s0, s1, 63
# CHECK-INSTR: cv.shufflei3.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0xdb]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffle2.h
@@ -3253,22 +3252,22 @@ cv.shufflei3.sci.b s0, s1, 63
cv.shuffle2.h t0, t1, t2
# CHECK-INSTR: cv.shuffle2.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle2.h t3, t4, t5
# CHECK-INSTR: cv.shuffle2.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0xe1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle2.h a0, a1, a2
# CHECK-INSTR: cv.shuffle2.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle2.h s0, s1, s2
# CHECK-INSTR: cv.shuffle2.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0xe1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.shuffle2.b
@@ -3277,22 +3276,22 @@ cv.shuffle2.h s0, s1, s2
cv.shuffle2.b t0, t1, t2
# CHECK-INSTR: cv.shuffle2.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle2.b t3, t4, t5
# CHECK-INSTR: cv.shuffle2.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0xe1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle2.b a0, a1, a2
# CHECK-INSTR: cv.shuffle2.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0xe0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.shuffle2.b s0, s1, s2
# CHECK-INSTR: cv.shuffle2.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0xe1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.pack
@@ -3301,22 +3300,22 @@ cv.shuffle2.b s0, s1, s2
cv.pack t0, t1, t2
# CHECK-INSTR: cv.pack t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0xf0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.pack t3, t4, t5
# CHECK-INSTR: cv.pack t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0xf1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.pack a0, a1, a2
# CHECK-INSTR: cv.pack a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0xf0]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.pack s0, s1, s2
# CHECK-INSTR: cv.pack s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0xf1]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.pack.h
@@ -3325,22 +3324,22 @@ cv.pack s0, s1, s2
cv.pack.h t0, t1, t2
# CHECK-INSTR: cv.pack.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0xf2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.pack.h t3, t4, t5
# CHECK-INSTR: cv.pack.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0xf3]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.pack.h a0, a1, a2
# CHECK-INSTR: cv.pack.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0xf2]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.pack.h s0, s1, s2
# CHECK-INSTR: cv.pack.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0xf3]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.packhi.b
@@ -3349,22 +3348,22 @@ cv.pack.h s0, s1, s2
cv.packhi.b t0, t1, t2
# CHECK-INSTR: cv.packhi.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0xfa]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.packhi.b t3, t4, t5
# CHECK-INSTR: cv.packhi.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0xfb]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.packhi.b a0, a1, a2
# CHECK-INSTR: cv.packhi.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0xfa]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.packhi.b s0, s1, s2
# CHECK-INSTR: cv.packhi.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0xfb]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.packlo.b
@@ -3373,22 +3372,22 @@ cv.packhi.b s0, s1, s2
cv.packlo.b t0, t1, t2
# CHECK-INSTR: cv.packlo.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0xf8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.packlo.b t3, t4, t5
# CHECK-INSTR: cv.packlo.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0xf9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.packlo.b a0, a1, a2
# CHECK-INSTR: cv.packlo.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0xf8]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.packlo.b s0, s1, s2
# CHECK-INSTR: cv.packlo.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0xf9]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.h
@@ -3397,22 +3396,22 @@ cv.packlo.b s0, s1, s2
cv.cmpeq.h t0, t1, t2
# CHECK-INSTR: cv.cmpeq.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.h t3, t4, t5
# CHECK-INSTR: cv.cmpeq.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.h a0, a1, a2
# CHECK-INSTR: cv.cmpeq.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.h s0, s1, s2
# CHECK-INSTR: cv.cmpeq.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.b
@@ -3421,22 +3420,22 @@ cv.cmpeq.h s0, s1, s2
cv.cmpeq.b t0, t1, t2
# CHECK-INSTR: cv.cmpeq.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.b t3, t4, t5
# CHECK-INSTR: cv.cmpeq.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.b a0, a1, a2
# CHECK-INSTR: cv.cmpeq.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.b s0, s1, s2
# CHECK-INSTR: cv.cmpeq.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sc.h
@@ -3445,22 +3444,22 @@ cv.cmpeq.b s0, s1, s2
cv.cmpeq.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpeq.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpeq.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpeq.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpeq.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sc.b
@@ -3469,22 +3468,22 @@ cv.cmpeq.sc.h s0, s1, s2
cv.cmpeq.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpeq.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpeq.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpeq.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpeq.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sci.h
@@ -3493,22 +3492,22 @@ cv.cmpeq.sc.b s0, s1, s2
cv.cmpeq.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpeq.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sci.h t3, t4, -32
# CHECK-INSTR: cv.cmpeq.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpeq.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x06]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sci.h s0, s1, -1
# CHECK-INSTR: cv.cmpeq.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x07]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpeq.sci.b
@@ -3517,22 +3516,22 @@ cv.cmpeq.sci.h s0, s1, -1
cv.cmpeq.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpeq.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x04]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sci.b t3, t4, -32
# CHECK-INSTR: cv.cmpeq.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x05]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpeq.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x06]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpeq.sci.b s0, s1, -1
# CHECK-INSTR: cv.cmpeq.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x07]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpne.h
@@ -3541,22 +3540,22 @@ cv.cmpeq.sci.b s0, s1, -1
cv.cmpne.h t0, t1, t2
# CHECK-INSTR: cv.cmpne.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.h t3, t4, t5
# CHECK-INSTR: cv.cmpne.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.h a0, a1, a2
# CHECK-INSTR: cv.cmpne.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.h s0, s1, s2
# CHECK-INSTR: cv.cmpne.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpne.b
@@ -3565,22 +3564,22 @@ cv.cmpne.h s0, s1, s2
cv.cmpne.b t0, t1, t2
# CHECK-INSTR: cv.cmpne.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.b t3, t4, t5
# CHECK-INSTR: cv.cmpne.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.b a0, a1, a2
# CHECK-INSTR: cv.cmpne.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.b s0, s1, s2
# CHECK-INSTR: cv.cmpne.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sc.h
@@ -3589,22 +3588,22 @@ cv.cmpne.b s0, s1, s2
cv.cmpne.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpne.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpne.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpne.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpne.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sc.b
@@ -3613,22 +3612,22 @@ cv.cmpne.sc.h s0, s1, s2
cv.cmpne.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpne.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpne.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpne.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpne.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sci.h
@@ -3637,22 +3636,22 @@ cv.cmpne.sc.b s0, s1, s2
cv.cmpne.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpne.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sci.h t3, t4, -32
# CHECK-INSTR: cv.cmpne.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpne.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x0e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sci.h s0, s1, -1
# CHECK-INSTR: cv.cmpne.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x0f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpne.sci.b
@@ -3661,22 +3660,22 @@ cv.cmpne.sci.h s0, s1, -1
cv.cmpne.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpne.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x0c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sci.b t3, t4, -32
# CHECK-INSTR: cv.cmpne.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x0d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpne.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x0e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpne.sci.b s0, s1, -1
# CHECK-INSTR: cv.cmpne.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x0f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.h
@@ -3685,22 +3684,22 @@ cv.cmpne.sci.b s0, s1, -1
cv.cmpgt.h t0, t1, t2
# CHECK-INSTR: cv.cmpgt.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.h t3, t4, t5
# CHECK-INSTR: cv.cmpgt.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.h a0, a1, a2
# CHECK-INSTR: cv.cmpgt.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.h s0, s1, s2
# CHECK-INSTR: cv.cmpgt.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.b
@@ -3709,22 +3708,22 @@ cv.cmpgt.h s0, s1, s2
cv.cmpgt.b t0, t1, t2
# CHECK-INSTR: cv.cmpgt.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.b t3, t4, t5
# CHECK-INSTR: cv.cmpgt.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.b a0, a1, a2
# CHECK-INSTR: cv.cmpgt.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.b s0, s1, s2
# CHECK-INSTR: cv.cmpgt.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sc.h
@@ -3733,22 +3732,22 @@ cv.cmpgt.b s0, s1, s2
cv.cmpgt.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpgt.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpgt.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpgt.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpgt.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sc.b
@@ -3757,22 +3756,22 @@ cv.cmpgt.sc.h s0, s1, s2
cv.cmpgt.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpgt.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpgt.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpgt.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpgt.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sci.h
@@ -3781,22 +3780,22 @@ cv.cmpgt.sc.b s0, s1, s2
cv.cmpgt.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpgt.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sci.h t3, t4, -32
# CHECK-INSTR: cv.cmpgt.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpgt.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x16]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sci.h s0, s1, -1
# CHECK-INSTR: cv.cmpgt.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x17]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgt.sci.b
@@ -3805,22 +3804,22 @@ cv.cmpgt.sci.h s0, s1, -1
cv.cmpgt.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpgt.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x14]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sci.b t3, t4, -32
# CHECK-INSTR: cv.cmpgt.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x15]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpgt.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x16]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgt.sci.b s0, s1, -1
# CHECK-INSTR: cv.cmpgt.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x17]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpge.h
@@ -3829,22 +3828,22 @@ cv.cmpgt.sci.b s0, s1, -1
cv.cmpge.h t0, t1, t2
# CHECK-INSTR: cv.cmpge.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.h t3, t4, t5
# CHECK-INSTR: cv.cmpge.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.h a0, a1, a2
# CHECK-INSTR: cv.cmpge.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.h s0, s1, s2
# CHECK-INSTR: cv.cmpge.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpge.b
@@ -3853,22 +3852,22 @@ cv.cmpge.h s0, s1, s2
cv.cmpge.b t0, t1, t2
# CHECK-INSTR: cv.cmpge.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.b t3, t4, t5
# CHECK-INSTR: cv.cmpge.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.b a0, a1, a2
# CHECK-INSTR: cv.cmpge.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.b s0, s1, s2
# CHECK-INSTR: cv.cmpge.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sc.h
@@ -3877,22 +3876,22 @@ cv.cmpge.b s0, s1, s2
cv.cmpge.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpge.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpge.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpge.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpge.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sc.b
@@ -3901,22 +3900,22 @@ cv.cmpge.sc.h s0, s1, s2
cv.cmpge.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpge.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpge.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpge.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpge.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sci.h
@@ -3925,22 +3924,22 @@ cv.cmpge.sc.b s0, s1, s2
cv.cmpge.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpge.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sci.h t3, t4, -32
# CHECK-INSTR: cv.cmpge.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpge.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x1e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sci.h s0, s1, -1
# CHECK-INSTR: cv.cmpge.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x1f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpge.sci.b
@@ -3949,22 +3948,22 @@ cv.cmpge.sci.h s0, s1, -1
cv.cmpge.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpge.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x1c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sci.b t3, t4, -32
# CHECK-INSTR: cv.cmpge.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x1d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpge.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x1e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpge.sci.b s0, s1, -1
# CHECK-INSTR: cv.cmpge.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x1f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmplt.h
@@ -3973,22 +3972,22 @@ cv.cmpge.sci.b s0, s1, -1
cv.cmplt.h t0, t1, t2
# CHECK-INSTR: cv.cmplt.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.h t3, t4, t5
# CHECK-INSTR: cv.cmplt.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.h a0, a1, a2
# CHECK-INSTR: cv.cmplt.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.h s0, s1, s2
# CHECK-INSTR: cv.cmplt.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmplt.b
@@ -3997,22 +3996,22 @@ cv.cmplt.h s0, s1, s2
cv.cmplt.b t0, t1, t2
# CHECK-INSTR: cv.cmplt.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.b t3, t4, t5
# CHECK-INSTR: cv.cmplt.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.b a0, a1, a2
# CHECK-INSTR: cv.cmplt.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.b s0, s1, s2
# CHECK-INSTR: cv.cmplt.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sc.h
@@ -4021,22 +4020,22 @@ cv.cmplt.b s0, s1, s2
cv.cmplt.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmplt.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmplt.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmplt.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmplt.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sc.b
@@ -4045,22 +4044,22 @@ cv.cmplt.sc.h s0, s1, s2
cv.cmplt.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmplt.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmplt.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmplt.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmplt.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sci.h
@@ -4069,22 +4068,22 @@ cv.cmplt.sc.b s0, s1, s2
cv.cmplt.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmplt.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sci.h t3, t4, -32
# CHECK-INSTR: cv.cmplt.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmplt.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x26]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sci.h s0, s1, -1
# CHECK-INSTR: cv.cmplt.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x27]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmplt.sci.b
@@ -4093,22 +4092,22 @@ cv.cmplt.sci.h s0, s1, -1
cv.cmplt.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmplt.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x24]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sci.b t3, t4, -32
# CHECK-INSTR: cv.cmplt.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x25]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmplt.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x26]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmplt.sci.b s0, s1, -1
# CHECK-INSTR: cv.cmplt.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x27]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmple.h
@@ -4117,22 +4116,22 @@ cv.cmplt.sci.b s0, s1, -1
cv.cmple.h t0, t1, t2
# CHECK-INSTR: cv.cmple.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.h t3, t4, t5
# CHECK-INSTR: cv.cmple.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.h a0, a1, a2
# CHECK-INSTR: cv.cmple.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.h s0, s1, s2
# CHECK-INSTR: cv.cmple.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmple.b
@@ -4141,22 +4140,22 @@ cv.cmple.h s0, s1, s2
cv.cmple.b t0, t1, t2
# CHECK-INSTR: cv.cmple.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.b t3, t4, t5
# CHECK-INSTR: cv.cmple.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.b a0, a1, a2
# CHECK-INSTR: cv.cmple.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.b s0, s1, s2
# CHECK-INSTR: cv.cmple.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmple.sc.h
@@ -4165,22 +4164,22 @@ cv.cmple.b s0, s1, s2
cv.cmple.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmple.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmple.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmple.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmple.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmple.sc.b
@@ -4189,22 +4188,22 @@ cv.cmple.sc.h s0, s1, s2
cv.cmple.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmple.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmple.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmple.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmple.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmple.sci.h
@@ -4213,22 +4212,22 @@ cv.cmple.sc.b s0, s1, s2
cv.cmple.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmple.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sci.h t3, t4, -32
# CHECK-INSTR: cv.cmple.sci.h t3, t4, -32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmple.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x2e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sci.h s0, s1, -1
# CHECK-INSTR: cv.cmple.sci.h s0, s1, -1
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x2f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmple.sci.b
@@ -4237,22 +4236,22 @@ cv.cmple.sci.h s0, s1, -1
cv.cmple.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmple.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x2c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sci.b t3, t4, -32
# CHECK-INSTR: cv.cmple.sci.b t3, t4, -32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x2d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmple.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x2e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmple.sci.b s0, s1, -1
# CHECK-INSTR: cv.cmple.sci.b s0, s1, -1
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x2f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.h
@@ -4261,22 +4260,22 @@ cv.cmple.sci.b s0, s1, -1
cv.cmpgtu.h t0, t1, t2
# CHECK-INSTR: cv.cmpgtu.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.h t3, t4, t5
# CHECK-INSTR: cv.cmpgtu.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.h a0, a1, a2
# CHECK-INSTR: cv.cmpgtu.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.h s0, s1, s2
# CHECK-INSTR: cv.cmpgtu.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.b
@@ -4285,22 +4284,22 @@ cv.cmpgtu.h s0, s1, s2
cv.cmpgtu.b t0, t1, t2
# CHECK-INSTR: cv.cmpgtu.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.b t3, t4, t5
# CHECK-INSTR: cv.cmpgtu.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.b a0, a1, a2
# CHECK-INSTR: cv.cmpgtu.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.b s0, s1, s2
# CHECK-INSTR: cv.cmpgtu.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sc.h
@@ -4309,22 +4308,22 @@ cv.cmpgtu.b s0, s1, s2
cv.cmpgtu.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpgtu.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpgtu.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpgtu.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpgtu.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sc.b
@@ -4333,22 +4332,22 @@ cv.cmpgtu.sc.h s0, s1, s2
cv.cmpgtu.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpgtu.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpgtu.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpgtu.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpgtu.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sci.h
@@ -4357,22 +4356,22 @@ cv.cmpgtu.sc.b s0, s1, s2
cv.cmpgtu.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpgtu.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sci.h t3, t4, 32
# CHECK-INSTR: cv.cmpgtu.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpgtu.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x36]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sci.h s0, s1, 63
# CHECK-INSTR: cv.cmpgtu.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x37]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgtu.sci.b
@@ -4381,22 +4380,22 @@ cv.cmpgtu.sci.h s0, s1, 63
cv.cmpgtu.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpgtu.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x34]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sci.b t3, t4, 32
# CHECK-INSTR: cv.cmpgtu.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x35]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpgtu.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x36]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgtu.sci.b s0, s1, 63
# CHECK-INSTR: cv.cmpgtu.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x37]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.h
@@ -4405,22 +4404,22 @@ cv.cmpgtu.sci.b s0, s1, 63
cv.cmpgeu.h t0, t1, t2
# CHECK-INSTR: cv.cmpgeu.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.h t3, t4, t5
# CHECK-INSTR: cv.cmpgeu.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.h a0, a1, a2
# CHECK-INSTR: cv.cmpgeu.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.h s0, s1, s2
# CHECK-INSTR: cv.cmpgeu.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.b
@@ -4429,22 +4428,22 @@ cv.cmpgeu.h s0, s1, s2
cv.cmpgeu.b t0, t1, t2
# CHECK-INSTR: cv.cmpgeu.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.b t3, t4, t5
# CHECK-INSTR: cv.cmpgeu.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.b a0, a1, a2
# CHECK-INSTR: cv.cmpgeu.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.b s0, s1, s2
# CHECK-INSTR: cv.cmpgeu.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sc.h
@@ -4453,22 +4452,22 @@ cv.cmpgeu.b s0, s1, s2
cv.cmpgeu.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpgeu.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpgeu.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpgeu.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpgeu.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sc.b
@@ -4477,22 +4476,22 @@ cv.cmpgeu.sc.h s0, s1, s2
cv.cmpgeu.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpgeu.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpgeu.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpgeu.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpgeu.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sci.h
@@ -4501,22 +4500,22 @@ cv.cmpgeu.sc.b s0, s1, s2
cv.cmpgeu.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpgeu.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sci.h t3, t4, 32
# CHECK-INSTR: cv.cmpgeu.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpgeu.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sci.h s0, s1, 63
# CHECK-INSTR: cv.cmpgeu.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x3f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpgeu.sci.b
@@ -4525,22 +4524,22 @@ cv.cmpgeu.sci.h s0, s1, 63
cv.cmpgeu.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpgeu.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x3c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sci.b t3, t4, 32
# CHECK-INSTR: cv.cmpgeu.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x3d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpgeu.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x3e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpgeu.sci.b s0, s1, 63
# CHECK-INSTR: cv.cmpgeu.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x3f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.h
@@ -4549,22 +4548,22 @@ cv.cmpgeu.sci.b s0, s1, 63
cv.cmpltu.h t0, t1, t2
# CHECK-INSTR: cv.cmpltu.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.h t3, t4, t5
# CHECK-INSTR: cv.cmpltu.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.h a0, a1, a2
# CHECK-INSTR: cv.cmpltu.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.h s0, s1, s2
# CHECK-INSTR: cv.cmpltu.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.b
@@ -4573,22 +4572,22 @@ cv.cmpltu.h s0, s1, s2
cv.cmpltu.b t0, t1, t2
# CHECK-INSTR: cv.cmpltu.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.b t3, t4, t5
# CHECK-INSTR: cv.cmpltu.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.b a0, a1, a2
# CHECK-INSTR: cv.cmpltu.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.b s0, s1, s2
# CHECK-INSTR: cv.cmpltu.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sc.h
@@ -4597,22 +4596,22 @@ cv.cmpltu.b s0, s1, s2
cv.cmpltu.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpltu.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpltu.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpltu.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpltu.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sc.b
@@ -4621,22 +4620,22 @@ cv.cmpltu.sc.h s0, s1, s2
cv.cmpltu.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpltu.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpltu.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpltu.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpltu.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sci.h
@@ -4645,22 +4644,22 @@ cv.cmpltu.sc.b s0, s1, s2
cv.cmpltu.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpltu.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sci.h t3, t4, 32
# CHECK-INSTR: cv.cmpltu.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpltu.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x46]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sci.h s0, s1, 63
# CHECK-INSTR: cv.cmpltu.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x47]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpltu.sci.b
@@ -4669,22 +4668,22 @@ cv.cmpltu.sci.h s0, s1, 63
cv.cmpltu.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpltu.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x44]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sci.b t3, t4, 32
# CHECK-INSTR: cv.cmpltu.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x45]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpltu.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x46]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpltu.sci.b s0, s1, 63
# CHECK-INSTR: cv.cmpltu.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x47]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.h
@@ -4693,22 +4692,22 @@ cv.cmpltu.sci.b s0, s1, 63
cv.cmpleu.h t0, t1, t2
# CHECK-INSTR: cv.cmpleu.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.h t3, t4, t5
# CHECK-INSTR: cv.cmpleu.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.h a0, a1, a2
# CHECK-INSTR: cv.cmpleu.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.h s0, s1, s2
# CHECK-INSTR: cv.cmpleu.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.b
@@ -4717,22 +4716,22 @@ cv.cmpleu.h s0, s1, s2
cv.cmpleu.b t0, t1, t2
# CHECK-INSTR: cv.cmpleu.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x12,0x73,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.b t3, t4, t5
# CHECK-INSTR: cv.cmpleu.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0x9e,0xee,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.b a0, a1, a2
# CHECK-INSTR: cv.cmpleu.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0x95,0xc5,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.b s0, s1, s2
# CHECK-INSTR: cv.cmpleu.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0x94,0x24,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sc.h
@@ -4741,22 +4740,22 @@ cv.cmpleu.b s0, s1, s2
cv.cmpleu.sc.h t0, t1, t2
# CHECK-INSTR: cv.cmpleu.sc.h t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sc.h t3, t4, t5
# CHECK-INSTR: cv.cmpleu.sc.h t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sc.h a0, a1, a2
# CHECK-INSTR: cv.cmpleu.sc.h a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sc.h s0, s1, s2
# CHECK-INSTR: cv.cmpleu.sc.h s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sc.b
@@ -4765,22 +4764,22 @@ cv.cmpleu.sc.h s0, s1, s2
cv.cmpleu.sc.b t0, t1, t2
# CHECK-INSTR: cv.cmpleu.sc.b t0, t1, t2
# CHECK-ENCODING: [0xfb,0x52,0x73,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sc.b t3, t4, t5
# CHECK-INSTR: cv.cmpleu.sc.b t3, t4, t5
# CHECK-ENCODING: [0x7b,0xde,0xee,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sc.b a0, a1, a2
# CHECK-INSTR: cv.cmpleu.sc.b a0, a1, a2
# CHECK-ENCODING: [0x7b,0xd5,0xc5,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sc.b s0, s1, s2
# CHECK-INSTR: cv.cmpleu.sc.b s0, s1, s2
# CHECK-ENCODING: [0x7b,0xd4,0x24,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sci.h
@@ -4789,22 +4788,22 @@ cv.cmpleu.sc.b s0, s1, s2
cv.cmpleu.sci.h t0, t1, 0
# CHECK-INSTR: cv.cmpleu.sci.h t0, t1, 0
# CHECK-ENCODING: [0xfb,0x62,0x03,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sci.h t3, t4, 32
# CHECK-INSTR: cv.cmpleu.sci.h t3, t4, 32
# CHECK-ENCODING: [0x7b,0xee,0x0e,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sci.h a0, a1, 7
# CHECK-INSTR: cv.cmpleu.sci.h a0, a1, 7
# CHECK-ENCODING: [0x7b,0xe5,0x35,0x4e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sci.h s0, s1, 63
# CHECK-INSTR: cv.cmpleu.sci.h s0, s1, 63
# CHECK-ENCODING: [0x7b,0xe4,0xf4,0x4f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cmpleu.sci.b
@@ -4813,22 +4812,22 @@ cv.cmpleu.sci.h s0, s1, 63
cv.cmpleu.sci.b t0, t1, 0
# CHECK-INSTR: cv.cmpleu.sci.b t0, t1, 0
# CHECK-ENCODING: [0xfb,0x72,0x03,0x4c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sci.b t3, t4, 32
# CHECK-INSTR: cv.cmpleu.sci.b t3, t4, 32
# CHECK-ENCODING: [0x7b,0xfe,0x0e,0x4d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sci.b a0, a1, 7
# CHECK-INSTR: cv.cmpleu.sci.b a0, a1, 7
# CHECK-ENCODING: [0x7b,0xf5,0x35,0x4e]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cmpleu.sci.b s0, s1, 63
# CHECK-INSTR: cv.cmpleu.sci.b s0, s1, 63
# CHECK-ENCODING: [0x7b,0xf4,0xf4,0x4f]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r
@@ -4837,22 +4836,22 @@ cv.cmpleu.sci.b s0, s1, 63
cv.cplxmul.r t0, t1, t2
# CHECK-INSTR: cv.cplxmul.r t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r t3, t4, t5
# CHECK-INSTR: cv.cplxmul.r t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r a0, a1, a2
# CHECK-INSTR: cv.cplxmul.r a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r s0, s1, s2
# CHECK-INSTR: cv.cplxmul.r s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i
@@ -4861,22 +4860,22 @@ cv.cplxmul.r s0, s1, s2
cv.cplxmul.i t0, t1, t2
# CHECK-INSTR: cv.cplxmul.i t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i t3, t4, t5
# CHECK-INSTR: cv.cplxmul.i t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i a0, a1, a2
# CHECK-INSTR: cv.cplxmul.i a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i s0, s1, s2
# CHECK-INSTR: cv.cplxmul.i s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r.div2
@@ -4885,22 +4884,22 @@ cv.cplxmul.i s0, s1, s2
cv.cplxmul.r.div2 t0, t1, t2
# CHECK-INSTR: cv.cplxmul.r.div2 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x22,0x73,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div2 t3, t4, t5
# CHECK-INSTR: cv.cplxmul.r.div2 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xae,0xee,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div2 a0, a1, a2
# CHECK-INSTR: cv.cplxmul.r.div2 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xa5,0xc5,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div2 s0, s1, s2
# CHECK-INSTR: cv.cplxmul.r.div2 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xa4,0x24,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i.div2
@@ -4909,22 +4908,22 @@ cv.cplxmul.r.div2 s0, s1, s2
cv.cplxmul.i.div2 t0, t1, t2
# CHECK-INSTR: cv.cplxmul.i.div2 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x22,0x73,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div2 t3, t4, t5
# CHECK-INSTR: cv.cplxmul.i.div2 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xae,0xee,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div2 a0, a1, a2
# CHECK-INSTR: cv.cplxmul.i.div2 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xa5,0xc5,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div2 s0, s1, s2
# CHECK-INSTR: cv.cplxmul.i.div2 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xa4,0x24,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r.div4
@@ -4933,22 +4932,22 @@ cv.cplxmul.i.div2 s0, s1, s2
cv.cplxmul.r.div4 t0, t1, t2
# CHECK-INSTR: cv.cplxmul.r.div4 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div4 t3, t4, t5
# CHECK-INSTR: cv.cplxmul.r.div4 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div4 a0, a1, a2
# CHECK-INSTR: cv.cplxmul.r.div4 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div4 s0, s1, s2
# CHECK-INSTR: cv.cplxmul.r.div4 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i.div4
@@ -4957,22 +4956,22 @@ cv.cplxmul.r.div4 s0, s1, s2
cv.cplxmul.i.div4 t0, t1, t2
# CHECK-INSTR: cv.cplxmul.i.div4 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div4 t3, t4, t5
# CHECK-INSTR: cv.cplxmul.i.div4 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div4 a0, a1, a2
# CHECK-INSTR: cv.cplxmul.i.div4 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div4 s0, s1, s2
# CHECK-INSTR: cv.cplxmul.i.div4 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.r.div8
@@ -4981,22 +4980,22 @@ cv.cplxmul.i.div4 s0, s1, s2
cv.cplxmul.r.div8 t0, t1, t2
# CHECK-INSTR: cv.cplxmul.r.div8 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x62,0x73,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div8 t3, t4, t5
# CHECK-INSTR: cv.cplxmul.r.div8 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xee,0xee,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div8 a0, a1, a2
# CHECK-INSTR: cv.cplxmul.r.div8 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xe5,0xc5,0x54]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.r.div8 s0, s1, s2
# CHECK-INSTR: cv.cplxmul.r.div8 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xe4,0x24,0x55]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxmul.i.div8
@@ -5005,22 +5004,22 @@ cv.cplxmul.r.div8 s0, s1, s2
cv.cplxmul.i.div8 t0, t1, t2
# CHECK-INSTR: cv.cplxmul.i.div8 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x62,0x73,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div8 t3, t4, t5
# CHECK-INSTR: cv.cplxmul.i.div8 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xee,0xee,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div8 a0, a1, a2
# CHECK-INSTR: cv.cplxmul.i.div8 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xe5,0xc5,0x56]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxmul.i.div8 s0, s1, s2
# CHECK-INSTR: cv.cplxmul.i.div8 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xe4,0x24,0x57]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.cplxconj
@@ -5029,22 +5028,22 @@ cv.cplxmul.i.div8 s0, s1, s2
cv.cplxconj t0, t1
# CHECK-INSTR: cv.cplxconj t0, t1
# CHECK-ENCODING: [0xfb,0x02,0x03,0x5c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxconj t3, t4
# CHECK-INSTR: cv.cplxconj t3, t4
# CHECK-ENCODING: [0x7b,0x8e,0x0e,0x5c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxconj a0, a1
# CHECK-INSTR: cv.cplxconj a0, a1
# CHECK-ENCODING: [0x7b,0x85,0x05,0x5c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.cplxconj s0, s1
# CHECK-INSTR: cv.cplxconj s0, s1
# CHECK-ENCODING: [0x7b,0x84,0x04,0x5c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.subrotmj
@@ -5053,22 +5052,22 @@ cv.cplxconj s0, s1
cv.subrotmj t0, t1, t2
# CHECK-INSTR: cv.subrotmj t0, t1, t2
# CHECK-ENCODING: [0xfb,0x02,0x73,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj t3, t4, t5
# CHECK-INSTR: cv.subrotmj t3, t4, t5
# CHECK-ENCODING: [0x7b,0x8e,0xee,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj a0, a1, a2
# CHECK-INSTR: cv.subrotmj a0, a1, a2
# CHECK-ENCODING: [0x7b,0x85,0xc5,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj s0, s1, s2
# CHECK-INSTR: cv.subrotmj s0, s1, s2
# CHECK-ENCODING: [0x7b,0x84,0x24,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.subrotmj.div2
@@ -5077,22 +5076,22 @@ cv.subrotmj s0, s1, s2
cv.subrotmj.div2 t0, t1, t2
# CHECK-INSTR: cv.subrotmj.div2 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x22,0x73,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div2 t3, t4, t5
# CHECK-INSTR: cv.subrotmj.div2 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xae,0xee,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div2 a0, a1, a2
# CHECK-INSTR: cv.subrotmj.div2 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xa5,0xc5,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div2 s0, s1, s2
# CHECK-INSTR: cv.subrotmj.div2 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xa4,0x24,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.subrotmj.div4
@@ -5101,22 +5100,22 @@ cv.subrotmj.div2 s0, s1, s2
cv.subrotmj.div4 t0, t1, t2
# CHECK-INSTR: cv.subrotmj.div4 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div4 t3, t4, t5
# CHECK-INSTR: cv.subrotmj.div4 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div4 a0, a1, a2
# CHECK-INSTR: cv.subrotmj.div4 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div4 s0, s1, s2
# CHECK-INSTR: cv.subrotmj.div4 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.subrotmj.div8
@@ -5125,22 +5124,22 @@ cv.subrotmj.div4 s0, s1, s2
cv.subrotmj.div8 t0, t1, t2
# CHECK-INSTR: cv.subrotmj.div8 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x62,0x73,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div8 t3, t4, t5
# CHECK-INSTR: cv.subrotmj.div8 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xee,0xee,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div8 a0, a1, a2
# CHECK-INSTR: cv.subrotmj.div8 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xe5,0xc5,0x64]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.subrotmj.div8 s0, s1, s2
# CHECK-INSTR: cv.subrotmj.div8 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xe4,0x24,0x65]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.div2
@@ -5149,22 +5148,22 @@ cv.subrotmj.div8 s0, s1, s2
cv.add.div2 t0, t1, t2
# CHECK-INSTR: cv.add.div2 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x22,0x73,0x6c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div2 t3, t4, t5
# CHECK-INSTR: cv.add.div2 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xae,0xee,0x6d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div2 a0, a1, a2
# CHECK-INSTR: cv.add.div2 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xa5,0xc5,0x6c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div2 s0, s1, s2
# CHECK-INSTR: cv.add.div2 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xa4,0x24,0x6d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.div4
@@ -5173,22 +5172,22 @@ cv.add.div2 s0, s1, s2
cv.add.div4 t0, t1, t2
# CHECK-INSTR: cv.add.div4 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x6c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div4 t3, t4, t5
# CHECK-INSTR: cv.add.div4 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x6d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div4 a0, a1, a2
# CHECK-INSTR: cv.add.div4 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x6c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div4 s0, s1, s2
# CHECK-INSTR: cv.add.div4 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x6d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.add.div8
@@ -5197,22 +5196,22 @@ cv.add.div4 s0, s1, s2
cv.add.div8 t0, t1, t2
# CHECK-INSTR: cv.add.div8 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x62,0x73,0x6c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div8 t3, t4, t5
# CHECK-INSTR: cv.add.div8 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xee,0xee,0x6d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div8 a0, a1, a2
# CHECK-INSTR: cv.add.div8 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xe5,0xc5,0x6c]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.add.div8 s0, s1, s2
# CHECK-INSTR: cv.add.div8 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xe4,0x24,0x6d]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.div2
@@ -5221,22 +5220,22 @@ cv.add.div8 s0, s1, s2
cv.sub.div2 t0, t1, t2
# CHECK-INSTR: cv.sub.div2 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x22,0x73,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div2 t3, t4, t5
# CHECK-INSTR: cv.sub.div2 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xae,0xee,0x75]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div2 a0, a1, a2
# CHECK-INSTR: cv.sub.div2 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xa5,0xc5,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div2 s0, s1, s2
# CHECK-INSTR: cv.sub.div2 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xa4,0x24,0x75]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.div4
@@ -5245,22 +5244,22 @@ cv.sub.div2 s0, s1, s2
cv.sub.div4 t0, t1, t2
# CHECK-INSTR: cv.sub.div4 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x42,0x73,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div4 t3, t4, t5
# CHECK-INSTR: cv.sub.div4 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xce,0xee,0x75]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div4 a0, a1, a2
# CHECK-INSTR: cv.sub.div4 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xc5,0xc5,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div4 s0, s1, s2
# CHECK-INSTR: cv.sub.div4 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xc4,0x24,0x75]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
//===----------------------------------------------------------------------===//
// cv.sub.div8
@@ -5269,19 +5268,19 @@ cv.sub.div4 s0, s1, s2
cv.sub.div8 t0, t1, t2
# CHECK-INSTR: cv.sub.div8 t0, t1, t2
# CHECK-ENCODING: [0xfb,0x62,0x73,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div8 t3, t4, t5
# CHECK-INSTR: cv.sub.div8 t3, t4, t5
# CHECK-ENCODING: [0x7b,0xee,0xee,0x75]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div8 a0, a1, a2
# CHECK-INSTR: cv.sub.div8 a0, a1, a2
# CHECK-ENCODING: [0x7b,0xe5,0xc5,0x74]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
cv.sub.div8 s0, s1, s2
# CHECK-INSTR: cv.sub.div8 s0, s1, s2
# CHECK-ENCODING: [0x7b,0xe4,0x24,0x75]
-# CHECK-NO-EXT: instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU){{$}}
+# expected-error at -3 {{instruction requires the following: 'XCVsimd' (CORE-V SIMD ALU)}}
diff --git a/llvm/test/MC/RISCV/data-directives-invalid.s b/llvm/test/MC/RISCV/data-directives-invalid.s
index dd94a4866bfdee..4b81d0dbc66304 100644
--- a/llvm/test/MC/RISCV/data-directives-invalid.s
+++ b/llvm/test/MC/RISCV/data-directives-invalid.s
@@ -1,23 +1,23 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
-# CHECK: :[[#@LINE+1]]:7: error: out of range literal value
+# expected-error at +1:7 {{out of range literal value}}
.byte 0xffa
-# CHECK: :[[#@LINE+1]]:7: error: out of range literal value
+# expected-error at +1:7 {{out of range literal value}}
.half 0xffffa
-# CHECK: :[[#@LINE+1]]:8: error: out of range literal value
+# expected-error at +1:8 {{out of range literal value}}
.short 0xffffa
-# CHECK: :[[#@LINE+1]]:8: error: out of range literal value
+# expected-error at +1:8 {{out of range literal value}}
.hword 0xffffa
-# CHECK: :[[#@LINE+1]]:8: error: out of range literal value
+# expected-error at +1:8 {{out of range literal value}}
.2byte 0xffffa
-# CHECK: :[[#@LINE+1]]:7: error: out of range literal value
+# expected-error at +1:7 {{out of range literal value}}
.word 0xffffffffa
-# CHECK: :[[#@LINE+1]]:7: error: out of range literal value
+# expected-error at +1:7 {{out of range literal value}}
.long 0xffffffffa
-# CHECK: :[[#@LINE+1]]:8: error: out of range literal value
+# expected-error at +1:8 {{out of range literal value}}
.4byte 0xffffffffa
-# CHECK: :[[#@LINE+1]]:8: error: literal value out of range for directive
+# expected-error at +1:8 {{literal value out of range for directive}}
.dword 0xffffffffffffffffa
-# CHECK: :[[#@LINE+1]]:8: error: literal value out of range for directive
+# expected-error at +1:8 {{literal value out of range for directive}}
.8byte 0xffffffffffffffffa
diff --git a/llvm/test/MC/RISCV/directive-variant_cc.s b/llvm/test/MC/RISCV/directive-variant_cc.s
index c40de9f3618e09..be5aaa650f4a40 100644
--- a/llvm/test/MC/RISCV/directive-variant_cc.s
+++ b/llvm/test/MC/RISCV/directive-variant_cc.s
@@ -1,6 +1,6 @@
// RUN: llvm-mc -triple riscv64 -filetype obj -o - %s | llvm-readobj --symbols - | FileCheck %s
// RUN: llvm-mc -triple riscv64 -filetype obj -defsym=OBJ=1 -o - %s | llvm-readelf -s - | FileCheck %s --check-prefix=OBJ
-// RUN: not llvm-mc -triple riscv64 -filetype asm -defsym=ERR=1 -o - %s 2>&1 | FileCheck %s --check-prefix=ERR
+// RUN: llvm-mc --verify -triple riscv64 -filetype asm -defsym=ERR=1 -o - %s
.text
.variant_cc local
@@ -34,9 +34,9 @@ def2:
.ifdef ERR
.variant_cc
-// ERR: [[#@LINE-1]]:12: error: expected symbol name
+// expected-error at -1:12 {{expected symbol name}}
.global fox
.variant_cc fox bar
-// ERR: [[#@LINE-1]]:17: error: expected newline
+// expected-error at -1:17 {{expected newline}}
.endif
diff --git a/llvm/test/MC/RISCV/empty-string.s b/llvm/test/MC/RISCV/empty-string.s
index 2d3d0ed15ad743..8c1f27bba67ec7 100644
--- a/llvm/test/MC/RISCV/empty-string.s
+++ b/llvm/test/MC/RISCV/empty-string.s
@@ -1,3 +1,3 @@
// REQUIRES: riscv-registered-target
-// RUN: not llvm-mc -triple riscv32-unknown-linux-gnu < %s 2>&1 | FileCheck %s
-"" # CHECK: error: unrecognized instruction mnemonic
+// RUN: llvm-mc --verify -triple riscv32-unknown-linux-gnu < %s
+"" # expected-error {{unrecognized instruction mnemonic}}
diff --git a/llvm/test/MC/RISCV/fixups-diagnostics.s b/llvm/test/MC/RISCV/fixups-diagnostics.s
index d19f4050d97e44..186bbe21aedfde 100644
--- a/llvm/test/MC/RISCV/fixups-diagnostics.s
+++ b/llvm/test/MC/RISCV/fixups-diagnostics.s
@@ -1,9 +1,9 @@
-# RUN: not llvm-mc -triple riscv32 -filetype obj < %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -filetype obj -o /dev/null < %s
- jal a0, far_distant # CHECK: :[[@LINE]]:11: error: fixup value out of range
- jal a0, unaligned # CHECK: :[[@LINE]]:11: error: fixup value must be 2-byte aligned
+ jal a0, far_distant # expected-error:11 {{fixup value out of range}}
+ jal a0, unaligned # expected-error:11 {{fixup value must be 2-byte aligned}}
- blt t0, t1, unaligned # CHECK: :[[@LINE]]:15: error: fixup value must be 2-byte aligned
+ blt t0, t1, unaligned # expected-error:15 {{fixup value must be 2-byte aligned}}
.byte 0
unaligned:
diff --git a/llvm/test/MC/RISCV/function-call-invalid.s b/llvm/test/MC/RISCV/function-call-invalid.s
index 045556f67bb5e3..94b324c4e230e7 100644
--- a/llvm/test/MC/RISCV/function-call-invalid.s
+++ b/llvm/test/MC/RISCV/function-call-invalid.s
@@ -1,15 +1,15 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
-call 1234 # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %pcrel_hi(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %pcrel_lo(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %pcrel_hi(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %pcrel_lo(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %hi(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %lo(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %hi(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call %lo(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-call foo, bar # CHECK: :[[@LINE]]:6: error: register must be a GPR
-call t0, %lo(foo) # CHECK: :[[@LINE]]:10: error: operand must be a bare symbol name
-call foo at pls # CHECK: :[[@LINE]]:10: error: @ (except the deprecated/ignored @plt) is disallowed
-call foo at 3 # CHECK: :[[@LINE]]:10: error: @ (except the deprecated/ignored @plt) is disallowed
+call 1234 # expected-error:6 {{operand must be a bare symbol name}}
+call %pcrel_hi(1234) # expected-error:6 {{operand must be a bare symbol name}}
+call %pcrel_lo(1234) # expected-error:6 {{operand must be a bare symbol name}}
+call %pcrel_hi(foo) # expected-error:6 {{operand must be a bare symbol name}}
+call %pcrel_lo(foo) # expected-error:6 {{operand must be a bare symbol name}}
+call %hi(1234) # expected-error:6 {{operand must be a bare symbol name}}
+call %lo(1234) # expected-error:6 {{operand must be a bare symbol name}}
+call %hi(foo) # expected-error:6 {{operand must be a bare symbol name}}
+call %lo(foo) # expected-error:6 {{operand must be a bare symbol name}}
+call foo, bar # expected-error:6 {{register must be a GPR}}
+call t0, %lo(foo) # expected-error:10 {{operand must be a bare symbol name}}
+call foo at pls # expected-error:10 {{@ (except the deprecated/ignored @plt) is disallowed}}
+call foo at 3 # expected-error:10 {{@ (except the deprecated/ignored @plt) is disallowed}}
diff --git a/llvm/test/MC/RISCV/hinval-invalid.s b/llvm/test/MC/RISCV/hinval-invalid.s
index d52c04a57f83d3..dcb2a29c816909 100644
--- a/llvm/test/MC/RISCV/hinval-invalid.s
+++ b/llvm/test/MC/RISCV/hinval-invalid.s
@@ -1,16 +1,12 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+svinval < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=NO-H
-# RUN: not llvm-mc -triple=riscv64 -mattr=+svinval < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=NO-H
-# RUN: not llvm-mc -triple=riscv32 -mattr=+h < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=NO-SVINVAL
-# RUN: not llvm-mc -triple=riscv64 -mattr=+h < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=NO-SVINVAL
+# RUN: llvm-mc --verify=no-h -triple=riscv32 -mattr=+svinval < %s
+# RUN: llvm-mc --verify=no-h -triple=riscv64 -mattr=+svinval < %s
+# RUN: llvm-mc --verify=no-svinval -triple=riscv32 -mattr=+h < %s
+# RUN: llvm-mc --verify=no-svinval -triple=riscv64 -mattr=+h < %s
hinval.vvma a0, a1
-# NO-H: :[[@LINE-1]]:1: error: instruction requires the following: 'H' (Hypervisor)
-# NO-SVINVAL: :[[@LINE-2]]:1: error: instruction requires the following: 'Svinval' (Fine-Grained Address-Translation Cache Invalidation)
+# no-h-error at -1:1 {{instruction requires the following: 'H' (Hypervisor)}}
+# no-svinval-error at -2:1 {{instruction requires the following: 'Svinval' (Fine-Grained Address-Translation Cache Invalidation)}}
hinval.gvma a0, a1
-# NO-H: :[[@LINE-1]]:1: error: instruction requires the following: 'H' (Hypervisor)
-# NO-SVINVAL: :[[@LINE-2]]:1: error: instruction requires the following: 'Svinval' (Fine-Grained Address-Translation Cache Invalidation)
+# no-h-error at -1:1 {{instruction requires the following: 'H' (Hypervisor)}}
+# no-svinval-error at -2:1 {{instruction requires the following: 'Svinval' (Fine-Grained Address-Translation Cache Invalidation)}}
diff --git a/llvm/test/MC/RISCV/insn-invalid.s b/llvm/test/MC/RISCV/insn-invalid.s
index 793a518d890ce9..7b119dedc57835 100644
--- a/llvm/test/MC/RISCV/insn-invalid.s
+++ b/llvm/test/MC/RISCV/insn-invalid.s
@@ -1,58 +1,58 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
# Too many operands
-.insn i 0x13, 0, a0, a1, 13, 14 # CHECK: :[[@LINE]]:33: error: unexpected extra operand for instruction
-.insn r 0x43, 0, 0, fa0, fa1, fa2, fa3, fa4 # CHECK: :[[@LINE]]:44: error: unexpected extra operand for instruction
+.insn i 0x13, 0, a0, a1, 13, 14 # expected-error:33 {{unexpected extra operand for instruction}}
+.insn r 0x43, 0, 0, fa0, fa1, fa2, fa3, fa4 # expected-error:44 {{unexpected extra operand for instruction}}
# Too few operands
-.insn r 0x33, 0, 0, a0, a1 # CHECK: :[[@LINE]]:30: error: too few operands for instruction
-.insn i 0x13, 0, a0, a1 # CHECK: :[[@LINE]]:27: error: too few operands for instruction
+.insn r 0x33, 0, 0, a0, a1 # expected-error:30 {{too few operands for instruction}}
+.insn i 0x13, 0, a0, a1 # expected-error:27 {{too few operands for instruction}}
-.insn r 0x33, 0, 0, a0, 13 # CHECK: :[[@LINE]]:28: error: invalid operand for instruction
-.insn i 0x13, 0, a0, a1, a2 # CHECK: :[[@LINE]]:28: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+.insn r 0x33, 0, 0, a0, 13 # expected-error:28 {{invalid operand for instruction}}
+.insn i 0x13, 0, a0, a1, a2 # expected-error:28 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
-.insn q 0x13, 0, a0, a1, 13, 14 # CHECK: :[[@LINE]]:7: error: invalid instruction format
+.insn q 0x13, 0, a0, a1, 13, 14 # expected-error:7 {{invalid instruction format}}
# Invalid immediate
-.insn i 0x99, 0, a0, 4(a1) # CHECK: :[[@LINE]]:10: error: opcode must be a valid opcode name or an immediate in the range [0, 127]
-.insn r 0x33, 8, 0, a0, a1, a2 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 7]
-.insn r4 0x43, 0, 4, fa0, fa1, fa2, fa3 # CHECK: :[[@LINE]]:21: error: immediate must be an integer in the range [0, 3]
+.insn i 0x99, 0, a0, 4(a1) # expected-error:10 {{opcode must be a valid opcode name or an immediate in the range [0, 127]}}
+.insn r 0x33, 8, 0, a0, a1, a2 # expected-error:17 {{immediate must be an integer in the range [0, 7]}}
+.insn r4 0x43, 0, 4, fa0, fa1, fa2, fa3 # expected-error:21 {{immediate must be an integer in the range [0, 3]}}
# Unrecognized opcode name
-.insn r UNKNOWN, 0, a1, a2, a3 # CHECK: :[[@LINE]]:9: error: opcode must be a valid opcode name or an immediate in the range [0, 127]
+.insn r UNKNOWN, 0, a1, a2, a3 # expected-error:9 {{opcode must be a valid opcode name or an immediate in the range [0, 127]}}
# Make fake mnemonics we use to match these in the tablegened asm match table isn't exposed.
-.insn_i 0x13, 0, a0, a1, 13, 14 # CHECK: :[[@LINE]]:1: error: unknown directive
+.insn_i 0x13, 0, a0, a1, 13, 14 # expected-error:1 {{unknown directive}}
-.insn . # CHECK: :[[@LINE]]:7: error: expected absolute expression
-.insn 0x2, # CHECK: :[[@LINE]]:12: error: unknown token in expression
+.insn . # expected-error:7 {{expected absolute expression}}
+.insn 0x2, # expected-error:12 {{unknown token in expression}}
-.insn 0x4, 0x13, 0 # CHECK: :[[@LINE]]:16: error: invalid operand for instruction
+.insn 0x4, 0x13, 0 # expected-error:16 {{invalid operand for instruction}}
-.insn 0x2, 0xffff # CHECK: :[[@LINE]]:7: error: instruction length does not match the encoding
-.insn 0x2, 0xffffffff # CHECK: :[[@LINE]]:7: error: instruction length does not match the encoding
-.insn 0xffffffffff # CHECK: :[[@LINE]]:7: error: encoding value does not fit into instruction
+.insn 0x2, 0xffff # expected-error:7 {{instruction length does not match the encoding}}
+.insn 0x2, 0xffffffff # expected-error:7 {{instruction length does not match the encoding}}
+.insn 0xffffffffff # expected-error:7 {{encoding value does not fit into instruction}}
-.insn 0x0, 0x0 # CHECK: :[[@LINE]]:7: error: instruction lengths must be a non-zero multiple of two
-.insn 0x1, 0xff # CHECK: :[[@LINE]]:7: error: instruction lengths must be a non-zero multiple of two
-.insn 10, 0x000007f # CHECK: :[[@LINE]]:7: error: instruction lengths over 64 bits are not supported
+.insn 0x0, 0x0 # expected-error:7 {{instruction lengths must be a non-zero multiple of two}}
+.insn 0x1, 0xff # expected-error:7 {{instruction lengths must be a non-zero multiple of two}}
+.insn 10, 0x000007f # expected-error:7 {{instruction lengths over 64 bits are not supported}}
-.insn 0x2, 0x03 # CHECK: :[[@LINE]]:7: error: instruction length does not match the encoding
-.insn 0x2, 0x1f # CHECK: :[[@LINE]]:7: error: instruction length does not match the encoding
-.insn 0x2, 0x3f # CHECK: :[[@LINE]]:7: error: instruction length does not match the encoding
+.insn 0x2, 0x03 # expected-error:7 {{instruction length does not match the encoding}}
+.insn 0x2, 0x1f # expected-error:7 {{instruction length does not match the encoding}}
+.insn 0x2, 0x3f # expected-error:7 {{instruction length does not match the encoding}}
-.insn 0x4, 0x00000001 # CHECK: :[[@LINE]]:7: error: instruction length does not match the encoding
+.insn 0x4, 0x00000001 # expected-error:7 {{instruction length does not match the encoding}}
-.insn 0x6, 0x000000000001 # CHECK: :[[@LINE]]:7: error: compressed instructions are not allowed
-.insn 0x8, 0x0000000000000001 # CHECK: :[[@LINE]]:7: error: compressed instructions are not allowed
+.insn 0x6, 0x000000000001 # expected-error:7 {{compressed instructions are not allowed}}
+.insn 0x8, 0x0000000000000001 # expected-error:7 {{compressed instructions are not allowed}}
-.insn 0x2, 0x10001 # CHECK: :[[@LINE]]:7: error: encoding value does not fit into instruction
-.insn 0x4, 0x100000003 # CHECK: :[[@LINE]]:7: error: encoding value does not fit into instruction
-.insn 0x6, 0x100000000001f # CHECK: :[[@LINE]]:7: error: encoding value does not fit into instruction
-.insn 0x8, 0x1000000000000003f # CHECK: :[[@LINE]]:12: error: literal value out of range for directive
+.insn 0x2, 0x10001 # expected-error:7 {{encoding value does not fit into instruction}}
+.insn 0x4, 0x100000003 # expected-error:7 {{encoding value does not fit into instruction}}
+.insn 0x6, 0x100000000001f # expected-error:7 {{encoding value does not fit into instruction}}
+.insn 0x8, 0x1000000000000003f # expected-error:12 {{literal value out of range for directive}}
-.insn 0x0010 # CHECK: :[[@LINE]]:7: error: compressed instructions are not allowed
-.insn 0x2, 0x0001 # CHECK: :[[@LINE]]:7: error: compressed instructions are not allowed
+.insn 0x0010 # expected-error:7 {{compressed instructions are not allowed}}
+.insn 0x2, 0x0001 # expected-error:7 {{compressed instructions are not allowed}}
-.insn 0x2 + 0x2, 0x3 | (31 # CHECK: :[[@LINE]]:28: error: expected ')'
-.insn 0x4 * , 0xbf | (31 << 59) # CHECK: :[[@LINE]]:13: error: unknown token in expression
+.insn 0x2 + 0x2, 0x3 | (31 # expected-error:28 {{expected ')'}}
+.insn 0x4 * , 0xbf | (31 << 59) # expected-error:13 {{unknown token in expression}}
diff --git a/llvm/test/MC/RISCV/insn_c-invalid.s b/llvm/test/MC/RISCV/insn_c-invalid.s
index 1f12173cd6138c..e6676cdefcf1a4 100644
--- a/llvm/test/MC/RISCV/insn_c-invalid.s
+++ b/llvm/test/MC/RISCV/insn_c-invalid.s
@@ -1,27 +1,27 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+c < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+c < %s
# Too many operands
-.insn ci 1, 0, a0, 13, 14 # CHECK: :[[#@LINE]]:25: error: unexpected extra operand for instruction
-.insn cr 2, 9, a0, a1, a2 # CHECK: :[[#@LINE]]:25: error: unexpected extra operand for instruction
+.insn ci 1, 0, a0, 13, 14 # expected-error:25 {{unexpected extra operand for instruction}}
+.insn cr 2, 9, a0, a1, a2 # expected-error:25 {{unexpected extra operand for instruction}}
## Too few operands
-.insn ci 1, 0, a0 # CHECK: :[[#@LINE]]:19: error: too few operands for instruction
-.insn cr 2, 9, a0 # CHECK: :[[#@LINE]]:19: error: too few operands for instruction
+.insn ci 1, 0, a0 # expected-error:19 {{too few operands for instruction}}
+.insn cr 2, 9, a0 # expected-error:19 {{too few operands for instruction}}
-.insn cr 2, 9, a0, 13 # CHECK: :[[#@LINE]]:21: error: invalid operand for instruction
-.insn ci 1, 0, a0, a1 # CHECK: :[[#@LINE]]:21: error: immediate must be an integer in the range [-32, 31]
+.insn cr 2, 9, a0, 13 # expected-error:21 {{invalid operand for instruction}}
+.insn ci 1, 0, a0, a1 # expected-error:21 {{immediate must be an integer in the range [-32, 31]}}
-.insn cq 0x13, 0, a0, a1, 13, 14 # CHECK: :[[#@LINE]]:7: error: invalid instruction format
+.insn cq 0x13, 0, a0, a1, 13, 14 # expected-error:7 {{invalid instruction format}}
# Invalid immediate
-.insn ci 3, 0, a0, 13 # CHECK: :[[#@LINE]]:11: error: opcode must be a valid opcode name or an immediate in the range [0, 2]
-.insn cr 2, 16, a0, a1 # CHECK: :[[#@LINE]]:14: error: immediate must be an integer in the range [0, 15]
-.insn ciw 0, 0, a0, 256 # CHECK: :[[#@LINE]]:21: error: immediate must be an integer in the range [0, 255]
+.insn ci 3, 0, a0, 13 # expected-error:11 {{opcode must be a valid opcode name or an immediate in the range [0, 2]}}
+.insn cr 2, 16, a0, a1 # expected-error:14 {{immediate must be an integer in the range [0, 15]}}
+.insn ciw 0, 0, a0, 256 # expected-error:21 {{immediate must be an integer in the range [0, 255]}}
## Unrecognized opcode name
-.insn cr C3, 9, a0, a1 # CHECK: :[[#@LINE]]:10: error: opcode must be a valid opcode name or an immediate in the range [0, 2]
+.insn cr C3, 9, a0, a1 # expected-error:10 {{opcode must be a valid opcode name or an immediate in the range [0, 2]}}
## Make fake mnemonics we use to match these in the tablegened asm match table isn't exposed.
-.insn_cr 2, 9, a0, a1 # CHECK: :[[#@LINE]]:1: error: unknown directive
+.insn_cr 2, 9, a0, a1 # expected-error:1 {{unknown directive}}
-.insn 0xfffffff0 # CHECK: :[[@LINE]]:7: error: encoding value does not fit into instruction
+.insn 0xfffffff0 # expected-error:7 {{encoding value does not fit into instruction}}
diff --git a/llvm/test/MC/RISCV/insn_xqci-invalid.s b/llvm/test/MC/RISCV/insn_xqci-invalid.s
index b0cb23d98ad6e3..57026d948777c1 100644
--- a/llvm/test/MC/RISCV/insn_xqci-invalid.s
+++ b/llvm/test/MC/RISCV/insn_xqci-invalid.s
@@ -1,111 +1,110 @@
-# RUN: not llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \
-# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-ERR %s
+# RUN: llvm-mc --verify %s -triple=riscv32 -M no-aliases -show-encoding
.insn qc.eai 128, 0, 0, x0, 0
-# CHECK-ERR: [[@LINE-1]]:14: error: opcode must be a valid opcode name or an immediate in the range [0, 127]
+# expected-error at -1:14 {{opcode must be a valid opcode name or an immediate in the range [0, 127]}}
.insn qc.eai 127, 8, 0, x0, 0
-# CHECK-ERR: [[@LINE-1]]:19: error: immediate must be an integer in the range [0, 7]
+# expected-error at -1:19 {{immediate must be an integer in the range [0, 7]}}
.insn qc.eai 127, 7, 2, x0, 0
-# CHECK-ERR: [[@LINE-1]]:22: error: immediate must be an integer in the range [0, 1]
+# expected-error at -1:22 {{immediate must be an integer in the range [0, 1]}}
.insn qc.eai 127, 7, 1, not_a_reg, 0
-# CHECK-ERR: [[@LINE-1]]:25: error: invalid operand for instruction
+# expected-error at -1:25 {{invalid operand for instruction}}
.insn qc.eai 127, 7, 1, x31, 0x100000000
-# CHECK-ERR: [[@LINE-1]]:30: error: immediate must be an integer in the range [-2147483648, 4294967295]
+# expected-error at -1:30 {{immediate must be an integer in the range [-2147483648, 4294967295]}}
.insn qc.eai 126, 7, 1, x31, 0xFFFFFFFF, extra
-# CHECK-ERR: [[@LINE-1]]:42: error: unexpected extra operand for instruction
+# expected-error at -1:42 {{unexpected extra operand for instruction}}
.insn qc.ei 128, 0, 0, x31, x0, 0
-# CHECK-ERR: [[@LINE-1]]:13: error: opcode must be a valid opcode name or an immediate in the range [0, 127]
+# expected-error at -1:13 {{opcode must be a valid opcode name or an immediate in the range [0, 127]}}
.insn qc.ei 127, 8, 0, x0, x0, 0
-# CHECK-ERR: [[@LINE-1]]:18: error: immediate must be an integer in the range [0, 7]
+# expected-error at -1:18 {{immediate must be an integer in the range [0, 7]}}
.insn qc.ei 127, 7, 4, x0, x0, 0
-# CHECK-ERR: [[@LINE-1]]:21: error: immediate must be an integer in the range [0, 3]
+# expected-error at -1:21 {{immediate must be an integer in the range [0, 3]}}
.insn qc.ei 127, 7, 3, not_a_reg, x0, 0
-# CHECK-ERR: [[@LINE-1]]:24: error: invalid operand for instruction
+# expected-error at -1:24 {{invalid operand for instruction}}
.insn qc.ei 127, 7, 3, x31, not_a_reg, 0
-# CHECK-ERR: [[@LINE-1]]:29: error: invalid operand for instruction
+# expected-error at -1:29 {{invalid operand for instruction}}
.insn qc.ei 127, 7, 3, x31, x31, 0x2000000
-# CHECK-ERR: [[@LINE-1]]:34: error: immediate must be an integer in the range [-33554432, 33554431]
+# expected-error at -1:34 {{immediate must be an integer in the range [-33554432, 33554431]}}
.insn qc.ei 127, 7, 3, x31, x31, 0x1000000, extra
-# CHECK-ERR: [[@LINE-1]]:45: error: unexpected extra operand for instruction
+# expected-error at -1:45 {{unexpected extra operand for instruction}}
.insn qc.ei 126, 7, 3, x31, 0x2000000(x0)
-# CHECK-ERR: [[@LINE-1]]:29: error: immediate must be an integer in the range [-33554432, 33554431]
+# expected-error at -1:29 {{immediate must be an integer in the range [-33554432, 33554431]}}
.insn qc.ei 126, 7, 3, x31, 0x1000000(not_a_reg)
-# CHECK-ERR: [[@LINE-1]]:39: error: expected register
+# expected-error at -1:39 {{expected register}}
.insn qc.ei 126, 7, 3, x31, 0x1000000(x31), extra
-# CHECK-ERR: [[@LINE-1]]:45: error: unexpected extra operand for instruction
+# expected-error at -1:45 {{unexpected extra operand for instruction}}
.insn qc.eb 128, 0, 0, x0, 0, 0
-# CHECK-ERR: [[@LINE-1]]:13: error: opcode must be a valid opcode name or an immediate in the range [0, 127]
+# expected-error at -1:13 {{opcode must be a valid opcode name or an immediate in the range [0, 127]}}
.insn qc.eb 127, 8, 0, x0, 0, 0
-# CHECK-ERR: [[@LINE-1]]:18: error: immediate must be an integer in the range [0, 7]
+# expected-error at -1:18 {{immediate must be an integer in the range [0, 7]}}
.insn qc.eb 127, 7, 32, x0, 0, 0
-# CHECK-ERR: [[@LINE-1]]:21: error: immediate must be an integer in the range [0, 31]
+# expected-error at -1:21 {{immediate must be an integer in the range [0, 31]}}
.insn qc.eb 127, 7, 31, not_a_reg, 0, 0
-# CHECK-ERR: [[@LINE-1]]:25: error: invalid operand for instruction
+# expected-error at -1:25 {{invalid operand for instruction}}
.insn qc.eb 127, 7, 31, x31, 0x8000, 0
-# CHECK-ERR: [[@LINE-1]]:30: error: immediate must be an integer in the range [-32768, 32767]
+# expected-error at -1:30 {{immediate must be an integer in the range [-32768, 32767]}}
.insn qc.eb 127, 7, 31, x31, 0x4000, 0x1000
-# CHECK-ERR: [[@LINE-1]]:38: error: immediate must be a multiple of 2 bytes in the range [-4096, 4094]
+# expected-error at -1:38 {{immediate must be a multiple of 2 bytes in the range [-4096, 4094]}}
.insn qc.eb 127, 7, 31, x31, 0x4000, 0x800, extra
-# CHECK-ERR: [[@LINE-1]]:45: error: unexpected extra operand for instruction
+# expected-error at -1:45 {{unexpected extra operand for instruction}}
.insn qc.ej 128, 0, 0, 0, 0
-# CHECK-ERR: [[@LINE-1]]:13: error: opcode must be a valid opcode name or an immediate in the range [0, 127]
+# expected-error at -1:13 {{opcode must be a valid opcode name or an immediate in the range [0, 127]}}
.insn qc.ej 127, 8, 0, 0, 0
-# CHECK-ERR: [[@LINE-1]]:18: error: immediate must be an integer in the range [0, 7]
+# expected-error at -1:18 {{immediate must be an integer in the range [0, 7]}}
.insn qc.ej 127, 7, 4, 0, 0
-# CHECK-ERR: [[@LINE-1]]:21: error: immediate must be an integer in the range [0, 3]
+# expected-error at -1:21 {{immediate must be an integer in the range [0, 3]}}
.insn qc.ej 127, 7, 3, 32, 0
-# CHECK-ERR: [[@LINE-1]]:24: error: immediate must be an integer in the range [0, 31]
+# expected-error at -1:24 {{immediate must be an integer in the range [0, 31]}}
.insn qc.ej 127, 7, 3, 31, 0x100000000
-# CHECK-ERR: [[@LINE-1]]:28: error: operand must be a multiple of 2 bytes in the range [-2147483648, 2147483646]
+# expected-error at -1:28 {{operand must be a multiple of 2 bytes in the range [-2147483648, 2147483646]}}
.insn qc.ej 127, 7, 3, 31, 0x80000000, extra
-# CHECK-ERR: [[@LINE-1]]:40: error: unexpected extra operand for instruction
+# expected-error at -1:40 {{unexpected extra operand for instruction}}
.insn qc.es 128, 0, 0, x0, 0(x0)
-# CHECK-ERR: [[@LINE-1]]:13: error: opcode must be a valid opcode name or an immediate in the range [0, 127]
+# expected-error at -1:13 {{opcode must be a valid opcode name or an immediate in the range [0, 127]}}
.insn qc.es 127, 8, 0, x0, 0(x0)
-# CHECK-ERR: [[@LINE-1]]:18: error: immediate must be an integer in the range [0, 7]
+# expected-error at -1:18 {{immediate must be an integer in the range [0, 7]}}
.insn qc.es 127, 7, 4, x0, 0(x0)
-# CHECK-ERR: [[@LINE-1]]:21: error: immediate must be an integer in the range [0, 3]
+# expected-error at -1:21 {{immediate must be an integer in the range [0, 3]}}
.insn qc.es 127, 7, 3, not_a_reg, 0(x0)
-# CHECK-ERR: [[@LINE-1]]:24: error: invalid operand for instruction
+# expected-error at -1:24 {{invalid operand for instruction}}
.insn qc.es 127, 7, 3, x31, 0x2000000(x0)
-# CHECK-ERR: [[@LINE-1]]:29: error: immediate must be an integer in the range [-33554432, 33554431]
+# expected-error at -1:29 {{immediate must be an integer in the range [-33554432, 33554431]}}
.insn qc.es 127, 7, 3, x31, 0x1000000(not_a_reg)
-# CHECK-ERR: [[@LINE-1]]:39: error: expected register
+# expected-error at -1:39 {{expected register}}
.insn qc.es 127, 7, 3, x31, 0x1000000(x31), extra
-# CHECK-ERR: [[@LINE-1]]:45: error: unexpected extra operand for instruction
+# expected-error at -1:45 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/invalid-attribute.s b/llvm/test/MC/RISCV/invalid-attribute.s
index 3a955e013fe4be..b338fcacf576d7 100644
--- a/llvm/test/MC/RISCV/invalid-attribute.s
+++ b/llvm/test/MC/RISCV/invalid-attribute.s
@@ -4,38 +4,38 @@
## - Feed string value to integer type attribute.
## - Invalid arch string.
-# RUN: not llvm-mc %s -triple=riscv32 -filetype=asm 2>&1 | FileCheck %s
-# RUN: not llvm-mc %s -triple=riscv64 -filetype=asm 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify %s -triple=riscv32 -filetype=asm
+# RUN: llvm-mc --verify %s -triple=riscv64 -filetype=asm
.attribute unknown, "unknown"
-# CHECK: [[@LINE-1]]:12: error: attribute name not recognised: unknown
+# expected-error at -1:12 {{attribute name not recognised: unknown}}
.attribute arch, "foo"
-# CHECK: [[@LINE-1]]:18: error: invalid arch name 'foo', string must begin with rv32{i,e,g,y}, rv64{i,e,g,y}, or a supported profile name{{$}}
+# expected-error at -1:18 {{invalid arch name 'foo', string must begin with rv32{i,e,g,y}, rv64{i,e,g,y}, or a supported profile name}}
.attribute arch, "rv32i2p1_z2p0"
-# CHECK: [[@LINE-1]]:18: error: invalid arch name 'rv32i2p1_z2p0', standard user-level extension name missing after 'z'
+# expected-error at -1:18 {{invalid arch name 'rv32i2p1_z2p0', standard user-level extension name missing after 'z'}}
.attribute arch, "rv32i2p1_t2p0"
-# CHECK: [[@LINE-1]]:18: error: invalid arch name 'rv32i2p1_t2p0', unsupported standard user-level extension 't'
+# expected-error at -1:18 {{invalid arch name 'rv32i2p1_t2p0', unsupported standard user-level extension 't'}}
.attribute stack_align, "16"
-# CHECK: [[@LINE-1]]:25: error: expected numeric constant
+# expected-error at -1:25 {{expected numeric constant}}
.attribute unaligned_access, "0"
-# CHECK: [[@LINE-1]]:30: error: expected numeric constant
+# expected-error at -1:30 {{expected numeric constant}}
.attribute priv_spec, "2"
-# CHECK: [[@LINE-1]]:23: error: expected numeric constant
+# expected-error at -1:23 {{expected numeric constant}}
.attribute priv_spec_minor, "0"
-# CHECK: [[@LINE-1]]:29: error: expected numeric constant
+# expected-error at -1:29 {{expected numeric constant}}
.attribute priv_spec_revision, "0"
-# CHECK: [[@LINE-1]]:32: error: expected numeric constant
+# expected-error at -1:32 {{expected numeric constant}}
.attribute arch, 30
-# CHECK: [[@LINE-1]]:18: error: expected string constant
+# expected-error at -1:18 {{expected string constant}}
.attribute atomic_abi, "16"
-# CHECK: [[@LINE-1]]:24: error: expected numeric constant
+# expected-error at -1:24 {{expected numeric constant}}
diff --git a/llvm/test/MC/RISCV/option-invalid.s b/llvm/test/MC/RISCV/option-invalid.s
index ee6c1ec439e51a..b77ad4e4aaf1da 100644
--- a/llvm/test/MC/RISCV/option-invalid.s
+++ b/llvm/test/MC/RISCV/option-invalid.s
@@ -1,71 +1,70 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 \
-# RUN: | FileCheck --implicit-check-not=error: %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
-# CHECK: :[[#@LINE+1]]:8: error: expected identifier
+# expected-error at +1:8 {{expected identifier}}
.option
-# CHECK: :[[#@LINE+1]]:9: error: expected identifier
+# expected-error at +1:9 {{expected identifier}}
.option 123
-# CHECK: :[[#@LINE+1]]:9: error: expected identifier
+# expected-error at +1:9 {{expected identifier}}
.option "str"
-# CHECK: :[[#@LINE+1]]:13: error: expected newline
+# expected-error at +1:13 {{expected newline}}
.option rvc foo
-# CHECK: :[[#@LINE+1]]:23: error: unexpected token, expected + or -
+# expected-error at +1:23 {{unexpected token, expected + or -}}
.option arch, +f, +d, rv32ifd, -d
-# CHECK: :[[#@LINE+1]]:22: error: expected newline
+# expected-error at +1:22 {{expected newline}}
.option arch, rv32ifd, +f, +d
-# CHECK: :[[#@LINE+1]]:16: error: unexpected token, expected identifier
+# expected-error at +1:16 {{unexpected token, expected identifier}}
.option arch, +"c"
-# CHECK: :[[#@LINE+1]]:16: error: unknown extension feature
+# expected-error at +1:16 {{unknown extension feature}}
.option arch, +x
-# CHECK: :[[#@LINE+1]]:16: error: unknown extension feature
+# expected-error at +1:16 {{unknown extension feature}}
.option arch, +relax
-# CHECK: :[[#@LINE+1]]:16: error: unexpected token, expected identifier
+# expected-error at +1:16 {{unexpected token, expected identifier}}
.option arch, +
-# CHECK: :[[#@LINE+1]]:18: error: expected comma
+# expected-error at +1:18 {{expected comma}}
.option arch, +c foo
-# CHECK: :[[#@LINE+1]]:16: error: extension version number parsing not currently implemented
+# expected-error at +1:16 {{extension version number parsing not currently implemented}}
.option arch, +c2p0
.option arch, +d
-# CHECK: :[[#@LINE+1]]:16: error: can't disable f extension; d extension requires f extension
+# expected-error at +1:16 {{can't disable f extension; d extension requires f extension}}
.option arch, -f
-# CHECK: :[[#@LINE+1]]:16: error: can't disable zicsr extension; f extension requires zicsr extension
+# expected-error at +1:16 {{can't disable zicsr extension; f extension requires zicsr extension}}
.option arch, -zicsr
-# CHECK: :[[#@LINE+1]]:20: error: 'f' and 'zfinx' extensions are incompatible
+# expected-error at +1:20 {{'f' and 'zfinx' extensions are incompatible}}
.option arch, +f, +zfinx
## Make sure the above error isn't sticky
.option arch, +f
-# CHECK: :[[#@LINE+1]]:13: error: expected newline
+# expected-error at +1:13 {{expected newline}}
.option rvc foo
-# CHECK: :[[#@LINE+1]]:12: warning: unknown option, expected 'push', 'pop', 'rvc', 'norvc', 'arch', 'relax', 'norelax', 'exact', or 'noexact'
+# expected-warning at +1:12 {{unknown option, expected 'push', 'pop', 'rvc', 'norvc', 'arch', 'relax', 'norelax', 'exact', or 'noexact'}}
.option bar
-# CHECK: :[[#@LINE+1]]:12: error: .option pop with no .option push
+# expected-error at +1:12 {{.option pop with no .option push}}
.option pop
-# CHECK: :[[#@LINE+1]]:14: error: expected newline
+# expected-error at +1:14 {{expected newline}}
.option push 123
-# CHECK: :[[#@LINE+1]]:13: error: expected newline
+# expected-error at +1:13 {{expected newline}}
.option pop 123
-# CHECK: :[[#@LINE+1]]:15: error: bad arch string switching from rv32 to rv64
+# expected-error at +1:15 {{bad arch string switching from rv32 to rv64}}
.option arch, rv64gc
## Enabling +zca (or +zca,+zcb,+zcmp,+zcmt) followed by +f should not imply Zcf
@@ -73,11 +72,11 @@
.option arch, rv32i
.option arch, +zca
.option arch, +f
-# CHECK: :[[#@LINE+1]]:1: error: instruction requires the following: 'C' (Compressed Instructions) and 'F' (Single-Precision Floating-Point) or 'Zcf' (Compressed Single-Precision Floating-Point Instructions){{$}}
+# expected-error at +1:1 {{instruction requires the following: 'C' (Compressed Instructions) and 'F' (Single-Precision Floating-Point) or 'Zcf' (Compressed Single-Precision Floating-Point Instructions)}}
c.flw fa0, 0(a0)
.option arch, rv32i
.option arch, +zca, +zcb, +zcmp, +zcmt
.option arch, +f
-# CHECK: :[[#@LINE+1]]:1: error: instruction requires the following: 'C' (Compressed Instructions) and 'F' (Single-Precision Floating-Point) or 'Zcf' (Compressed Single-Precision Floating-Point Instructions){{$}}
+# expected-error at +1:1 {{instruction requires the following: 'C' (Compressed Instructions) and 'F' (Single-Precision Floating-Point) or 'Zcf' (Compressed Single-Precision Floating-Point Instructions)}}
c.flw fa0, 0(a0)
diff --git a/llvm/test/MC/RISCV/pcrel-lo12-invalid.s b/llvm/test/MC/RISCV/pcrel-lo12-invalid.s
index e6dce0d6c69811..f310fe9762d319 100644
--- a/llvm/test/MC/RISCV/pcrel-lo12-invalid.s
+++ b/llvm/test/MC/RISCV/pcrel-lo12-invalid.s
@@ -1,7 +1,7 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=-relax -filetype obj < %s -o /dev/null 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv32 -mattr=+relax -filetype obj < %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=-relax -filetype obj -o /dev/null < %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+relax -filetype obj -o /dev/null < %s
1:
- addi a0, a0, %pcrel_lo(1b) # CHECK: :[[@LINE]]:17: error: could not find corresponding %pcrel_hi
- addi a0, a0, %pcrel_lo(0x123456) # CHECK: :[[@LINE]]:17: error: could not find corresponding %pcrel_hi
- addi a0, a0, %pcrel_lo(foo) # CHECK: :[[@LINE]]:17: error: could not find corresponding %pcrel_hi
+ addi a0, a0, %pcrel_lo(1b) # expected-error:17 {{could not find corresponding %pcrel_hi}}
+ addi a0, a0, %pcrel_lo(0x123456) # expected-error:17 {{could not find corresponding %pcrel_hi}}
+ addi a0, a0, %pcrel_lo(foo) # expected-error:17 {{could not find corresponding %pcrel_hi}}
diff --git a/llvm/test/MC/RISCV/priv-invalid.s b/llvm/test/MC/RISCV/priv-invalid.s
index c4bd1e8d741351..4703b2b3448450 100644
--- a/llvm/test/MC/RISCV/priv-invalid.s
+++ b/llvm/test/MC/RISCV/priv-invalid.s
@@ -1,94 +1,94 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
-mret 0x10 # CHECK: :[[@LINE]]:6: error: unexpected extra operand for instruction
+mret 0x10 # expected-error:6 {{unexpected extra operand for instruction}}
-sfence.vma zero, a1, a2 # CHECK: :[[@LINE]]:22: error: unexpected extra operand for instruction
+sfence.vma zero, a1, a2 # expected-error:22 {{unexpected extra operand for instruction}}
sfence.vma a0, 0x10
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:16: note: unexpected extra operand for instruction
-# CHECK: :[[@LINE-3]]:16: note: register must be a GPR
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:16 {{unexpected extra operand for instruction}}
+# expected-note at -3:16 {{register must be a GPR}}
-sinval.vma zero, a1, a2 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sinval.vma zero, a1, a2 # expected-error:1 {{invalid instruction}}
-sinval.vma a0, 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sinval.vma a0, 0x10 # expected-error:1 {{invalid instruction}}
-sfence.w.inval 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sfence.w.inval 0x10 # expected-error:1 {{invalid instruction}}
-sfence.inval.ir 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sfence.inval.ir 0x10 # expected-error:1 {{invalid instruction}}
-hfence.vvma zero, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.vvma zero, a1, a2 # expected-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.vvma a0, 0x10 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.vvma a0, 0x10 # expected-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.gvma zero, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.gvma zero, a1, a2 # expected-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.gvma a0, 0x10 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.gvma a0, 0x10 # expected-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hinval.vvma zero, a1, a2 # CHECK: :[[@LINE]]:1: error: invalid instruction
+hinval.vvma zero, a1, a2 # expected-error:1 {{invalid instruction}}
-hinval.vvma a0, 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+hinval.vvma a0, 0x10 # expected-error:1 {{invalid instruction}}
-hinval.gvma zero, a1, a2 # CHECK: :[[@LINE]]:1: error: invalid instruction
+hinval.gvma zero, a1, a2 # expected-error:1 {{invalid instruction}}
-hinval.gvma a0, 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+hinval.gvma a0, 0x10 # expected-error:1 {{invalid instruction}}
-hlv.b a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hlv.b a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hlv.b a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hlv.b a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hlv.b a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hlv.b a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
-hlv.bu a0, 0x10 # CHECK: :[[@LINE]]:17: error: expected '(' after optional integer offset
+hlv.bu a0, 0x10 # expected-error:17 {{expected '(' after optional integer offset}}
-hlv.bu a0, a1 # CHECK: :[[@LINE]]:12: error: expected '(' or optional integer offset
+hlv.bu a0, a1 # expected-error:12 {{expected '(' or optional integer offset}}
-hlv.bu a0, 1(a1) # CHECK: :[[@LINE]]:12: error: optional integer offset must be 0
+hlv.bu a0, 1(a1) # expected-error:12 {{optional integer offset must be 0}}
-hlv.h a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hlv.h a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hlv.h a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hlv.h a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hlv.h a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hlv.h a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
-hlv.hu a0, 0x10 # CHECK: :[[@LINE]]:17: error: expected '(' after optional integer offset
+hlv.hu a0, 0x10 # expected-error:17 {{expected '(' after optional integer offset}}
-hlv.hu a0, a1 # CHECK: :[[@LINE]]:12: error: expected '(' or optional integer offset
+hlv.hu a0, a1 # expected-error:12 {{expected '(' or optional integer offset}}
-hlv.hu a0, 1(a1) # CHECK: :[[@LINE]]:12: error: optional integer offset must be 0
+hlv.hu a0, 1(a1) # expected-error:12 {{optional integer offset must be 0}}
-hlvx.hu a0, 0x10 # CHECK: :[[@LINE]]:18: error: expected '(' after optional integer offset
+hlvx.hu a0, 0x10 # expected-error:18 {{expected '(' after optional integer offset}}
-hlvx.hu a0, a1 # CHECK: :[[@LINE]]:13: error: expected '(' or optional integer offset
+hlvx.hu a0, a1 # expected-error:13 {{expected '(' or optional integer offset}}
-hlvx.hu a0, 1(a1) # CHECK: :[[@LINE]]:13: error: optional integer offset must be 0
+hlvx.hu a0, 1(a1) # expected-error:13 {{optional integer offset must be 0}}
-hlv.w a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hlv.w a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hlv.w a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hlv.w a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hlv.w a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hlv.w a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
-hlvx.wu a0, 0x10 # CHECK: :[[@LINE]]:18: error: expected '(' after optional integer offset
+hlvx.wu a0, 0x10 # expected-error:18 {{expected '(' after optional integer offset}}
-hlvx.wu a0, a1 # CHECK: :[[@LINE]]:13: error: expected '(' or optional integer offset
+hlvx.wu a0, a1 # expected-error:13 {{expected '(' or optional integer offset}}
-hlvx.wu a0, 1(a1) # CHECK: :[[@LINE]]:13: error: optional integer offset must be 0
+hlvx.wu a0, 1(a1) # expected-error:13 {{optional integer offset must be 0}}
-hsv.b a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hsv.b a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hsv.b a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hsv.b a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hsv.b a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hsv.b a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
-hsv.h a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hsv.h a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hsv.h a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hsv.h a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hsv.h a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hsv.h a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
-hsv.w a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hsv.w a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hsv.w a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hsv.w a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hsv.w a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hsv.w a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
diff --git a/llvm/test/MC/RISCV/priv-rv64-invalid.s b/llvm/test/MC/RISCV/priv-rv64-invalid.s
index 4caefec8ff5fca..6b975a3126cbe9 100644
--- a/llvm/test/MC/RISCV/priv-rv64-invalid.s
+++ b/llvm/test/MC/RISCV/priv-rv64-invalid.s
@@ -1,19 +1,19 @@
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
-hlv.wu a0, 0x10 # CHECK: :[[@LINE]]:17: error: expected '(' after optional integer offset
+hlv.wu a0, 0x10 # expected-error:17 {{expected '(' after optional integer offset}}
-hlv.wu a0, a1 # CHECK: :[[@LINE]]:12: error: expected '(' or optional integer offset
+hlv.wu a0, a1 # expected-error:12 {{expected '(' or optional integer offset}}
-hlv.wu a0, 1(a1) # CHECK: :[[@LINE]]:12: error: optional integer offset must be 0
+hlv.wu a0, 1(a1) # expected-error:12 {{optional integer offset must be 0}}
-hlv.d a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hlv.d a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hlv.d a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hlv.d a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hlv.d a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hlv.d a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
-hsv.d a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hsv.d a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
-hsv.d a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hsv.d a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
-hsv.d a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hsv.d a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
diff --git a/llvm/test/MC/RISCV/pseudo-jump-invalid.s b/llvm/test/MC/RISCV/pseudo-jump-invalid.s
index 18640b6617ea3d..3bda73bf4466fc 100644
--- a/llvm/test/MC/RISCV/pseudo-jump-invalid.s
+++ b/llvm/test/MC/RISCV/pseudo-jump-invalid.s
@@ -1,6 +1,6 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
-jump 1234, x31 # CHECK: :[[@LINE]]:6: error: operand must be a valid jump target
-jump foo at plt, x31 # CHECK: :[[@LINE]]:9: error: unexpected token
-jump %pcrel_lo(1234), x31 # CHECK: :[[@LINE]]:6: error: unknown token in expression
-jump foo at xxx # CHECK: :[[@LINE]]:9: error: unexpected token
+jump 1234, x31 # expected-error:6 {{operand must be a valid jump target}}
+jump foo at plt, x31 # expected-error:9 {{unexpected token}}
+jump %pcrel_lo(1234), x31 # expected-error:6 {{unknown token in expression}}
+jump foo at xxx # expected-error:9 {{unexpected token}}
diff --git a/llvm/test/MC/RISCV/reloc-directive-err.s b/llvm/test/MC/RISCV/reloc-directive-err.s
index 370e4ceb957342..9af87f16643a5f 100644
--- a/llvm/test/MC/RISCV/reloc-directive-err.s
+++ b/llvm/test/MC/RISCV/reloc-directive-err.s
@@ -1,6 +1,6 @@
# RUN: llvm-mc -triple=riscv64 %s 2>&1 | FileCheck --check-prefix=PRINT %s
-# RUN: not llvm-mc -filetype=obj -triple=riscv64 %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -filetype=obj -triple=riscv64 %s -o /dev/null
# PRINT: .reloc {{.*}}, R_INVALID, 0
-# CHECK: {{.*}}.s:[[# @LINE+1]]:11: error: unknown relocation name
+# expected-error at +1:11 {{unknown relocation name}}
.reloc ., R_INVALID, 0
diff --git a/llvm/test/MC/RISCV/rv32-only-csr-names.s b/llvm/test/MC/RISCV/rv32-only-csr-names.s
index 92bb13c5305f29..653298ef7044d5 100644
--- a/llvm/test/MC/RISCV/rv32-only-csr-names.s
+++ b/llvm/test/MC/RISCV/rv32-only-csr-names.s
@@ -1,152 +1,151 @@
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NEED-RV32 %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
# The following CSR register names are all RV32 only.
-csrrs t1, cycleh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'cycleh' is RV32 only
-csrrs t1, timeh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'timeh' is RV32 only
-csrrs t1, instreth, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'instreth' is RV32 only
-
-csrrs t1, hpmcounter3h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter3h' is RV32 only
-csrrs t1, hpmcounter4h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter4h' is RV32 only
-csrrs t1, hpmcounter5h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter5h' is RV32 only
-csrrs t1, hpmcounter6h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter6h' is RV32 only
-csrrs t1, hpmcounter7h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter7h' is RV32 only
-csrrs t1, hpmcounter8h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter8h' is RV32 only
-csrrs t1, hpmcounter9h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter9h' is RV32 only
-csrrs t1, hpmcounter10h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter10h' is RV32 only
-csrrs t1, hpmcounter11h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter11h' is RV32 only
-csrrs t1, hpmcounter12h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter12h' is RV32 only
-csrrs t1, hpmcounter13h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter13h' is RV32 only
-csrrs t1, hpmcounter14h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter14h' is RV32 only
-csrrs t1, hpmcounter15h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter15h' is RV32 only
-csrrs t1, hpmcounter16h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter16h' is RV32 only
-csrrs t1, hpmcounter17h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter17h' is RV32 only
-csrrs t1, hpmcounter18h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter18h' is RV32 only
-csrrs t1, hpmcounter19h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter19h' is RV32 only
-csrrs t1, hpmcounter20h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter20h' is RV32 only
-csrrs t1, hpmcounter21h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter21h' is RV32 only
-csrrs t1, hpmcounter22h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter22h' is RV32 only
-csrrs t1, hpmcounter23h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter23h' is RV32 only
-csrrs t1, hpmcounter24h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter24h' is RV32 only
-csrrs t1, hpmcounter25h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter25h' is RV32 only
-csrrs t1, hpmcounter26h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter26h' is RV32 only
-csrrs t1, hpmcounter27h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter27h' is RV32 only
-csrrs t1, hpmcounter28h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter28h' is RV32 only
-csrrs t1, hpmcounter29h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter29h' is RV32 only
-csrrs t1, hpmcounter30h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter30h' is RV32 only
-csrrs t1, hpmcounter31h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hpmcounter31h' is RV32 only
-
-csrrs t1, henvcfgh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'henvcfgh' is RV32 only
-
-csrrs t1, htimedeltah, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'htimedeltah' is RV32 only
-
-csrrs t1, hedelegh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hedelegh' is RV32 only
-
-csrrs t1, mstatush, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mstatush' is RV32 only
-
-csrrs t1, menvcfgh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'menvcfgh' is RV32 only
-
-csrrs t1, mseccfgh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mseccfgh' is RV32 only
-
-csrrs t1, medelegh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'medelegh' is RV32 only
-
-csrrs t1, pmpcfg1, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg1' is RV32 only
-csrrs t1, pmpcfg3, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg3' is RV32 only
-csrrs t1, pmpcfg5, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg5' is RV32 only
-csrrs t1, pmpcfg7, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg7' is RV32 only
-csrrs t1, pmpcfg9, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg9' is RV32 only
-csrrs t1, pmpcfg11, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg11' is RV32 only
-csrrs t1, pmpcfg13, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg13' is RV32 only
-csrrs t1, pmpcfg15, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'pmpcfg15' is RV32 only
-
-csrrs t1, mcycleh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mcycleh' is RV32 only
-csrrs t1, minstreth, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'minstreth' is RV32 only
-
-csrrs t1, mhpmcounter3h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter3h' is RV32 only
-csrrs t1, mhpmcounter4h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter4h' is RV32 only
-csrrs t1, mhpmcounter5h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter5h' is RV32 only
-csrrs t1, mhpmcounter6h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter6h' is RV32 only
-csrrs t1, mhpmcounter7h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter7h' is RV32 only
-csrrs t1, mhpmcounter8h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter8h' is RV32 only
-csrrs t1, mhpmcounter9h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter9h' is RV32 only
-csrrs t1, mhpmcounter10h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter10h' is RV32 only
-csrrs t1, mhpmcounter11h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter11h' is RV32 only
-csrrs t1, mhpmcounter12h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter12h' is RV32 only
-csrrs t1, mhpmcounter13h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter13h' is RV32 only
-csrrs t1, mhpmcounter14h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter14h' is RV32 only
-csrrs t1, mhpmcounter15h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter15h' is RV32 only
-csrrs t1, mhpmcounter16h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter16h' is RV32 only
-csrrs t1, mhpmcounter17h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter17h' is RV32 only
-csrrs t1, mhpmcounter18h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter18h' is RV32 only
-csrrs t1, mhpmcounter19h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter19h' is RV32 only
-csrrs t1, mhpmcounter20h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter20h' is RV32 only
-csrrs t1, mhpmcounter21h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter21h' is RV32 only
-csrrs t1, mhpmcounter22h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter22h' is RV32 only
-csrrs t1, mhpmcounter23h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter23h' is RV32 only
-csrrs t1, mhpmcounter24h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter24h' is RV32 only
-csrrs t1, mhpmcounter25h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter25h' is RV32 only
-csrrs t1, mhpmcounter26h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter26h' is RV32 only
-csrrs t1, mhpmcounter27h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter27h' is RV32 only
-csrrs t1, mhpmcounter28h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter28h' is RV32 only
-csrrs t1, mhpmcounter29h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter29h' is RV32 only
-csrrs t1, mhpmcounter30h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter30h' is RV32 only
-csrrs t1, mhpmcounter31h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmcounter31h' is RV32 only
-
-csrrs t1, mhpmevent3h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent3h' is RV32 only
-csrrs t1, mhpmevent4h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent4h' is RV32 only
-csrrs t1, mhpmevent5h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent5h' is RV32 only
-csrrs t1, mhpmevent6h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent6h' is RV32 only
-csrrs t1, mhpmevent7h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent7h' is RV32 only
-csrrs t1, mhpmevent8h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent8h' is RV32 only
-csrrs t1, mhpmevent9h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent9h' is RV32 only
-csrrs t1, mhpmevent10h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent10h' is RV32 only
-csrrs t1, mhpmevent11h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent11h' is RV32 only
-csrrs t1, mhpmevent12h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent12h' is RV32 only
-csrrs t1, mhpmevent13h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent13h' is RV32 only
-csrrs t1, mhpmevent14h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent14h' is RV32 only
-csrrs t1, mhpmevent15h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent15h' is RV32 only
-csrrs t1, mhpmevent16h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent16h' is RV32 only
-csrrs t1, mhpmevent17h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent17h' is RV32 only
-csrrs t1, mhpmevent18h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent18h' is RV32 only
-csrrs t1, mhpmevent19h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent19h' is RV32 only
-csrrs t1, mhpmevent20h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent20h' is RV32 only
-csrrs t1, mhpmevent21h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent21h' is RV32 only
-csrrs t1, mhpmevent22h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent22h' is RV32 only
-csrrs t1, mhpmevent23h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent23h' is RV32 only
-csrrs t1, mhpmevent24h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent24h' is RV32 only
-csrrs t1, mhpmevent25h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent25h' is RV32 only
-csrrs t1, mhpmevent26h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent26h' is RV32 only
-csrrs t1, mhpmevent27h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent27h' is RV32 only
-csrrs t1, mhpmevent28h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent28h' is RV32 only
-csrrs t1, mhpmevent29h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent29h' is RV32 only
-csrrs t1, mhpmevent30h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent30h' is RV32 only
-csrrs t1, mhpmevent31h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mhpmevent31h' is RV32 only
-
-csrrs t1, mstateen0h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mstateen0h' is RV32 only
-csrrs t1, mstateen1h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mstateen1h' is RV32 only
-csrrs t1, mstateen2h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mstateen2h' is RV32 only
-csrrs t1, mstateen3h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mstateen3h' is RV32 only
-
-csrrs t1, hstateen0h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hstateen0h' is RV32 only
-csrrs t1, hstateen1h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hstateen1h' is RV32 only
-csrrs t1, hstateen2h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hstateen2h' is RV32 only
-csrrs t1, hstateen3h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hstateen3h' is RV32 only
-
-csrrs t1, stimecmph, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'stimecmph' is RV32 only
-csrrs t1, vstimecmph, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'vstimecmph' is RV32 only
-
-csrrs t1, midelegh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'midelegh' is RV32 only
-csrrs t1, mieh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mieh' is RV32 only
-csrrs t1, mvienh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mvienh' is RV32 only
-csrrs t1, mviph, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'mviph' is RV32 only
-csrrs t1, miph, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'miph' is RV32 only
-csrrs t1, sieh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'sieh' is RV32 only
-csrrs t1, siph, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'siph' is RV32 only
-csrrs t1, hidelegh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hidelegh' is RV32 only
-csrrs t1, hvienh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hvienh' is RV32 only
-csrrs t1, hviph, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hviph' is RV32 only
-csrrs t1, hviprio1h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hviprio1h' is RV32 only
-csrrs t1, hviprio2h, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'hviprio2h' is RV32 only
-csrrs t1, vsieh, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'vsieh' is RV32 only
-csrrs t1, vsiph, zero # CHECK-NEED-RV32: :[[@LINE]]:11: error: system register 'vsiph' is RV32 only
+csrrs t1, cycleh, zero # expected-error:11 {{system register 'cycleh' is RV32 only}}
+csrrs t1, timeh, zero # expected-error:11 {{system register 'timeh' is RV32 only}}
+csrrs t1, instreth, zero # expected-error:11 {{system register 'instreth' is RV32 only}}
+
+csrrs t1, hpmcounter3h, zero # expected-error:11 {{system register 'hpmcounter3h' is RV32 only}}
+csrrs t1, hpmcounter4h, zero # expected-error:11 {{system register 'hpmcounter4h' is RV32 only}}
+csrrs t1, hpmcounter5h, zero # expected-error:11 {{system register 'hpmcounter5h' is RV32 only}}
+csrrs t1, hpmcounter6h, zero # expected-error:11 {{system register 'hpmcounter6h' is RV32 only}}
+csrrs t1, hpmcounter7h, zero # expected-error:11 {{system register 'hpmcounter7h' is RV32 only}}
+csrrs t1, hpmcounter8h, zero # expected-error:11 {{system register 'hpmcounter8h' is RV32 only}}
+csrrs t1, hpmcounter9h, zero # expected-error:11 {{system register 'hpmcounter9h' is RV32 only}}
+csrrs t1, hpmcounter10h, zero # expected-error:11 {{system register 'hpmcounter10h' is RV32 only}}
+csrrs t1, hpmcounter11h, zero # expected-error:11 {{system register 'hpmcounter11h' is RV32 only}}
+csrrs t1, hpmcounter12h, zero # expected-error:11 {{system register 'hpmcounter12h' is RV32 only}}
+csrrs t1, hpmcounter13h, zero # expected-error:11 {{system register 'hpmcounter13h' is RV32 only}}
+csrrs t1, hpmcounter14h, zero # expected-error:11 {{system register 'hpmcounter14h' is RV32 only}}
+csrrs t1, hpmcounter15h, zero # expected-error:11 {{system register 'hpmcounter15h' is RV32 only}}
+csrrs t1, hpmcounter16h, zero # expected-error:11 {{system register 'hpmcounter16h' is RV32 only}}
+csrrs t1, hpmcounter17h, zero # expected-error:11 {{system register 'hpmcounter17h' is RV32 only}}
+csrrs t1, hpmcounter18h, zero # expected-error:11 {{system register 'hpmcounter18h' is RV32 only}}
+csrrs t1, hpmcounter19h, zero # expected-error:11 {{system register 'hpmcounter19h' is RV32 only}}
+csrrs t1, hpmcounter20h, zero # expected-error:11 {{system register 'hpmcounter20h' is RV32 only}}
+csrrs t1, hpmcounter21h, zero # expected-error:11 {{system register 'hpmcounter21h' is RV32 only}}
+csrrs t1, hpmcounter22h, zero # expected-error:11 {{system register 'hpmcounter22h' is RV32 only}}
+csrrs t1, hpmcounter23h, zero # expected-error:11 {{system register 'hpmcounter23h' is RV32 only}}
+csrrs t1, hpmcounter24h, zero # expected-error:11 {{system register 'hpmcounter24h' is RV32 only}}
+csrrs t1, hpmcounter25h, zero # expected-error:11 {{system register 'hpmcounter25h' is RV32 only}}
+csrrs t1, hpmcounter26h, zero # expected-error:11 {{system register 'hpmcounter26h' is RV32 only}}
+csrrs t1, hpmcounter27h, zero # expected-error:11 {{system register 'hpmcounter27h' is RV32 only}}
+csrrs t1, hpmcounter28h, zero # expected-error:11 {{system register 'hpmcounter28h' is RV32 only}}
+csrrs t1, hpmcounter29h, zero # expected-error:11 {{system register 'hpmcounter29h' is RV32 only}}
+csrrs t1, hpmcounter30h, zero # expected-error:11 {{system register 'hpmcounter30h' is RV32 only}}
+csrrs t1, hpmcounter31h, zero # expected-error:11 {{system register 'hpmcounter31h' is RV32 only}}
+
+csrrs t1, henvcfgh, zero # expected-error:11 {{system register 'henvcfgh' is RV32 only}}
+
+csrrs t1, htimedeltah, zero # expected-error:11 {{system register 'htimedeltah' is RV32 only}}
+
+csrrs t1, hedelegh, zero # expected-error:11 {{system register 'hedelegh' is RV32 only}}
+
+csrrs t1, mstatush, zero # expected-error:11 {{system register 'mstatush' is RV32 only}}
+
+csrrs t1, menvcfgh, zero # expected-error:11 {{system register 'menvcfgh' is RV32 only}}
+
+csrrs t1, mseccfgh, zero # expected-error:11 {{system register 'mseccfgh' is RV32 only}}
+
+csrrs t1, medelegh, zero # expected-error:11 {{system register 'medelegh' is RV32 only}}
+
+csrrs t1, pmpcfg1, zero # expected-error:11 {{system register 'pmpcfg1' is RV32 only}}
+csrrs t1, pmpcfg3, zero # expected-error:11 {{system register 'pmpcfg3' is RV32 only}}
+csrrs t1, pmpcfg5, zero # expected-error:11 {{system register 'pmpcfg5' is RV32 only}}
+csrrs t1, pmpcfg7, zero # expected-error:11 {{system register 'pmpcfg7' is RV32 only}}
+csrrs t1, pmpcfg9, zero # expected-error:11 {{system register 'pmpcfg9' is RV32 only}}
+csrrs t1, pmpcfg11, zero # expected-error:11 {{system register 'pmpcfg11' is RV32 only}}
+csrrs t1, pmpcfg13, zero # expected-error:11 {{system register 'pmpcfg13' is RV32 only}}
+csrrs t1, pmpcfg15, zero # expected-error:11 {{system register 'pmpcfg15' is RV32 only}}
+
+csrrs t1, mcycleh, zero # expected-error:11 {{system register 'mcycleh' is RV32 only}}
+csrrs t1, minstreth, zero # expected-error:11 {{system register 'minstreth' is RV32 only}}
+
+csrrs t1, mhpmcounter3h, zero # expected-error:11 {{system register 'mhpmcounter3h' is RV32 only}}
+csrrs t1, mhpmcounter4h, zero # expected-error:11 {{system register 'mhpmcounter4h' is RV32 only}}
+csrrs t1, mhpmcounter5h, zero # expected-error:11 {{system register 'mhpmcounter5h' is RV32 only}}
+csrrs t1, mhpmcounter6h, zero # expected-error:11 {{system register 'mhpmcounter6h' is RV32 only}}
+csrrs t1, mhpmcounter7h, zero # expected-error:11 {{system register 'mhpmcounter7h' is RV32 only}}
+csrrs t1, mhpmcounter8h, zero # expected-error:11 {{system register 'mhpmcounter8h' is RV32 only}}
+csrrs t1, mhpmcounter9h, zero # expected-error:11 {{system register 'mhpmcounter9h' is RV32 only}}
+csrrs t1, mhpmcounter10h, zero # expected-error:11 {{system register 'mhpmcounter10h' is RV32 only}}
+csrrs t1, mhpmcounter11h, zero # expected-error:11 {{system register 'mhpmcounter11h' is RV32 only}}
+csrrs t1, mhpmcounter12h, zero # expected-error:11 {{system register 'mhpmcounter12h' is RV32 only}}
+csrrs t1, mhpmcounter13h, zero # expected-error:11 {{system register 'mhpmcounter13h' is RV32 only}}
+csrrs t1, mhpmcounter14h, zero # expected-error:11 {{system register 'mhpmcounter14h' is RV32 only}}
+csrrs t1, mhpmcounter15h, zero # expected-error:11 {{system register 'mhpmcounter15h' is RV32 only}}
+csrrs t1, mhpmcounter16h, zero # expected-error:11 {{system register 'mhpmcounter16h' is RV32 only}}
+csrrs t1, mhpmcounter17h, zero # expected-error:11 {{system register 'mhpmcounter17h' is RV32 only}}
+csrrs t1, mhpmcounter18h, zero # expected-error:11 {{system register 'mhpmcounter18h' is RV32 only}}
+csrrs t1, mhpmcounter19h, zero # expected-error:11 {{system register 'mhpmcounter19h' is RV32 only}}
+csrrs t1, mhpmcounter20h, zero # expected-error:11 {{system register 'mhpmcounter20h' is RV32 only}}
+csrrs t1, mhpmcounter21h, zero # expected-error:11 {{system register 'mhpmcounter21h' is RV32 only}}
+csrrs t1, mhpmcounter22h, zero # expected-error:11 {{system register 'mhpmcounter22h' is RV32 only}}
+csrrs t1, mhpmcounter23h, zero # expected-error:11 {{system register 'mhpmcounter23h' is RV32 only}}
+csrrs t1, mhpmcounter24h, zero # expected-error:11 {{system register 'mhpmcounter24h' is RV32 only}}
+csrrs t1, mhpmcounter25h, zero # expected-error:11 {{system register 'mhpmcounter25h' is RV32 only}}
+csrrs t1, mhpmcounter26h, zero # expected-error:11 {{system register 'mhpmcounter26h' is RV32 only}}
+csrrs t1, mhpmcounter27h, zero # expected-error:11 {{system register 'mhpmcounter27h' is RV32 only}}
+csrrs t1, mhpmcounter28h, zero # expected-error:11 {{system register 'mhpmcounter28h' is RV32 only}}
+csrrs t1, mhpmcounter29h, zero # expected-error:11 {{system register 'mhpmcounter29h' is RV32 only}}
+csrrs t1, mhpmcounter30h, zero # expected-error:11 {{system register 'mhpmcounter30h' is RV32 only}}
+csrrs t1, mhpmcounter31h, zero # expected-error:11 {{system register 'mhpmcounter31h' is RV32 only}}
+
+csrrs t1, mhpmevent3h, zero # expected-error:11 {{system register 'mhpmevent3h' is RV32 only}}
+csrrs t1, mhpmevent4h, zero # expected-error:11 {{system register 'mhpmevent4h' is RV32 only}}
+csrrs t1, mhpmevent5h, zero # expected-error:11 {{system register 'mhpmevent5h' is RV32 only}}
+csrrs t1, mhpmevent6h, zero # expected-error:11 {{system register 'mhpmevent6h' is RV32 only}}
+csrrs t1, mhpmevent7h, zero # expected-error:11 {{system register 'mhpmevent7h' is RV32 only}}
+csrrs t1, mhpmevent8h, zero # expected-error:11 {{system register 'mhpmevent8h' is RV32 only}}
+csrrs t1, mhpmevent9h, zero # expected-error:11 {{system register 'mhpmevent9h' is RV32 only}}
+csrrs t1, mhpmevent10h, zero # expected-error:11 {{system register 'mhpmevent10h' is RV32 only}}
+csrrs t1, mhpmevent11h, zero # expected-error:11 {{system register 'mhpmevent11h' is RV32 only}}
+csrrs t1, mhpmevent12h, zero # expected-error:11 {{system register 'mhpmevent12h' is RV32 only}}
+csrrs t1, mhpmevent13h, zero # expected-error:11 {{system register 'mhpmevent13h' is RV32 only}}
+csrrs t1, mhpmevent14h, zero # expected-error:11 {{system register 'mhpmevent14h' is RV32 only}}
+csrrs t1, mhpmevent15h, zero # expected-error:11 {{system register 'mhpmevent15h' is RV32 only}}
+csrrs t1, mhpmevent16h, zero # expected-error:11 {{system register 'mhpmevent16h' is RV32 only}}
+csrrs t1, mhpmevent17h, zero # expected-error:11 {{system register 'mhpmevent17h' is RV32 only}}
+csrrs t1, mhpmevent18h, zero # expected-error:11 {{system register 'mhpmevent18h' is RV32 only}}
+csrrs t1, mhpmevent19h, zero # expected-error:11 {{system register 'mhpmevent19h' is RV32 only}}
+csrrs t1, mhpmevent20h, zero # expected-error:11 {{system register 'mhpmevent20h' is RV32 only}}
+csrrs t1, mhpmevent21h, zero # expected-error:11 {{system register 'mhpmevent21h' is RV32 only}}
+csrrs t1, mhpmevent22h, zero # expected-error:11 {{system register 'mhpmevent22h' is RV32 only}}
+csrrs t1, mhpmevent23h, zero # expected-error:11 {{system register 'mhpmevent23h' is RV32 only}}
+csrrs t1, mhpmevent24h, zero # expected-error:11 {{system register 'mhpmevent24h' is RV32 only}}
+csrrs t1, mhpmevent25h, zero # expected-error:11 {{system register 'mhpmevent25h' is RV32 only}}
+csrrs t1, mhpmevent26h, zero # expected-error:11 {{system register 'mhpmevent26h' is RV32 only}}
+csrrs t1, mhpmevent27h, zero # expected-error:11 {{system register 'mhpmevent27h' is RV32 only}}
+csrrs t1, mhpmevent28h, zero # expected-error:11 {{system register 'mhpmevent28h' is RV32 only}}
+csrrs t1, mhpmevent29h, zero # expected-error:11 {{system register 'mhpmevent29h' is RV32 only}}
+csrrs t1, mhpmevent30h, zero # expected-error:11 {{system register 'mhpmevent30h' is RV32 only}}
+csrrs t1, mhpmevent31h, zero # expected-error:11 {{system register 'mhpmevent31h' is RV32 only}}
+
+csrrs t1, mstateen0h, zero # expected-error:11 {{system register 'mstateen0h' is RV32 only}}
+csrrs t1, mstateen1h, zero # expected-error:11 {{system register 'mstateen1h' is RV32 only}}
+csrrs t1, mstateen2h, zero # expected-error:11 {{system register 'mstateen2h' is RV32 only}}
+csrrs t1, mstateen3h, zero # expected-error:11 {{system register 'mstateen3h' is RV32 only}}
+
+csrrs t1, hstateen0h, zero # expected-error:11 {{system register 'hstateen0h' is RV32 only}}
+csrrs t1, hstateen1h, zero # expected-error:11 {{system register 'hstateen1h' is RV32 only}}
+csrrs t1, hstateen2h, zero # expected-error:11 {{system register 'hstateen2h' is RV32 only}}
+csrrs t1, hstateen3h, zero # expected-error:11 {{system register 'hstateen3h' is RV32 only}}
+
+csrrs t1, stimecmph, zero # expected-error:11 {{system register 'stimecmph' is RV32 only}}
+csrrs t1, vstimecmph, zero # expected-error:11 {{system register 'vstimecmph' is RV32 only}}
+
+csrrs t1, midelegh, zero # expected-error:11 {{system register 'midelegh' is RV32 only}}
+csrrs t1, mieh, zero # expected-error:11 {{system register 'mieh' is RV32 only}}
+csrrs t1, mvienh, zero # expected-error:11 {{system register 'mvienh' is RV32 only}}
+csrrs t1, mviph, zero # expected-error:11 {{system register 'mviph' is RV32 only}}
+csrrs t1, miph, zero # expected-error:11 {{system register 'miph' is RV32 only}}
+csrrs t1, sieh, zero # expected-error:11 {{system register 'sieh' is RV32 only}}
+csrrs t1, siph, zero # expected-error:11 {{system register 'siph' is RV32 only}}
+csrrs t1, hidelegh, zero # expected-error:11 {{system register 'hidelegh' is RV32 only}}
+csrrs t1, hvienh, zero # expected-error:11 {{system register 'hvienh' is RV32 only}}
+csrrs t1, hviph, zero # expected-error:11 {{system register 'hviph' is RV32 only}}
+csrrs t1, hviprio1h, zero # expected-error:11 {{system register 'hviprio1h' is RV32 only}}
+csrrs t1, hviprio2h, zero # expected-error:11 {{system register 'hviprio2h' is RV32 only}}
+csrrs t1, vsieh, zero # expected-error:11 {{system register 'vsieh' is RV32 only}}
+csrrs t1, vsiph, zero # expected-error:11 {{system register 'vsiph' is RV32 only}}
diff --git a/llvm/test/MC/RISCV/rv32c-invalid.s b/llvm/test/MC/RISCV/rv32c-invalid.s
index 76b1c598ed8f48..fce9b4b359472b 100644
--- a/llvm/test/MC/RISCV/rv32c-invalid.s
+++ b/llvm/test/MC/RISCV/rv32c-invalid.s
@@ -1,147 +1,145 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+c < %s 2>&1 \
-# RUN: | FileCheck %s --implicit-check-not="error:"
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zca < %s 2>&1 \
-# RUN: | FileCheck %s --implicit-check-not="error:"
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+c < %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zca < %s
## GPRC
.LBB:
c.lw ra, 4(sp)
-# CHECK: :[[#@LINE-1]]:7: error: register must be a GPR from x8 to x15
+# expected-error at -1:7 {{register must be a GPR from x8 to x15}}
c.sw sp, 4(sp)
-# CHECK: :[[#@LINE-1]]:7: error: register must be a GPR from x8 to x15
+# expected-error at -1:7 {{register must be a GPR from x8 to x15}}
c.beqz t0, .LBB
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR from x8 to x15
+# expected-error at -1:9 {{register must be a GPR from x8 to x15}}
c.bnez s8, .LBB
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR from x8 to x15
+# expected-error at -1:9 {{register must be a GPR from x8 to x15}}
c.addi4spn s4, sp, 12
-# CHECK: :[[#@LINE-1]]:13: error: register must be a GPR from x8 to x15
+# expected-error at -1:13 {{register must be a GPR from x8 to x15}}
c.srli s7, 12
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR from x8 to x15
+# expected-error at -1:9 {{register must be a GPR from x8 to x15}}
c.srai t0, 12
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR from x8 to x15
+# expected-error at -1:9 {{register must be a GPR from x8 to x15}}
c.andi t1, 12
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR from x8 to x15
+# expected-error at -1:9 {{register must be a GPR from x8 to x15}}
c.and t1, a0
-# CHECK: :[[#@LINE-1]]:8: error: register must be a GPR from x8 to x15
+# expected-error at -1:8 {{register must be a GPR from x8 to x15}}
c.or a0, s8
-# CHECK: :[[#@LINE-1]]:12: error: register must be a GPR from x8 to x15
+# expected-error at -1:12 {{register must be a GPR from x8 to x15}}
c.xor t2, a0
-# CHECK: :[[#@LINE-1]]:8: error: register must be a GPR from x8 to x15
+# expected-error at -1:8 {{register must be a GPR from x8 to x15}}
c.sub a0, s8
-# CHECK: :[[#@LINE-1]]:12: error: register must be a GPR from x8 to x15
+# expected-error at -1:12 {{register must be a GPR from x8 to x15}}
## GPRNoX0
c.lwsp x0, 4(sp)
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:9 {{register must be a GPR excluding zero (x0)}}
c.lwsp zero, 4(sp)
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:9 {{register must be a GPR excluding zero (x0)}}
c.jr x0
-# CHECK: :[[#@LINE-1]]:7: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:7 {{register must be a GPR excluding zero (x0)}}
c.jalr zero
-# CHECK: :[[#@LINE-1]]:9: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:9 {{register must be a GPR excluding zero (x0)}}
c.mv ra, x0
-# CHECK: :[[#@LINE-1]]:11: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:11 {{register must be a GPR excluding zero (x0)}}
c.add ra, ra, x0
-# CHECK: :[[#@LINE-1]]:16: error: unexpected extra operand for instruction
+# expected-error at -1:16 {{unexpected extra operand for instruction}}
## GPRNoX2
c.lui x2, 4
-# CHECK: :[[#@LINE-1]]:7: error: register must be a GPR excluding sp (x2){{$}}
+# expected-error at -1:7 {{register must be a GPR excluding sp (x2)}}
## SP
c.addi4spn a0, a0, 12
-# CHECK: :[[#@LINE-1]]:17: error: register must be sp (x2)
+# expected-error at -1:17 {{register must be sp (x2)}}
c.addi16sp t0, 16
-# CHECK: :[[#@LINE-1]]:13: error: register must be sp (x2)
+# expected-error at -1:13 {{register must be sp (x2)}}
# Out of range immediates
## uimmlog2xlenn
c.slli t0, 64
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [0, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [0, 31]}}
c.srli a0, 32
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [0, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [0, 31]}}
## simm6
c.li t0, 128
-# CHECK: :[[#@LINE-1]]:10: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:10 {{immediate must be an integer in the range [-32, 31]}}
c.li t0, foo
-# CHECK: :[[#@LINE-1]]:10: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:10 {{immediate must be an integer in the range [-32, 31]}}
c.li t0, %lo(foo)
-# CHECK: :[[#@LINE-1]]:10: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:10 {{immediate must be an integer in the range [-32, 31]}}
c.li t0, %hi(foo)
-# CHECK: :[[#@LINE-1]]:10: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:10 {{immediate must be an integer in the range [-32, 31]}}
c.andi a0, -33
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.andi a0, foo
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.andi a0, %lo(foo)
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.andi a0, %hi(foo)
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.addi t0, -33
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.addi t0, 32
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.addi t0, foo
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.addi t0, %lo(foo)
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.addi t0, %hi(foo)
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
## simm6nonzero
c.nop 32
-# CHECK: :[[#@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[#@LINE-2]]:7: note: unexpected extra operand for instruction
-# CHECK: :[[#@LINE-3]]:7: note: immediate must be non-zero in the range [-32, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:7 {{unexpected extra operand for instruction}}
+# expected-note at -3:7 {{immediate must be non-zero in the range [-32, 31]}}
## c_lui_imm
c.lui t0, 0
-# CHECK: :[[#@LINE-1]]:11: error: immediate must be in [0xfffe0, 0xfffff] or [1, 31]
+# expected-error at -1:11 {{immediate must be in [0xfffe0, 0xfffff] or [1, 31]}}
c.lui t0, 32
-# CHECK: :[[#@LINE-1]]:11: error: immediate must be in [0xfffe0, 0xfffff] or [1, 31]
+# expected-error at -1:11 {{immediate must be in [0xfffe0, 0xfffff] or [1, 31]}}
c.lui t0, 0xffffdf
-# CHECK: :[[#@LINE-1]]:11: error: immediate must be in [0xfffe0, 0xfffff] or [1, 31]
+# expected-error at -1:11 {{immediate must be in [0xfffe0, 0xfffff] or [1, 31]}}
c.lui t0, 0x1000000
-# CHECK: :[[#@LINE-1]]:11: error: immediate must be in [0xfffe0, 0xfffff] or [1, 31]
+# expected-error at -1:11 {{immediate must be in [0xfffe0, 0xfffff] or [1, 31]}}
c.lui t0, foo
-# CHECK: [[#@LINE-1]]:11: error: immediate must be in [0xfffe0, 0xfffff] or [1, 31]
+# expected-error at -1:11 {{immediate must be in [0xfffe0, 0xfffff] or [1, 31]}}
## uimm8_lsb00_optional
c.lwsp ra, 256(sp)
-# CHECK: :[[#@LINE-1]]:13: error: immediate must be a multiple of 4 bytes in the range [0, 252]
+# expected-error at -1:13 {{immediate must be a multiple of 4 bytes in the range [0, 252]}}
c.swsp ra, -4(sp)
-# CHECK: :[[#@LINE-1]]:13: error: immediate must be a multiple of 4 bytes in the range [0, 252]
+# expected-error at -1:13 {{immediate must be a multiple of 4 bytes in the range [0, 252]}}
## uimm7_lsb00_optional
c.lw s0, -4(sp)
-# CHECK: :[[#@LINE-1]]:11: error: immediate must be a multiple of 4 bytes in the range [0, 124]
+# expected-error at -1:11 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
c.sw s0, 128(sp)
-# CHECK: :[[#@LINE-1]]:11: error: immediate must be a multiple of 4 bytes in the range [0, 124]
+# expected-error at -1:11 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
## simm9_lsb0
c.bnez s1, -258
-# CHECK: :[[#@LINE-1]]:13: error: immediate must be a multiple of 2 bytes in the range [-256, 254]
+# expected-error at -1:13 {{immediate must be a multiple of 2 bytes in the range [-256, 254]}}
c.beqz a0, 256
-# CHECK: :[[#@LINE-1]]:13: error: immediate must be a multiple of 2 bytes in the range [-256, 254]
+# expected-error at -1:13 {{immediate must be a multiple of 2 bytes in the range [-256, 254]}}
## simm12_lsb0
c.j 2048
-# CHECK: :[[#@LINE-1]]:5: error: immediate must be a multiple of 2 bytes in the range [-2048, 2046]
+# expected-error at -1:5 {{immediate must be a multiple of 2 bytes in the range [-2048, 2046]}}
c.jal -2050
-# CHECK: :[[#@LINE-1]]:7: error: immediate must be a multiple of 2 bytes in the range [-2048, 2046]
+# expected-error at -1:7 {{immediate must be a multiple of 2 bytes in the range [-2048, 2046]}}
## uimm10_lsb00nonzero
c.addi4spn a0, sp, 0
-# CHECK: :[[#@LINE-1]]:21: error: immediate must be a multiple of 4 bytes in the range [4, 1020]
+# expected-error at -1:21 {{immediate must be a multiple of 4 bytes in the range [4, 1020]}}
c.addi4spn a0, sp, 1024
-# CHECK: :[[#@LINE-1]]:21: error: immediate must be a multiple of 4 bytes in the range [4, 1020]
+# expected-error at -1:21 {{immediate must be a multiple of 4 bytes in the range [4, 1020]}}
## simm10_lsb0000nonzero
c.addi16sp sp, -528
-# CHECK: :[[#@LINE-1]]:17: error: immediate must be a multiple of 16 bytes and non-zero in the range [-512, 496]
+# expected-error at -1:17 {{immediate must be a multiple of 16 bytes and non-zero in the range [-512, 496]}}
c.addi16sp sp, 512
-# CHECK: :[[#@LINE-1]]:17: error: immediate must be a multiple of 16 bytes and non-zero in the range [-512, 496]
+# expected-error at -1:17 {{immediate must be a multiple of 16 bytes and non-zero in the range [-512, 496]}}
c.addi16sp sp, 0
-# CHECK: :[[#@LINE-1]]:17: error: immediate must be a multiple of 16 bytes and non-zero in the range [-512, 496]
+# expected-error at -1:17 {{immediate must be a multiple of 16 bytes and non-zero in the range [-512, 496]}}
diff --git a/llvm/test/MC/RISCV/rv32d-invalid.s b/llvm/test/MC/RISCV/rv32d-invalid.s
index 709a39831cf6f6..8508a559f8b57a 100644
--- a/llvm/test/MC/RISCV/rv32d-invalid.s
+++ b/llvm/test/MC/RISCV/rv32d-invalid.s
@@ -1,31 +1,31 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+d < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+d < %s
# Out of range immediates
## simm12
-fld ft1, -2049(a0) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-fsd ft2, 2048(a1) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+fld ft1, -2049(a0) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+fsd ft2, 2048(a1) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Memory operand not formatted correctly
-fld ft1, a0, -200 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-fsd ft2, a1, 100 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-fld ft1, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
-fsd ft2, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
+fld ft1, a0, -200 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+fsd ft2, a1, 100 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+fld ft1, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
+fsd ft2, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
# Invalid register names
-fld ft15, 100(a0) # CHECK: :[[@LINE]]:5: error: register must be a FPR
-fld ft1, 100(a10) # CHECK: :[[@LINE]]:14: error: expected register
-fsgnjn.d fa100, fa2, fa3 # CHECK: :[[@LINE]]:10: error: register must be a FPR
+fld ft15, 100(a0) # expected-error:5 {{register must be a FPR}}
+fld ft1, 100(a10) # expected-error:14 {{expected register}}
+fsgnjn.d fa100, fa2, fa3 # expected-error:10 {{register must be a FPR}}
# Integer registers where FP regs are expected
fadd.d a2, a1, a0
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: register must be a FPR
-# CHECK: :[[@LINE-3]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer), RV64I Base Instruction Set
-# CHECK: :[[@LINE-4]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer)
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{register must be a FPR}}
+# expected-note at -3:1 {{instruction requires the following: 'Zdinx' (Double in Integer), RV64I Base Instruction Set}}
+# expected-note at -4:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
# FP registers where integer regs are expected
fcvt.wu.d ft2, a1
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:11: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer), RV64I Base Instruction Set
-# CHECK: :[[@LINE-4]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer)
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{register must be a GPR}}
+# expected-note at -3:1 {{instruction requires the following: 'Zdinx' (Double in Integer), RV64I Base Instruction Set}}
+# expected-note at -4:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
diff --git a/llvm/test/MC/RISCV/rv32dc-invalid.s b/llvm/test/MC/RISCV/rv32dc-invalid.s
index a3631d95bba9cc..0e02464bcc471b 100644
--- a/llvm/test/MC/RISCV/rv32dc-invalid.s
+++ b/llvm/test/MC/RISCV/rv32dc-invalid.s
@@ -1,12 +1,12 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+c,+d < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+c,+d < %s
## FPRC
-c.fld ft3, 8(a5) # CHECK: :[[@LINE]]:8: error: register must be a FPR
+c.fld ft3, 8(a5) # expected-error:8 {{register must be a FPR}}
## uimm9_lsb000
-c.fldsp fs1, 512(sp) # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 8 bytes in the range [0, 504]
-c.fsdsp fs2, -8(sp) # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 8 bytes in the range [0, 504]
+c.fldsp fs1, 512(sp) # expected-error:15 {{immediate must be a multiple of 8 bytes in the range [0, 504]}}
+c.fsdsp fs2, -8(sp) # expected-error:15 {{immediate must be a multiple of 8 bytes in the range [0, 504]}}
## uimm8_lsb000
-c.fld fs0, -8(sp) # CHECK: :[[@LINE]]:13: error: immediate must be a multiple of 8 bytes in the range [0, 248]
-c.fsd fs1, 256(sp) # CHECK: :[[@LINE]]:13: error: immediate must be a multiple of 8 bytes in the range [0, 248]
+c.fld fs0, -8(sp) # expected-error:13 {{immediate must be a multiple of 8 bytes in the range [0, 248]}}
+c.fsd fs1, 256(sp) # expected-error:13 {{immediate must be a multiple of 8 bytes in the range [0, 248]}}
diff --git a/llvm/test/MC/RISCV/rv32e-xqccmp-invalid.s b/llvm/test/MC/RISCV/rv32e-xqccmp-invalid.s
index ff8bdd983312a9..2e1bf976c56651 100644
--- a/llvm/test/MC/RISCV/rv32e-xqccmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv32e-xqccmp-invalid.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+e,+xqccmp < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+e,+xqccmp < %s
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+xqccmp < %s \
# RUN: | llvm-objdump --mattr=+e,+xqccmp -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefix=CHECK-DIS %s
@@ -8,17 +8,17 @@
# CHECK-DIS: b872 <unknown>
-# CHECK: :[[@LINE+1]]:19: error: invalid register
+# expected-error at +1:19 {{invalid register}}
qc.cm.push {ra,s0-s2}, -16
# CHECK-DIS: be72 <unknown>
-# CHECK: :[[@LINE+1]]:21: error: invalid register
+# expected-error at +1:21 {{invalid register}}
qc.cm.popret {ra,s0-s2}, 16
# CHECK-DIS: ba72 <unknown>
-# CHECK: :[[@LINE+1]]:23: error: invalid register
+# expected-error at +1:23 {{invalid register}}
qc.cm.pop {x1, x8-x9, x18}, 16
# CHECK-DIS: b972 <unknown>
-# CHECK: :[[@LINE+1]]:26: error: invalid register
+# expected-error at +1:26 {{invalid register}}
qc.cm.pushfp {x1, x8-x9, x18}, -16
# CHECK-DIS: b972 <unknown>
-# CHECK: :[[@LINE+1]]:22: error: invalid register
+# expected-error at +1:22 {{invalid register}}
qc.cm.pushfp {ra, s0-s2}, -16
diff --git a/llvm/test/MC/RISCV/rv32e-zcmp-invalid.s b/llvm/test/MC/RISCV/rv32e-zcmp-invalid.s
index a2942a84b9d3ff..d9865c79904d77 100644
--- a/llvm/test/MC/RISCV/rv32e-zcmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv32e-zcmp-invalid.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+e,+zcmp < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+e,+zcmp < %s
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zcmp < %s \
# RUN: | llvm-objdump --mattr=+e,+zcmp -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefix=CHECK-DIS %s
@@ -8,14 +8,14 @@
# CHECK-DIS: b872 <unknown>
-# CHECK: :[[@LINE+1]]:16: error: invalid register
+# expected-error at +1:16 {{invalid register}}
cm.push {ra,s0-s2}, -16
# CHECK-DIS: be72 <unknown>
-# CHECK: :[[@LINE+1]]:18: error: invalid register
+# expected-error at +1:18 {{invalid register}}
cm.popret {ra,s0-s2}, 16
# CHECK-DIS: ba72 <unknown>
-# CHECK: :[[@LINE+1]]:20: error: invalid register
+# expected-error at +1:20 {{invalid register}}
cm.pop {x1, x8-x9, x18}, 16
# CHECK-DIS: ba72 <unknown>
-# CHECK: :[[@LINE+1]]:16: error: invalid register
+# expected-error at +1:16 {{invalid register}}
cm.pop {ra, s0-s2}, 16
diff --git a/llvm/test/MC/RISCV/rv32f-invalid.s b/llvm/test/MC/RISCV/rv32f-invalid.s
index 229589d3371b1b..6e11030a7f045d 100644
--- a/llvm/test/MC/RISCV/rv32f-invalid.s
+++ b/llvm/test/MC/RISCV/rv32f-invalid.s
@@ -1,36 +1,36 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+f < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+f < %s
# Out of range immediates
## simm12
-flw ft1, -2049(a0) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-fsw ft2, 2048(a1) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+flw ft1, -2049(a0) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+fsw ft2, 2048(a1) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Memory operand not formatted correctly
-flw ft1, a0, -200 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-fsw ft2, a1, 100 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-flw ft1, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
-fsw ft2, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
+flw ft1, a0, -200 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+fsw ft2, a1, 100 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+flw ft1, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
+fsw ft2, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
# Invalid register names
-flw ft15, 100(a0) # CHECK: :[[@LINE]]:5: error: register must be a FPR
-flw ft1, 100(a10) # CHECK: :[[@LINE]]:14: error: expected register
-fsgnjn.s fa100, fa2, fa3 # CHECK: :[[@LINE]]:10: error: register must be a FPR
+flw ft15, 100(a0) # expected-error:5 {{register must be a FPR}}
+flw ft1, 100(a10) # expected-error:14 {{expected register}}
+fsgnjn.s fa100, fa2, fa3 # expected-error:10 {{register must be a FPR}}
# Integer registers where FP regs are expected
-fmv.x.w fs7, a2 # CHECK: :[[@LINE]]:9: error: register must be a GPR
+fmv.x.w fs7, a2 # expected-error:9 {{register must be a GPR}}
# FP registers where integer regs are expected
-fmv.w.x a8, ft2 # CHECK: :[[@LINE]]:9: error: register must be a FPR
+fmv.w.x a8, ft2 # expected-error:9 {{register must be a FPR}}
# Rounding mode when a register is expected
-fmadd.s f10, f11, f12, ree # CHECK: :[[@LINE]]:24: error: register must be a FPR
+fmadd.s f10, f11, f12, ree # expected-error:24 {{register must be a FPR}}
# Invalid rounding modes
-fmadd.s f10, f11, f12, f13, ree # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fmsub.s f14, f15, f16, f17, 0 # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fnmsub.s f18, f19, f20, f21, 0b111 # CHECK: :[[@LINE]]:30: error: operand must be a valid floating point rounding mode mnemonic
+fmadd.s f10, f11, f12, f13, ree # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fmsub.s f14, f15, f16, f17, 0 # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fnmsub.s f18, f19, f20, f21, 0b111 # expected-error:30 {{operand must be a valid floating point rounding mode mnemonic}}
# Using 'D' instructions for an 'F'-only target
-fadd.d ft0, ft1, ft2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+fadd.d ft0, ft1, ft2 # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
# Using RV64F instructions for RV32 is tested in rv64f-valid.s
diff --git a/llvm/test/MC/RISCV/rv32fc-invalid.s b/llvm/test/MC/RISCV/rv32fc-invalid.s
index 26db1faa61f1ab..8fecfdf124d9bf 100644
--- a/llvm/test/MC/RISCV/rv32fc-invalid.s
+++ b/llvm/test/MC/RISCV/rv32fc-invalid.s
@@ -1,12 +1,12 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+c,+f < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+c,+f < %s
## FPRC
-c.flw ft3, 8(a5) # CHECK: :[[@LINE]]:8: error: register must be a FPR
+c.flw ft3, 8(a5) # expected-error:8 {{register must be a FPR}}
## uimm8_lsb00_optional
-c.flwsp fs1, 256(sp) # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 4 bytes in the range [0, 252]
-c.fswsp fs2, -4(sp) # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 4 bytes in the range [0, 252]
+c.flwsp fs1, 256(sp) # expected-error:15 {{immediate must be a multiple of 4 bytes in the range [0, 252]}}
+c.fswsp fs2, -4(sp) # expected-error:15 {{immediate must be a multiple of 4 bytes in the range [0, 252]}}
## uimm7_lsb00
-c.flw fs0, -4(sp) # CHECK: :[[@LINE]]:13: error: immediate must be a multiple of 4 bytes in the range [0, 124]
-c.fsw fs1, 128(sp) # CHECK: :[[@LINE]]:13: error: immediate must be a multiple of 4 bytes in the range [0, 124]
+c.flw fs0, -4(sp) # expected-error:13 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
+c.fsw fs1, 128(sp) # expected-error:13 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
diff --git a/llvm/test/MC/RISCV/rv32i-aliases-invalid.s b/llvm/test/MC/RISCV/rv32i-aliases-invalid.s
index 7a442fe235f4c7..cdee37ff218bd3 100644
--- a/llvm/test/MC/RISCV/rv32i-aliases-invalid.s
+++ b/llvm/test/MC/RISCV/rv32i-aliases-invalid.s
@@ -1,176 +1,176 @@
# UNSUPPORTED: target={{.*-windows.*}}
-# RUN: not llvm-mc -triple=riscv32 -M no-aliases < %s -o /dev/null 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple=riscv32 < %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv32 -M no-aliases -o /dev/null < %s
+# RUN: llvm-mc --verify -triple=riscv32 -o /dev/null < %s
# TODO ld
# TODO sd
li x0, 4294967296
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-# CHECK: :[[@LINE-3]]:8: note: immediate must be an integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+# expected-note at -3:8 {{immediate must be an integer in the range [-2147483648, 4294967295]}}
li x0, -2147483649
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-# CHECK: :[[@LINE-3]]:8: note: immediate must be an integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+# expected-note at -3:8 {{immediate must be an integer in the range [-2147483648, 4294967295]}}
li t4, foo
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-# CHECK: :[[@LINE-3]]:8: note: immediate must be an integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+# expected-note at -3:8 {{immediate must be an integer in the range [-2147483648, 4294967295]}}
la x0, 4294967296
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x0, -2147483649
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la a1, foo+foo
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %pcrel_hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %pcrel_lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %pcrel_hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %pcrel_lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
la x1, %lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x0, 4294967296
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x0, -2147483649
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla a1, foo+foo
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %pcrel_hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %pcrel_lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %pcrel_hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %pcrel_lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
lla x1, %lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a bare symbol name or an immediate integer in the range [-2147483648, 4294967295]}}
-lla a2, foo at plt # CHECK: :[[@LINE]]:12: error: unexpected token
+lla a2, foo at plt # expected-error:12 {{unexpected token}}
-negw x1, x2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-sext.w x3, x4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+negw x1, x2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+sext.w x3, x4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
zext.w x3, x4
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zba' (Address Generation Instructions), RV64I Base Instruction Set
-# CHECK: :[[@LINE-3]]:1: note: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:1 {{instruction requires the following: 'Zba' (Address Generation Instructions), RV64I Base Instruction Set}}
+# expected-note at -3:1 {{instruction requires the following: RV64I Base Instruction Set}}
sll x2, x3, 32
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 31]}}
srl x2, x3, 32
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 31]}}
sra x2, x3, 32
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 31]}}
sll x2, x3, -1
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 31]}}
srl x2, x3, -2
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 31]}}
sra x2, x3, -3
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 31]}}
-addi x1, . # CHECK: :[[@LINE]]:10: error: register must be a GPR
+addi x1, . # expected-error:10 {{register must be a GPR}}
foo:
.space 4
diff --git a/llvm/test/MC/RISCV/rv32m-invalid.s b/llvm/test/MC/RISCV/rv32m-invalid.s
index cfa41b6511298f..fbbe5e1c072321 100644
--- a/llvm/test/MC/RISCV/rv32m-invalid.s
+++ b/llvm/test/MC/RISCV/rv32m-invalid.s
@@ -1,9 +1,9 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+m < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+m < %s
# RV64M instructions can't be used for RV32
-mulw ra, sp, gp # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-divw tp, t0, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-divuw t2, s0, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-remw a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-remuw a3, a4, a5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+mulw ra, sp, gp # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+divw tp, t0, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+divuw t2, s0, s2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+remw a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+remuw a3, a4, a5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32p-invalid.s b/llvm/test/MC/RISCV/rv32p-invalid.s
index a1095a66e4870d..958e9a22fbb896 100644
--- a/llvm/test/MC/RISCV/rv32p-invalid.s
+++ b/llvm/test/MC/RISCV/rv32p-invalid.s
@@ -1,120 +1,119 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+experimental-p %s 2>&1 \
-# RUN: | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+experimental-p %s
# Imm overflow
-pli.h a0, 0x400 # CHECK: :[[@LINE]]:11: error: immediate must be an integer in the range [-512, 511]
-plui.h a1, 0x400 # CHECK: :[[@LINE]]:12: error: immediate must be an integer in the range [-512, 1023]
-pli.b a0, 0x200 # CHECK: :[[@LINE]]:11: error: immediate must be an integer in the range [-128, 255]
-
-pslli.b a6, a7, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 7]
-pslli.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 15]
-pslli.w ra, sp, 12 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-psslai.h t0, t1, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 15]
-psslai.w t0, t1, 27 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-sslai a4, a5, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-
-psll.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-padd.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pssha.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-psshar.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-sha a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-shar a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-psrli.b a6, a7, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 7]
-psrli.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 15]
-psrli.w ra, sp, 31 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-pusati.h ra, sp, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 15]
-pusati.w ra, sp, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-usati ra, sp, 100 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-
-psrai.b a6, a7, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 7]
-psrai.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 15]
-psrai.w ra, sp, 10 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-psrari.h ra, sp, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 15]
-psrari.w ra, sp, 15 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-srari ra, sp, 100 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-
-psati.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [1, 16]
-psati.w ra, sp, 24 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-sati ra, sp, 100 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [1, 32]
-psati.dh a0, a2, 0 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [1, 16]
-psati.dh a0, a2, 17 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [1, 16]
-psati.dw a0, a2, 0 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [1, 32]
-psati.dw a0, a2, 33 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [1, 32]
-
-psrl.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-predsum.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-predsumu.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-psra.ws a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-padd.w t3, s0, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-psadd.w t3, t1, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-paadd.w t5, t1, a4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-psaddu.w s0, s2, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-paaddu.w s0, t1, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-psub.w t3, a0, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pssub.w t3, a4, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pasub.w t3, a2, a4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pssubu.w a0, a4, t3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pasubu.w a0, t3, a4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-pmul.w.h01 s2, t5, t3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mul.w01 t5, a4, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmacc.w.h01 t1, t1, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-macc.w01 s2, a0, t3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmulu.w.h01 t1, a4, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mulu.w01 t5, t1, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmaccu.w.h01 t5, t5, a4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-maccu.w01 a0, a0, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-psh1add.w s2, t5, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pssh1sadd.w a4, t3, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-unzip8p a4, t3, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-unzip16p t5, a4, t3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-unzip8hp s0, a0, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-unzip16hp a0, a0, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-zip8p t5, t3, t3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-zip16p a0, t5, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-zip8hp t5, a0, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-zip16hp t1, t5, a4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-pmul.w.h00 s2, t1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mul.w00 a4, a0, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmacc.w.h00 s2, t5, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-macc.w00 t1, a0, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmul.w.h11 s0, a4, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mul.w11 a0, t3, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmacc.w.h11 a4, a4, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-macc.w11 t3, s2, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmulu.w.h00 a2, t3, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mulu.w00 a0, t5, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmaccu.w.h00 t3, t3, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-maccu.w00 s2, t1, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmulu.w.h11 s0, t5, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mulu.w11 s0, t1, a4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmaccu.w.h11 a0, s0, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-maccu.w11 s2, t3, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmulsu.w.h00 t5, t5, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mulsu.w00 t1, s0, a4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmulsu.w.h11 t1, t3, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-mulsu.w11 a2, s2, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmaccsu.w.h00 a4, a0, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-maccsu.w00 a4, s2, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-pmaccsu.w.h11 a0, a2, t3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-maccsu.w11 t5, a4, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-ppaire.w t5, s0, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-ppaireo.w t5, s0, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-ppairoe.w t5, t1, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-ppairo.w t3, a0, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set
-
-pli.dh a1, 1 # CHECK: :[[@LINE]]:8: error: register must be even
-pli.db s1, 1 # CHECK: :[[@LINE]]:8: error: register must be even
-plui.dh t2, 1 # CHECK: :[[@LINE]]:9: error: register must be even
-
-pli.dh a0, 0x400 # CHECK: :[[@LINE]]:12: error: immediate must be an integer in the range [-512, 511]
-pli.db a0, 0x200 # CHECK: :[[@LINE]]:12: error: immediate must be an integer in the range [-128, 255]
-plui.dh a0, 0x400 # CHECK: :[[@LINE]]:13: error: immediate must be an integer in the range [-512, 1023]
+pli.h a0, 0x400 # expected-error:11 {{immediate must be an integer in the range [-512, 511]}}
+plui.h a1, 0x400 # expected-error:12 {{immediate must be an integer in the range [-512, 1023]}}
+pli.b a0, 0x200 # expected-error:11 {{immediate must be an integer in the range [-128, 255]}}
+
+pslli.b a6, a7, 100 # expected-error:17 {{immediate must be an integer in the range [0, 7]}}
+pslli.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 15]}}
+pslli.w ra, sp, 12 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+psslai.h t0, t1, 100 # expected-error:18 {{immediate must be an integer in the range [0, 15]}}
+psslai.w t0, t1, 27 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+sslai a4, a5, -1 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+
+psll.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+padd.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pssha.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+psshar.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+sha a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+shar a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+psrli.b a6, a7, 100 # expected-error:17 {{immediate must be an integer in the range [0, 7]}}
+psrli.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 15]}}
+psrli.w ra, sp, 31 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+pusati.h ra, sp, 100 # expected-error:18 {{immediate must be an integer in the range [0, 15]}}
+pusati.w ra, sp, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+usati ra, sp, 100 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+
+psrai.b a6, a7, 100 # expected-error:17 {{immediate must be an integer in the range [0, 7]}}
+psrai.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 15]}}
+psrai.w ra, sp, 10 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+psrari.h ra, sp, 100 # expected-error:18 {{immediate must be an integer in the range [0, 15]}}
+psrari.w ra, sp, 15 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+srari ra, sp, 100 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+
+psati.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [1, 16]}}
+psati.w ra, sp, 24 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+sati ra, sp, 100 # expected-error:14 {{immediate must be an integer in the range [1, 32]}}
+psati.dh a0, a2, 0 # expected-error:18 {{immediate must be an integer in the range [1, 16]}}
+psati.dh a0, a2, 17 # expected-error:18 {{immediate must be an integer in the range [1, 16]}}
+psati.dw a0, a2, 0 # expected-error:18 {{immediate must be an integer in the range [1, 32]}}
+psati.dw a0, a2, 33 # expected-error:18 {{immediate must be an integer in the range [1, 32]}}
+
+psrl.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+predsum.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+predsumu.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+psra.ws a0, a1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+padd.w t3, s0, a0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+psadd.w t3, t1, s2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+paadd.w t5, t1, a4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+psaddu.w s0, s2, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+paaddu.w s0, t1, s0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+psub.w t3, a0, s0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pssub.w t3, a4, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pasub.w t3, a2, a4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pssubu.w a0, a4, t3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pasubu.w a0, t3, a4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+pmul.w.h01 s2, t5, t3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mul.w01 t5, a4, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmacc.w.h01 t1, t1, a0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+macc.w01 s2, a0, t3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmulu.w.h01 t1, a4, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mulu.w01 t5, t1, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmaccu.w.h01 t5, t5, a4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+maccu.w01 a0, a0, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+psh1add.w s2, t5, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pssh1sadd.w a4, t3, s0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+unzip8p a4, t3, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+unzip16p t5, a4, t3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+unzip8hp s0, a0, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+unzip16hp a0, a0, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+zip8p t5, t3, t3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+zip16p a0, t5, a0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+zip8hp t5, a0, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+zip16hp t1, t5, a4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+pmul.w.h00 s2, t1, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mul.w00 a4, a0, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmacc.w.h00 s2, t5, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+macc.w00 t1, a0, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmul.w.h11 s0, a4, s0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mul.w11 a0, t3, a0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmacc.w.h11 a4, a4, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+macc.w11 t3, s2, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmulu.w.h00 a2, t3, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mulu.w00 a0, t5, s2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmaccu.w.h00 t3, t3, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+maccu.w00 s2, t1, s2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmulu.w.h11 s0, t5, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mulu.w11 s0, t1, a4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmaccu.w.h11 a0, s0, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+maccu.w11 s2, t3, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmulsu.w.h00 t5, t5, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mulsu.w00 t1, s0, a4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmulsu.w.h11 t1, t3, s2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+mulsu.w11 a2, s2, a2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmaccsu.w.h00 a4, a0, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+maccsu.w00 a4, s2, s0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+pmaccsu.w.h11 a0, a2, t3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+maccsu.w11 t5, a4, s2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+ppaire.w t5, s0, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+ppaireo.w t5, s0, t5 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+ppairoe.w t5, t1, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+ppairo.w t3, a0, s2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+
+pli.dh a1, 1 # expected-error:8 {{register must be even}}
+pli.db s1, 1 # expected-error:8 {{register must be even}}
+plui.dh t2, 1 # expected-error:9 {{register must be even}}
+
+pli.dh a0, 0x400 # expected-error:12 {{immediate must be an integer in the range [-512, 511]}}
+pli.db a0, 0x200 # expected-error:12 {{immediate must be an integer in the range [-128, 255]}}
+plui.dh a0, 0x400 # expected-error:13 {{immediate must be an integer in the range [-512, 1023]}}
diff --git a/llvm/test/MC/RISCV/rv32q-invalid.s b/llvm/test/MC/RISCV/rv32q-invalid.s
index ea17a270da47e0..374d73eae5bd0d 100644
--- a/llvm/test/MC/RISCV/rv32q-invalid.s
+++ b/llvm/test/MC/RISCV/rv32q-invalid.s
@@ -1,23 +1,23 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+q < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+q < %s
# Out of range immediates
## simm12
-flq ft1, -2049(a0) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-fsq ft2, 2048(a1) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+flq ft1, -2049(a0) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+fsq ft2, 2048(a1) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Memory operand not formatted correctly
-flq ft1, a0, -200 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-fsq ft2, a1, 100 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-flq ft1, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
-fsq ft2, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
+flq ft1, a0, -200 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+fsq ft2, a1, 100 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+flq ft1, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
+fsq ft2, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
# Invalid register names
-flq ft15, 100(a0) # CHECK: :[[@LINE]]:5: error: register must be a FPR
-flq ft1, 100(a10) # CHECK: :[[@LINE]]:14: error: expected register
-fsgnjn.q fa100, fa2, fa3 # CHECK: :[[@LINE]]:10: error: register must be a FPR
+flq ft15, 100(a0) # expected-error:5 {{register must be a FPR}}
+flq ft1, 100(a10) # expected-error:14 {{expected register}}
+fsgnjn.q fa100, fa2, fa3 # expected-error:10 {{register must be a FPR}}
# Integer registers where FP regs are expected
-fadd.q a2, a1, a0 # CHECK: :[[@LINE]]:8: error: register must be a FPR
+fadd.q a2, a1, a0 # expected-error:8 {{register must be a FPR}}
# FP registers where integer regs are expected
-fcvt.wu.q ft2, a1 # CHECK: :[[@LINE]]:11: error: register must be a GPR
+fcvt.wu.q ft2, a1 # expected-error:11 {{register must be a GPR}}
diff --git a/llvm/test/MC/RISCV/rv32xqccmp-invalid.s b/llvm/test/MC/RISCV/rv32xqccmp-invalid.s
index 3105461ed53d48..4bec2752202c63 100644
--- a/llvm/test/MC/RISCV/rv32xqccmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv32xqccmp-invalid.s
@@ -1,44 +1,43 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+xqccmp -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+xqccmp -M no-aliases -show-encoding < %s
-# CHECK-ERROR: :[[@LINE+1]]:14: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:14 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
qc.cm.mvsa01 a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:14: error: rs1 and rs2 must be different
+# expected-error at +1:14 {{rs1 and rs2 must be different}}
qc.cm.mvsa01 s0, s0
-# CHECK-ERROR: :[[@LINE+1]]:14: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:14 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
qc.cm.mva01s a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:15: error: invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported
+# expected-error at +1:15 {{invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported}}
qc.cm.popretz {ra, s0-s10}, 112
-# CHECK-ERROR: :[[@LINE+1]]:28: error: stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]
+# expected-error at +1:28 {{stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]}}
qc.cm.popretz {ra, s0-s1}, 112
-# CHECK-ERROR: :[[@LINE+1]]:18: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:18 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.push {ra}, 16
-# CHECK-ERROR: :[[@LINE+1]]:24: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:24 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.pushfp {ra, s0}, 16
-# CHECK-ERROR: :[[@LINE+1]]:24: error: stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]
+# expected-error at +1:24 {{stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]}}
qc.cm.pop {ra, s0-s1}, -32
-# CHECK-ERROR: :[[@LINE+1]]:18: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:18 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.push {ra}, -8
-# CHECK-ERROR: :[[@LINE+1]]:24: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:24 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.pushfp {ra, s0}, -12
-# CHECK-ERROR: :[[@LINE+1]]:24: error: stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]
+# expected-error at +1:24 {{stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]}}
qc.cm.pop {ra, s0-s1}, -40
-# CHECK-ERROR: :[[@LINE+1]]:14: error: register list must include 's0' or 'x8'
+# expected-error at +1:14 {{register list must include 's0' or 'x8'}}
qc.cm.pushfp {ra}, -16
-# CHECK-ERROR: :[[@LINE+1]]:12: error: operand must be {ra [, s0[-sN]]} or {x1 [, x8[-x9][, x18[-xN]]]}
+# expected-error at +1:12 {{operand must be {ra [, s0[-sN]]} or {x1 [, x8[-x9][, x18[-xN]]]}}}
qc.cm.push x1, -16
-# CHECK-ERROR: :[[@LINE+1]]:14: error: operand must be {ra, s0[-sN]} or {x1, x8[-x9][, x18[-xN]]}
+# expected-error at +1:14 {{operand must be {ra, s0[-sN]} or {x1, x8[-x9][, x18[-xN]]}}}
qc.cm.pushfp x1, -16
diff --git a/llvm/test/MC/RISCV/rv32xtheadbs-invalid.s b/llvm/test/MC/RISCV/rv32xtheadbs-invalid.s
index b1f467f1902df4..1bbf8caf8d86a3 100644
--- a/llvm/test/MC/RISCV/rv32xtheadbs-invalid.s
+++ b/llvm/test/MC/RISCV/rv32xtheadbs-invalid.s
@@ -1,7 +1,7 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadbs < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadbs < %s
# Too few operands
-th.tst t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+th.tst t0, t1 # expected-error:14 {{too few operands for instruction}}
# Immediate operand out of range
-th.tst t0, t1, 32 # CHECK: :[[@LINE]]:16: error: immediate must be an integer in the range [0, 31]
-th.tst t0, t1, -1 # CHECK: :[[@LINE]]:16: error: immediate must be an integer in the range [0, 31]
+th.tst t0, t1, 32 # expected-error:16 {{immediate must be an integer in the range [0, 31]}}
+th.tst t0, t1, -1 # expected-error:16 {{immediate must be an integer in the range [0, 31]}}
diff --git a/llvm/test/MC/RISCV/rv32xtheadfmemidx-d-invalid.s b/llvm/test/MC/RISCV/rv32xtheadfmemidx-d-invalid.s
index 6b82f236968ab8..d129b5063890b2 100644
--- a/llvm/test/MC/RISCV/rv32xtheadfmemidx-d-invalid.s
+++ b/llvm/test/MC/RISCV/rv32xtheadfmemidx-d-invalid.s
@@ -1,6 +1,6 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+d -mattr=+xtheadfmemidx < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+d -mattr=+xtheadfmemidx < %s
-th.flurd fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.flurw fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.fsurd fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.fsurw fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+th.flurd fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.flurw fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.fsurd fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.fsurw fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32xtheadfmemidx-f-invalid.s b/llvm/test/MC/RISCV/rv32xtheadfmemidx-f-invalid.s
index bf777fa4d44577..fab9641cb9cf0a 100644
--- a/llvm/test/MC/RISCV/rv32xtheadfmemidx-f-invalid.s
+++ b/llvm/test/MC/RISCV/rv32xtheadfmemidx-f-invalid.s
@@ -1,8 +1,8 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+f -mattr=+xtheadfmemidx < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+f -mattr=+xtheadfmemidx < %s
-th.flrd fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
-th.fsrd fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
-th.flurd fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point), RV64I Base Instruction Set{{$}}
-th.flurw fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.fsurd fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point), RV64I Base Instruction Set{{$}}
-th.fsurw fa0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+th.flrd fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
+th.fsrd fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
+th.flurd fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point), RV64I Base Instruction Set}}
+th.flurw fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.fsurd fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point), RV64I Base Instruction Set}}
+th.fsurw fa0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32xtheadmac-invalid.s b/llvm/test/MC/RISCV/rv32xtheadmac-invalid.s
index 1a811333576866..9e8e21bacddf86 100644
--- a/llvm/test/MC/RISCV/rv32xtheadmac-invalid.s
+++ b/llvm/test/MC/RISCV/rv32xtheadmac-invalid.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadmac < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadmac < %s
-th.mulaw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.mulsw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+th.mulaw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.mulsw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32xtheadmemidx-invalid.s b/llvm/test/MC/RISCV/rv32xtheadmemidx-invalid.s
index e2c76196c5d345..7b80d55f7b5711 100644
--- a/llvm/test/MC/RISCV/rv32xtheadmemidx-invalid.s
+++ b/llvm/test/MC/RISCV/rv32xtheadmemidx-invalid.s
@@ -1,14 +1,14 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadmemidx < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadmemidx < %s
-th.lwuia a0, (a1), 0, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.lwuib a0, (a1), 15, 1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.ldia a0, (a1), 0, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.ldib a0, (a1), 0, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.sdia a0, (a1), -16, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.sdib a0, (a1), -1, 1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.lrwu a0, a1, a2, 2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.lrd a0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.srd a0, a1, a2, 3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.lurwu a0, a1, a2, 2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.lurd a0, a1, a2, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.surd a0, a1, a2, 3 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
\ No newline at end of file
+th.lwuia a0, (a1), 0, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.lwuib a0, (a1), 15, 1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.ldia a0, (a1), 0, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.ldib a0, (a1), 0, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.sdia a0, (a1), -16, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.sdib a0, (a1), -1, 1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.lrwu a0, a1, a2, 2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.lrd a0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.srd a0, a1, a2, 3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.lurwu a0, a1, a2, 2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.lurd a0, a1, a2, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.surd a0, a1, a2, 3 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
\ No newline at end of file
diff --git a/llvm/test/MC/RISCV/rv32xtheadmempair-invalid.s b/llvm/test/MC/RISCV/rv32xtheadmempair-invalid.s
index 918c130c6081ea..f76b89860b4048 100644
--- a/llvm/test/MC/RISCV/rv32xtheadmempair-invalid.s
+++ b/llvm/test/MC/RISCV/rv32xtheadmempair-invalid.s
@@ -1,21 +1,21 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadmempair < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadmempair < %s
-th.ldd t0, t1, (t2), 5, 4 # CHECK: [[@LINE]]:1: error: invalid instruction
-th.ldd t0, t1, (t2) # CHECK: [[@LINE]]:1: error: invalid instruction
-th.ldd t0, t1, (t2), 3, 5 # CHECK: [[@LINE]]:1: error: invalid instruction
-th.sdd a0, a1, (a2), 5, 4 # CHECK: [[@LINE]]:1: error: invalid instruction
-th.sdd a0, a1, (a2) # CHECK: [[@LINE]]:1: error: invalid instruction
-th.sdd a0, a1, (a2), 3, 5 # CHECK: [[@LINE]]:1: error: invalid instruction
-th.lwud t0, t1, (t2), 5, 4 # CHECK: [[@LINE]]:23: error: immediate must be an integer in the range [0, 3]
-th.lwud t0, t1, (t2) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.lwud t0, t1, (t2), 3, 5 # CHECK: [[@LINE]]:26: error: operand must be constant 3
-th.lwd a3, a4, (a5), 5, 4 # CHECK: [[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
-th.lwd a3, a4, (a5) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.lwd a3, a4, (a5), 3, 5 # CHECK: [[@LINE]]:25: error: operand must be constant 3
-th.swd t3, t4, (t5), 5, 4 # CHECK: [[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
-th.swd t3, t4, (t5) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.swd t3, t4, (t5), 3, 5 # CHECK: [[@LINE]]:25: error: operand must be constant 3
-th.lwd x6, x7, (x7), 2, 3 # CHECK: [[@LINE]]:8: error: rs1, rd1, and rd2 cannot overlap
-th.lwud x6, x6, (x6), 2, 3 # CHECK: [[@LINE]]:9: error: rs1, rd1, and rd2 cannot overlap
-th.ldd t0, t1, (t2), 2, 4 # CHECK: [[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-th.sdd t0, t1, (t2), 2, 4 # CHECK: [[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+th.ldd t0, t1, (t2), 5, 4 # expected-error:1 {{invalid instruction}}
+th.ldd t0, t1, (t2) # expected-error:1 {{invalid instruction}}
+th.ldd t0, t1, (t2), 3, 5 # expected-error:1 {{invalid instruction}}
+th.sdd a0, a1, (a2), 5, 4 # expected-error:1 {{invalid instruction}}
+th.sdd a0, a1, (a2) # expected-error:1 {{invalid instruction}}
+th.sdd a0, a1, (a2), 3, 5 # expected-error:1 {{invalid instruction}}
+th.lwud t0, t1, (t2), 5, 4 # expected-error:23 {{immediate must be an integer in the range [0, 3]}}
+th.lwud t0, t1, (t2) # expected-error:29 {{too few operands for instruction}}
+th.lwud t0, t1, (t2), 3, 5 # expected-error:26 {{operand must be constant 3}}
+th.lwd a3, a4, (a5), 5, 4 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
+th.lwd a3, a4, (a5) # expected-error:29 {{too few operands for instruction}}
+th.lwd a3, a4, (a5), 3, 5 # expected-error:25 {{operand must be constant 3}}
+th.swd t3, t4, (t5), 5, 4 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
+th.swd t3, t4, (t5) # expected-error:29 {{too few operands for instruction}}
+th.swd t3, t4, (t5), 3, 5 # expected-error:25 {{operand must be constant 3}}
+th.lwd x6, x7, (x7), 2, 3 # expected-error:8 {{rs1, rd1, and rd2 cannot overlap}}
+th.lwud x6, x6, (x6), 2, 3 # expected-error:9 {{rs1, rd1, and rd2 cannot overlap}}
+th.ldd t0, t1, (t2), 2, 4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+th.sdd t0, t1, (t2), 2, 4 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32zaamo-invalid.s b/llvm/test/MC/RISCV/rv32zaamo-invalid.s
index 984a0d61e2d09e..40292096cac018 100644
--- a/llvm/test/MC/RISCV/rv32zaamo-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zaamo-invalid.s
@@ -1,12 +1,12 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+a < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv32 -mattr=+zaamo < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+a < %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zaamo < %s
# Final operand must have parentheses
-amoswap.w a1, a2, a3 # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amomin.w a1, a2, 1 # CHECK: :[[@LINE]]:20: error: expected '(' after optional integer offset
-amomin.w a1, a2, 1(a3) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
+amoswap.w a1, a2, a3 # expected-error:19 {{expected '(' or optional integer offset}}
+amomin.w a1, a2, 1 # expected-error:20 {{expected '(' after optional integer offset}}
+amomin.w a1, a2, 1(a3) # expected-error:18 {{optional integer offset must be 0}}
# Only .aq, .rl, and .aqrl suffixes are valid
-amoxor.w.rlqa a2, a3, (a4) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
-amoor.w.aq.rl a4, a5, (a6) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
-amoor.w. a4, a5, (a6) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
+amoxor.w.rlqa a2, a3, (a4) # expected-error:1 {{unrecognized instruction mnemonic}}
+amoor.w.aq.rl a4, a5, (a6) # expected-error:1 {{unrecognized instruction mnemonic}}
+amoor.w. a4, a5, (a6) # expected-error:1 {{unrecognized instruction mnemonic}}
diff --git a/llvm/test/MC/RISCV/rv32zacas-invalid.s b/llvm/test/MC/RISCV/rv32zacas-invalid.s
index 6927a2733b8e64..f0068eb15d136c 100644
--- a/llvm/test/MC/RISCV/rv32zacas-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zacas-invalid.s
@@ -1,18 +1,18 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+a,+zacas < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+a,+zacas < %s
# Non-zero offsets not supported for the third operand (rs1).
-amocas.w a1, a3, 1(a5) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amocas.d a0, a2, 2(a5) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
+amocas.w a1, a3, 1(a5) # expected-error:18 {{optional integer offset must be 0}}
+amocas.d a0, a2, 2(a5) # expected-error:18 {{optional integer offset must be 0}}
# First and second operands (rd and rs2) of amocas.d must be even for RV32.
-amocas.d a1, a2, (a1) # CHECK: :[[@LINE]]:10: error: register must be even
-amocas.d a0, a1, (a1) # CHECK: :[[@LINE]]:14: error: register must be even
-amocas.d.aq a1, a2, (a1) # CHECK: :[[@LINE]]:13: error: register must be even
-amocas.d.aq a0, a1, (a1) # CHECK: :[[@LINE]]:17: error: register must be even
-amocas.d.rl a1, a2, (a1) # CHECK: :[[@LINE]]:13: error: register must be even
-amocas.d.rl a0, a1, (a1) # CHECK: :[[@LINE]]:17: error: register must be even
-amocas.d.aqrl a1, a2, (a1) # CHECK: :[[@LINE]]:15: error: register must be even
-amocas.d.aqrl a0, a1, (a1) # CHECK: :[[@LINE]]:19: error: register must be even
+amocas.d a1, a2, (a1) # expected-error:10 {{register must be even}}
+amocas.d a0, a1, (a1) # expected-error:14 {{register must be even}}
+amocas.d.aq a1, a2, (a1) # expected-error:13 {{register must be even}}
+amocas.d.aq a0, a1, (a1) # expected-error:17 {{register must be even}}
+amocas.d.rl a1, a2, (a1) # expected-error:13 {{register must be even}}
+amocas.d.rl a0, a1, (a1) # expected-error:17 {{register must be even}}
+amocas.d.aqrl a1, a2, (a1) # expected-error:15 {{register must be even}}
+amocas.d.aqrl a0, a1, (a1) # expected-error:19 {{register must be even}}
# amocas.q is not supported for RV32.
-amocas.q a0, a0, (a1) # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+amocas.q a0, a0, (a1) # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32zalasr-invalid.s b/llvm/test/MC/RISCV/rv32zalasr-invalid.s
index 86cce989985144..047589d14d479a 100644
--- a/llvm/test/MC/RISCV/rv32zalasr-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zalasr-invalid.s
@@ -1,40 +1,40 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zalasr < %s 2>&1 | FileCheck -check-prefixes=CHECK %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zalasr < %s
-# CHECK: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1 {{instruction requires the following: RV64I Base Instruction Set}}
ld.aq a1, (t0)
-# CHECK: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1 {{instruction requires the following: RV64I Base Instruction Set}}
ld.aqrl a1, (t0)
-# CHECK: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1 {{instruction requires the following: RV64I Base Instruction Set}}
sd.rl a1, (t0)
-# CHECK: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1 {{instruction requires the following: RV64I Base Instruction Set}}
sd.aqrl a1, (t0)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
lw. a1, (t0)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
lw.rl t3, 0(t5)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
lh.rlaq t4, (t6)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
sb. a1, (t0)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
sh.aq t3, 0(t5)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
sh.rlaq t4, (t6)
-# CHECK: error: optional integer offset must be 0
+# expected-error at +1 {{optional integer offset must be 0}}
lw.aq zero, 1(a0)
-# CHECK: error: optional integer offset must be 0
+# expected-error at +1 {{optional integer offset must be 0}}
sw.rl t1, 2(s0)
-# CHECK: error: optional integer offset must be 0
+# expected-error at +1 {{optional integer offset must be 0}}
sb.aqrl sp, 3(s2)
diff --git a/llvm/test/MC/RISCV/rv32zalrsc-invalid.s b/llvm/test/MC/RISCV/rv32zalrsc-invalid.s
index aa0dbc041d9ea4..2cf9a26b805e22 100644
--- a/llvm/test/MC/RISCV/rv32zalrsc-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zalrsc-invalid.s
@@ -1,8 +1,8 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+a < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv32 -mattr=+zalrsc < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+a < %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zalrsc < %s
# Final operand must have parentheses
-lr.w a4, a5 # CHECK: :[[@LINE]]:10: error: expected '(' or optional integer offset
+lr.w a4, a5 # expected-error:10 {{expected '(' or optional integer offset}}
# lr only takes two operands
-lr.w s0, (s1), s2 # CHECK: :[[@LINE]]:16: error: unexpected extra operand for instruction
+lr.w s0, (s1), s2 # expected-error:16 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/rv32zba-invalid.s b/llvm/test/MC/RISCV/rv32zba-invalid.s
index 41e8076f49572a..b03af4dad35354 100644
--- a/llvm/test/MC/RISCV/rv32zba-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zba-invalid.s
@@ -1,13 +1,13 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zba < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zba < %s
# Too few operands
-sh1add t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+sh1add t0, t1 # expected-error:14 {{too few operands for instruction}}
# Too few operands
-sh2add t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+sh2add t0, t1 # expected-error:14 {{too few operands for instruction}}
# Too few operands
-sh3add t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
-slli.uw t0, t1, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-add.uw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-sh1add.uw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-sh2add.uw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-sh3add.uw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+sh3add t0, t1 # expected-error:14 {{too few operands for instruction}}
+slli.uw t0, t1, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+add.uw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+sh1add.uw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+sh2add.uw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+sh3add.uw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32zbb-invalid.s b/llvm/test/MC/RISCV/rv32zbb-invalid.s
index cd40991a6abc7e..c347f6e1cb874e 100644
--- a/llvm/test/MC/RISCV/rv32zbb-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zbb-invalid.s
@@ -1,42 +1,42 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zbb < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zbb < %s
# Too many operands
-clz t0, t1, t2 # CHECK: :[[@LINE]]:13: error: unexpected extra operand for instruction
+clz t0, t1, t2 # expected-error:13 {{unexpected extra operand for instruction}}
# Too many operands
-ctz t0, t1, t2 # CHECK: :[[@LINE]]:13: error: unexpected extra operand for instruction
+ctz t0, t1, t2 # expected-error:13 {{unexpected extra operand for instruction}}
# Too many operands
-cpop t0, t1, t2 # CHECK: :[[@LINE]]:14: error: unexpected extra operand for instruction
+cpop t0, t1, t2 # expected-error:14 {{unexpected extra operand for instruction}}
# Too many operands
-sext.b t0, t1, t2 # CHECK: :[[@LINE]]:16: error: unexpected extra operand for instruction
+sext.b t0, t1, t2 # expected-error:16 {{unexpected extra operand for instruction}}
# Too many operands
-sext.h t0, t1, t2 # CHECK: :[[@LINE]]:16: error: unexpected extra operand for instruction
+sext.h t0, t1, t2 # expected-error:16 {{unexpected extra operand for instruction}}
# Too few operands
-min t0, t1 # CHECK: :[[@LINE]]:11: error: too few operands for instruction
+min t0, t1 # expected-error:11 {{too few operands for instruction}}
# Too few operands
-max t0, t1 # CHECK: :[[@LINE]]:11: error: too few operands for instruction
+max t0, t1 # expected-error:11 {{too few operands for instruction}}
# Too few operands
-minu t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+minu t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-maxu t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
-clzw t0, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-ctzw t0, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-cpopw t0, t1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+maxu t0, t1 # expected-error:12 {{too few operands for instruction}}
+clzw t0, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+ctzw t0, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+cpopw t0, t1 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
# Too few operands
-andn t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+andn t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-orn t0, t1 # CHECK: :[[@LINE]]:11: error: too few operands for instruction
+orn t0, t1 # expected-error:11 {{too few operands for instruction}}
# Too few operands
-xnor t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+xnor t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-rol t0, t1 # CHECK: :[[@LINE]]:11: error: too few operands for instruction
+rol t0, t1 # expected-error:11 {{too few operands for instruction}}
# Too few operands
-ror t0, t1 # CHECK: :[[@LINE]]:11: error: too few operands for instruction
+ror t0, t1 # expected-error:11 {{too few operands for instruction}}
# Too few operands
-rori t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+rori t0, t1 # expected-error:12 {{too few operands for instruction}}
# Immediate operand out of range
-rori t0, t1, 32 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 31]
-rori t0, t1, -1 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 31]
-rolw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-rorw t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-roriw t0, t1, 31 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
-roriw t0, t1, 0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+rori t0, t1, 32 # expected-error:14 {{immediate must be an integer in the range [0, 31]}}
+rori t0, t1, -1 # expected-error:14 {{immediate must be an integer in the range [0, 31]}}
+rolw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+rorw t0, t1, t2 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+roriw t0, t1, 31 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
+roriw t0, t1, 0 # expected-error:1 {{instruction requires the following: RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rv32zbc-invalid.s b/llvm/test/MC/RISCV/rv32zbc-invalid.s
index bee93e98d62f52..38d8495761238d 100644
--- a/llvm/test/MC/RISCV/rv32zbc-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zbc-invalid.s
@@ -1,8 +1,8 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zbc < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zbc < %s
# Too few operands
-clmul t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+clmul t0, t1 # expected-error:13 {{too few operands for instruction}}
# Too few operands
-clmulr t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+clmulr t0, t1 # expected-error:14 {{too few operands for instruction}}
# Too few operands
-clmulh t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+clmulh t0, t1 # expected-error:14 {{too few operands for instruction}}
diff --git a/llvm/test/MC/RISCV/rv32zbkc-invalid.s b/llvm/test/MC/RISCV/rv32zbkc-invalid.s
index 99c512269d8f7b..c82f88f62ae1ef 100644
--- a/llvm/test/MC/RISCV/rv32zbkc-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zbkc-invalid.s
@@ -1,9 +1,9 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zbkc < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zbkc < %s
# Too few operands
-clmul t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+clmul t0, t1 # expected-error:13 {{too few operands for instruction}}
# Too few operands
-clmulh t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+clmulh t0, t1 # expected-error:14 {{too few operands for instruction}}
# Undefined zbc instruction in zbkc
-clmulr t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zbc' (Carry-Less Multiplication){{$}}
+clmulr t0, t1, t2 # expected-error:1 {{instruction requires the following: 'Zbc' (Carry-Less Multiplication)}}
diff --git a/llvm/test/MC/RISCV/rv32zbkx-invalid.s b/llvm/test/MC/RISCV/rv32zbkx-invalid.s
index 8dc246e5d47f46..2256fc109336f2 100644
--- a/llvm/test/MC/RISCV/rv32zbkx-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zbkx-invalid.s
@@ -1,6 +1,6 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zbkx < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zbkx < %s
# Too few operands
-xperm8 t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+xperm8 t0, t1 # expected-error:14 {{too few operands for instruction}}
# Too few operands
-xperm4 t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+xperm4 t0, t1 # expected-error:14 {{too few operands for instruction}}
diff --git a/llvm/test/MC/RISCV/rv32zbs-invalid.s b/llvm/test/MC/RISCV/rv32zbs-invalid.s
index 7e1f2557839d7e..90840b47431984 100644
--- a/llvm/test/MC/RISCV/rv32zbs-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zbs-invalid.s
@@ -1,30 +1,30 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zbs < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zbs < %s
# Too few operands
-bclr t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+bclr t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-bset t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+bset t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-binv t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+binv t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-bext t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+bext t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-bclri t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+bclri t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-bclri t0, t1, 32 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-bclri t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
+bclri t0, t1, 32 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+bclri t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
# Too few operands
-bseti t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+bseti t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-bseti t0, t1, 32 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-bseti t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
+bseti t0, t1, 32 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+bseti t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
# Too few operands
-binvi t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+binvi t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-binvi t0, t1, 32 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-binvi t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
+binvi t0, t1, 32 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+binvi t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
# Too few operands
-bexti t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+bexti t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-bexti t0, t1, 32 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-bexti t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
+bexti t0, t1, 32 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+bexti t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
diff --git a/llvm/test/MC/RISCV/rv32zclsd-invalid.s b/llvm/test/MC/RISCV/rv32zclsd-invalid.s
index 011a0d72c867a4..191f047002c891 100644
--- a/llvm/test/MC/RISCV/rv32zclsd-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zclsd-invalid.s
@@ -1,44 +1,44 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zclsd < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zclsd < %s
## GPRPairC
c.ld t1, 4(sp)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK: :[[@LINE-3]]:6: note: register pair must start with x8, x10, x12, or x14
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# expected-note at -3:6 {{register pair must start with x8, x10, x12, or x14}}
c.sd s2, 4(sp)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK: :[[@LINE-3]]:6: note: register pair must start with x8, x10, x12, or x14
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# expected-note at -3:6 {{register pair must start with x8, x10, x12, or x14}}
## GPRPairNoX0
c.ldsp x0, 4(sp)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK: :[[@LINE-3]]:9: note: register pair must start with an even GPR other than x0
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# expected-note at -3:9 {{register pair must start with an even GPR other than x0}}
c.ldsp zero, 4(sp)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK: :[[@LINE-3]]:9: note: register pair must start with an even GPR other than x0
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# expected-note at -3:9 {{register pair must start with an even GPR other than x0}}
## uimm9_lsb000
-c.ldsp t1, 512(sp) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 8 bytes in the range [0, 504]
-c.sdsp t1, -8(sp) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 8 bytes in the range [0, 504]
+c.ldsp t1, 512(sp) # expected-error:12 {{immediate must be a multiple of 8 bytes in the range [0, 504]}}
+c.sdsp t1, -8(sp) # expected-error:12 {{immediate must be a multiple of 8 bytes in the range [0, 504]}}
## uimm8_lsb000
c.ld s0, -8(sp)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK: :[[@LINE-3]]:11: note: immediate must be a multiple of 8 bytes in the range [0, 248]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# expected-note at -3:11 {{immediate must be a multiple of 8 bytes in the range [0, 248]}}
c.sd s0, 256(sp)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK: :[[@LINE-3]]:11: note: immediate must be a multiple of 8 bytes in the range [0, 248]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# expected-note at -3:11 {{immediate must be a multiple of 8 bytes in the range [0, 248]}}
# Invalid register names
-c.ld a1, 4(sp) # CHECK: :[[@LINE]]:6: error: register must be even
-c.sd a3, 4(sp) # CHECK: :[[@LINE]]:6: error: register must be even
-c.ldsp ra, 4(sp) # CHECK: :[[@LINE]]:8: error: register must be even
-c.ldsp t0, 4(sp) # CHECK: :[[@LINE]]:8: error: register must be even
+c.ld a1, 4(sp) # expected-error:6 {{register must be even}}
+c.sd a3, 4(sp) # expected-error:6 {{register must be even}}
+c.ldsp ra, 4(sp) # expected-error:8 {{register must be even}}
+c.ldsp t0, 4(sp) # expected-error:8 {{register must be even}}
diff --git a/llvm/test/MC/RISCV/rv32zcmop-invalid.s b/llvm/test/MC/RISCV/rv32zcmop-invalid.s
index 98d0660d13af09..6ddfbde133a015 100644
--- a/llvm/test/MC/RISCV/rv32zcmop-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zcmop-invalid.s
@@ -1,7 +1,7 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zcmop < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zcmop < %s
-c.mop.0 # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic, did you mean: c.mop.1, c.mop.3, c.mop.5, c.mop.7, c.mop.9?
+c.mop.0 # expected-error:1 {{unrecognized instruction mnemonic, did you mean: c.mop.1, c.mop.3, c.mop.5, c.mop.7, c.mop.9?}}
-c.mop.1 t0 # CHECK: :[[@LINE]]:9: error: unexpected extra operand for instruction
+c.mop.1 t0 # expected-error:9 {{unexpected extra operand for instruction}}
-c.mop.1 0x0 # CHECK: :[[@LINE]]:9: error: unexpected extra operand for instruction
+c.mop.1 0x0 # expected-error:9 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/rv32zcmp-invalid.s b/llvm/test/MC/RISCV/rv32zcmp-invalid.s
index cd684bc85761d1..e0d8c13cd4c2c8 100644
--- a/llvm/test/MC/RISCV/rv32zcmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zcmp-invalid.s
@@ -1,53 +1,52 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=zcmp -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=zcmp -M no-aliases -show-encoding < %s
-# CHECK-ERROR: :[[@LINE+1]]:11: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:11 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
cm.mvsa01 a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:11: error: rs1 and rs2 must be different
+# expected-error at +1:11 {{rs1 and rs2 must be different}}
cm.mvsa01 s0, s0
-# CHECK-ERROR: :[[@LINE+1]]:11: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:11 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
cm.mva01s a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:12: error: invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported
+# expected-error at +1:12 {{invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported}}
cm.popretz {ra, s0-s10}, 112
-# CHECK-ERROR: :[[@LINE+1]]:25: error: stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]
+# expected-error at +1:25 {{stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]}}
cm.popretz {ra, s0-s1}, 112
-# CHECK-ERROR: :[[@LINE+1]]:15: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:15 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
cm.push {ra}, 16
-# CHECK-ERROR: :[[@LINE+1]]:21: error: stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]
+# expected-error at +1:21 {{stack adjustment for register list must be a multiple of 16 bytes in the range [16, 64]}}
cm.pop {ra, s0-s1}, -32
-# CHECK-ERROR: :[[@LINE+1]]:15: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:15 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
cm.push {ra}, -8
-# CHECK-ERROR: :[[@LINE+1]]:9: error: register list must start from 'ra' or 'x1'
+# expected-error at +1:9 {{register list must start from 'ra' or 'x1'}}
cm.pop {s0}, -40
-# CHECK-ERROR: :[[@LINE+1]]:13: error: register must be 's0'
+# expected-error at +1:13 {{register must be 's0'}}
cm.pop {ra, t1}, -40
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be in the range 's1' to 's11'
+# expected-error at +1:16 {{register must be in the range 's1' to 's11'}}
cm.pop {ra, s0-t1}, -40
-# CHECK-ERROR: :[[@LINE+1]]:20: error: register must be 'x18'
+# expected-error at +1:20 {{register must be 'x18'}}
cm.pop {x1, x8-x9, x28}, -40
-# CHECK-ERROR: :[[@LINE+1]]:24: error: register must be in the range 'x19' to 'x27'
+# expected-error at +1:24 {{register must be in the range 'x19' to 'x27'}}
cm.pop {x1, x8-x9, x18-x28}, -40
-# CHECK-ERROR: :[[@LINE+1]]:24: error: register must be in the range 'x19' to 'x27'
+# expected-error at +1:24 {{register must be in the range 'x19' to 'x27'}}
cm.pop {x1, x8-x9, x18-x17}, -40
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be 'x9'
+# expected-error at +1:16 {{register must be 'x9'}}
cm.pop {x1, x8-f8, x18-x17}, -40
-# CHECK-ERROR: :[[@LINE+1]]:9: error: operand must be {ra [, s0[-sN]]} or {x1 [, x8[-x9][, x18[-xN]]]}
+# expected-error at +1:9 {{operand must be {ra [, s0[-sN]]} or {x1 [, x8[-x9][, x18[-xN]]]}}}
cm.push x1, -16
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be in the range 's1' to 's11'
+# expected-error at +1:16 {{register must be in the range 's1' to 's11'}}
cm.pop {ra, s0-f8}, -40
diff --git a/llvm/test/MC/RISCV/rv32zdinx-invalid.s b/llvm/test/MC/RISCV/rv32zdinx-invalid.s
index 7aa49c9bcee9b8..55c5db68206753 100644
--- a/llvm/test/MC/RISCV/rv32zdinx-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zdinx-invalid.s
@@ -1,27 +1,27 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zdinx %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zdinx %s
# Unsupport Odd Registers in RV32
-fadd.d a0, a1, a2 # CHECK: :[[@LINE]]:12: error: double precision floating point operands must use even numbered X register
+fadd.d a0, a1, a2 # expected-error:12 {{double precision floating point operands must use even numbered X register}}
# Not support float registers
-flw fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point){{$}}
-fadd.d fa0, fa1, fa2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+flw fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fadd.d fa0, fa1, fa2 # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
# Invalid instructions
-fsw a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point)
-fmv.x.w s0, s1 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fsw a5, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fmv.x.w s0, s1 # expected-error:1 {{invalid instruction}}
# Invalid register names
-fadd.d a100, a2, a4 # CHECK: :[[@LINE]]:8: error: register must be an even-numbered GPR when used as an FP operand
-fsgnjn.d a100, a2, a4 # CHECK: :[[@LINE]]:10: error: register must be an even-numbered GPR when used as an FP operand
+fadd.d a100, a2, a4 # expected-error:8 {{register must be an even-numbered GPR when used as an FP operand}}
+fsgnjn.d a100, a2, a4 # expected-error:10 {{register must be an even-numbered GPR when used as an FP operand}}
# Rounding mode when a register is expected
-fmadd.d x10, x12, x14, ree # CHECK: :[[@LINE]]:24: error: register must be an even-numbered GPR when used as an FP operand
+fmadd.d x10, x12, x14, ree # expected-error:24 {{register must be an even-numbered GPR when used as an FP operand}}
# Invalid rounding modes
-fmadd.d x10, x12, x14, x16, ree # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fmsub.d x10, x12, x14, x16, 0 # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fnmsub.d x10, x12, x14, x16, 0b111 # CHECK: :[[@LINE]]:30: error: operand must be a valid floating point rounding mode mnemonic
+fmadd.d x10, x12, x14, x16, ree # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fmsub.d x10, x12, x14, x16, 0 # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fnmsub.d x10, x12, x14, x16, 0b111 # expected-error:30 {{operand must be a valid floating point rounding mode mnemonic}}
# FP registers where integer regs are expected
-fcvt.wu.d ft2, a2 # CHECK: :[[@LINE]]:11: error: register must be a GPR
+fcvt.wu.d ft2, a2 # expected-error:11 {{register must be a GPR}}
diff --git a/llvm/test/MC/RISCV/rv32zfa-only-valid.s b/llvm/test/MC/RISCV/rv32zfa-only-valid.s
index a780a9f9ce9107..591a4ef1bd607f 100644
--- a/llvm/test/MC/RISCV/rv32zfa-only-valid.s
+++ b/llvm/test/MC/RISCV/rv32zfa-only-valid.s
@@ -4,16 +4,14 @@
# RUN: | llvm-objdump --mattr=+zfa,+d,+zfh -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+d,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+d,+zfh -M no-aliases -show-encoding < %s
# CHECK-ASM-AND-OBJ: fmvh.x.d a1, fs1
# CHECK-ASM: encoding: [0xd3,0x85,0x14,0xe2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmvh.x.d a1, fs1
# CHECK-ASM-AND-OBJ: fmvp.d.x fs1, a1, a2
# CHECK-ASM: encoding: [0xd3,0x84,0xc5,0xb2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmvp.d.x fs1, a1, a2
diff --git a/llvm/test/MC/RISCV/rv32zfh-invalid.s b/llvm/test/MC/RISCV/rv32zfh-invalid.s
index 139b8af37b46a3..3d45c0480c1d96 100644
--- a/llvm/test/MC/RISCV/rv32zfh-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zfh-invalid.s
@@ -1,40 +1,39 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfh < %s 2>&1 | \
-# RUN: FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfh < %s
# Out of range immediates
## simm12
-flh ft1, -2049(a0) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-fsh ft2, 2048(a1) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+flh ft1, -2049(a0) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+fsh ft2, 2048(a1) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Memory operand not formatted correctly
-flh ft1, a0, -200 # CHECK: :[[@LINE]]:14: error: register must be a GPR
-fsw ft2, a1, 100 # CHECK: :[[@LINE]]:14: error: register must be a GPR
+flh ft1, a0, -200 # expected-error:14 {{register must be a GPR}}
+fsw ft2, a1, 100 # expected-error:14 {{register must be a GPR}}
# Invalid register names
-flh ft15, 100(a0) # CHECK: :[[@LINE]]:5: error: register must be a FPR
-flh ft1, 100(a10) # CHECK: :[[@LINE]]:14: error: expected register
-fsgnjn.h fa100, fa2, fa3 # CHECK: :[[@LINE]]:10: error: register must be a FPR
+flh ft15, 100(a0) # expected-error:5 {{register must be a FPR}}
+flh ft1, 100(a10) # expected-error:14 {{expected register}}
+fsgnjn.h fa100, fa2, fa3 # expected-error:10 {{register must be a FPR}}
# Integer registers where FP regs are expected
-fmv.x.h fs7, a2 # CHECK: :[[@LINE]]:9: error: register must be a GPR
+fmv.x.h fs7, a2 # expected-error:9 {{register must be a GPR}}
# FP registers where integer regs are expected
-fmv.h.x a8, ft2 # CHECK: :[[@LINE]]:9: error: register must be a FPR
+fmv.h.x a8, ft2 # expected-error:9 {{register must be a FPR}}
# Rounding mode when a register is expected
-fmadd.h f10, f11, f12, ree # CHECK: :[[@LINE]]:24: error: register must be a FPR
+fmadd.h f10, f11, f12, ree # expected-error:24 {{register must be a FPR}}
# Invalid rounding modes
-fmadd.h f10, f11, f12, f13, ree # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fmsub.h f14, f15, f16, f17, 0 # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fnmsub.h f18, f19, f20, f21, 0b111 # CHECK: :[[@LINE]]:30: error: operand must be a valid floating point rounding mode mnemonic
+fmadd.h f10, f11, f12, f13, ree # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fmsub.h f14, f15, f16, f17, 0 # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fnmsub.h f18, f19, f20, f21, 0b111 # expected-error:30 {{operand must be a valid floating point rounding mode mnemonic}}
# Integer registers where FP regs are expected
-fadd.h a2, a1, a0 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:8: note: register must be a FPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zhinx' (Half Float in Integer)
+fadd.h a2, a1, a0 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:8 {{register must be a FPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zhinx' (Half Float in Integer)}}
# FP registers where integer regs are expected
-fcvt.wu.h ft2, a1 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:11: note: register must be a GPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zhinx' (Half Float in Integer)
+fcvt.wu.h ft2, a1 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:11 {{register must be a GPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zhinx' (Half Float in Integer)}}
diff --git a/llvm/test/MC/RISCV/rv32zfinx-invalid.s b/llvm/test/MC/RISCV/rv32zfinx-invalid.s
index ec2335e3e7e2a6..bcaca8556899bb 100644
--- a/llvm/test/MC/RISCV/rv32zfinx-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zfinx-invalid.s
@@ -1,28 +1,28 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfinx %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfinx %s
# Not support float registers
-flw fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point){{$}}
-fadd.s fa0, fa1, fa2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point){{$}}
+flw fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fadd.s fa0, fa1, fa2 # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
# Invalid instructions
-fsw a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point)
-fmv.x.w s0, s1 # CHECK: :[[@LINE]]:1: error: invalid instruction
-fadd.d t1, t3, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zdinx' (Double in Integer){{$}}
+fsw a5, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fmv.x.w s0, s1 # expected-error:1 {{invalid instruction}}
+fadd.d t1, t3, t5 # expected-error:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
# Invalid register names
-fadd.s a100, a2, a3 # CHECK: :[[@LINE]]:8: error: register must be a GPR when used as an FP operand
-fsgnjn.s a100, a2, a3 # CHECK: :[[@LINE]]:10: error: register must be a GPR when used as an FP operand
+fadd.s a100, a2, a3 # expected-error:8 {{register must be a GPR when used as an FP operand}}
+fsgnjn.s a100, a2, a3 # expected-error:10 {{register must be a GPR when used as an FP operand}}
# Rounding mode when a register is expected
-fmadd.s x10, x11, x12, ree # CHECK: :[[@LINE]]:24: error: register must be a GPR when used as an FP operand
+fmadd.s x10, x11, x12, ree # expected-error:24 {{register must be a GPR when used as an FP operand}}
# Invalid rounding modes
-fmadd.s x10, x11, x12, x13, ree # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fmsub.s x14, x15, x16, x17, 0 # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fnmsub.s x18, x19, x20, x21, 0b111 # CHECK: :[[@LINE]]:30: error: operand must be a valid floating point rounding mode mnemonic
+fmadd.s x10, x11, x12, x13, ree # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fmsub.s x14, x15, x16, x17, 0 # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fnmsub.s x18, x19, x20, x21, 0b111 # expected-error:30 {{operand must be a valid floating point rounding mode mnemonic}}
# Using 'Zdinx' instructions for an 'Zfinx'-only target
# odd registers report incorrect registers
-fadd.d t0, t1, t2 # CHECK: :[[@LINE]]:8: error: double precision floating point operands must use even numbered X register
+fadd.d t0, t1, t2 # expected-error:8 {{double precision floating point operands must use even numbered X register}}
# even registers report the required extension
-fadd.d t3, t1, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zdinx' (Double in Integer){{$}}
+fadd.d t3, t1, t5 # expected-error:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
diff --git a/llvm/test/MC/RISCV/rv32zhinx-invalid.s b/llvm/test/MC/RISCV/rv32zhinx-invalid.s
index a1bd3116d6d1c0..be3ff732c03d94 100644
--- a/llvm/test/MC/RISCV/rv32zhinx-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zhinx-invalid.s
@@ -1,24 +1,24 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zhinx %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zhinx %s
# Not support float registers
-flw fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point){{$}}
-fadd.h fa0, fa1, fa2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+flw fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fadd.h fa0, fa1, fa2 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
# Invalid instructions
-fsw a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point)
-fmv.x.h s0, s1 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fsw a5, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fmv.x.h s0, s1 # expected-error:1 {{invalid instruction}}
# Invalid register names
-fadd.h a100, a2, a3 # CHECK: :[[@LINE]]:8: error: register must be a GPR when used as an FP operand
-fsgnjn.h a100, a2, a3 # CHECK: :[[@LINE]]:10: error: register must be a GPR when used as an FP operand
+fadd.h a100, a2, a3 # expected-error:8 {{register must be a GPR when used as an FP operand}}
+fsgnjn.h a100, a2, a3 # expected-error:10 {{register must be a GPR when used as an FP operand}}
# Rounding mode when a register is expected
-fmadd.h x10, x11, x12, ree # CHECK: :[[@LINE]]:24: error: register must be a GPR when used as an FP operand
+fmadd.h x10, x11, x12, ree # expected-error:24 {{register must be a GPR when used as an FP operand}}
# Invalid rounding modes
-fmadd.h x10, x11, x12, x13, ree # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fmsub.h x14, x15, x16, x17, 0 # CHECK: :[[@LINE]]:29: error: operand must be a valid floating point rounding mode mnemonic
-fnmsub.h x18, x19, x20, x21, 0b111 # CHECK: :[[@LINE]]:30: error: operand must be a valid floating point rounding mode mnemonic
+fmadd.h x10, x11, x12, x13, ree # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fmsub.h x14, x15, x16, x17, 0 # expected-error:29 {{operand must be a valid floating point rounding mode mnemonic}}
+fnmsub.h x18, x19, x20, x21, 0b111 # expected-error:30 {{operand must be a valid floating point rounding mode mnemonic}}
# FP registers where integer regs are expected
-fcvt.wu.h ft2, a1 # CHECK: :[[@LINE]]:11: error: register must be a GPR
+fcvt.wu.h ft2, a1 # expected-error:11 {{register must be a GPR}}
diff --git a/llvm/test/MC/RISCV/rv32zhinxmin-invalid.s b/llvm/test/MC/RISCV/rv32zhinxmin-invalid.s
index 86eacff4808854..c1a28e69d7d979 100644
--- a/llvm/test/MC/RISCV/rv32zhinxmin-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zhinxmin-invalid.s
@@ -1,15 +1,15 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zhinxmin %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zhinxmin %s
# Not support float registers
-flw fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point){{$}}
-fcvt.h.s fa0, fa1 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal){{$}}
+flw fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fcvt.h.s fa0, fa1 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
# Invalid instructions
-fsw a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point)
-fmv.x.h s0, s1 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fsw a5, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fmv.x.h s0, s1 # expected-error:1 {{invalid instruction}}
# Invalid register names
-fcvt.h.s a100, a1 # CHECK: :[[@LINE]]:10: error: register must be a GPR when used as an FP operand
+fcvt.h.s a100, a1 # expected-error:10 {{register must be a GPR when used as an FP operand}}
# Valid in Zhinx
-fmadd.h x10, x11, x12, x13, dyn # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zhinx' (Half Float in Integer){{$}}
+fmadd.h x10, x11, x12, x13, dyn # expected-error:1 {{instruction requires the following: 'Zhinx' (Half Float in Integer)}}
diff --git a/llvm/test/MC/RISCV/rv32zilsd-invalid.s b/llvm/test/MC/RISCV/rv32zilsd-invalid.s
index 2b2c1dca995db2..71d1f25467393a 100644
--- a/llvm/test/MC/RISCV/rv32zilsd-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zilsd-invalid.s
@@ -1,14 +1,14 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zilsd < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zilsd < %s
# Out of range immediates
## simm12
-ld t1, -2049(a0) # CHECK: :[[@LINE]]:8: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-sd t1, 2048(a0) # CHECK: :[[@LINE]]:8: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+ld t1, -2049(a0) # expected-error:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+sd t1, 2048(a0) # expected-error:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Invalid register names
-ld t2, (4)a0 # CHECK: :[[@LINE]]:4: error: register must be even
-ld s3, (4)a0 # CHECK: :[[@LINE]]:4: error: register must be even
-sd t2, (10)s2 # CHECK: :[[@LINE]]:4: error: register must be even
-sd a7, (10)s2 # CHECK: :[[@LINE]]:4: error: register must be even
-ld x0, a_symbol # CHECK: :[[@LINE]]:4: error: register pair must start with an even GPR other than x0
-sd a2, a_symbol, x0 # CHECK: :[[@LINE]]:18: error: register must be a GPR excluding zero (x0)
+ld t2, (4)a0 # expected-error:4 {{register must be even}}
+ld s3, (4)a0 # expected-error:4 {{register must be even}}
+sd t2, (10)s2 # expected-error:4 {{register must be even}}
+sd a7, (10)s2 # expected-error:4 {{register must be even}}
+ld x0, a_symbol # expected-error:4 {{register pair must start with an even GPR other than x0}}
+sd a2, a_symbol, x0 # expected-error:18 {{register must be a GPR excluding zero (x0)}}
diff --git a/llvm/test/MC/RISCV/rv32zimop-invalid.s b/llvm/test/MC/RISCV/rv32zimop-invalid.s
index 8dc1f2a708d4e2..ff696c450daa68 100644
--- a/llvm/test/MC/RISCV/rv32zimop-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zimop-invalid.s
@@ -1,6 +1,6 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zimop < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zimop < %s
# Too few operands
-mop.r.0 t0 # CHECK: :[[@LINE]]:11: error: too few operands for instruction
+mop.r.0 t0 # expected-error:11 {{too few operands for instruction}}
# Too few operands
-mop.rr.0 t0, t1 # CHECK: :[[@LINE]]:16: error: too few operands for instruction
+mop.rr.0 t0, t1 # expected-error:16 {{too few operands for instruction}}
diff --git a/llvm/test/MC/RISCV/rv32zknd-only-invalid.s b/llvm/test/MC/RISCV/rv32zknd-only-invalid.s
index 05ae48491a037b..e4f57c8b7e5bfe 100644
--- a/llvm/test/MC/RISCV/rv32zknd-only-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zknd-only-invalid.s
@@ -1,17 +1,14 @@
# With Zk extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zk < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zk < %s
# With Zkn extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zkn < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zkn < %s
# With Zknd extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zknd < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zknd < %s
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
aes32dsmi a0, a1, a2, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
aes32dsi a0, a1, a2, 8
diff --git a/llvm/test/MC/RISCV/rv32zkne-only-invalid.s b/llvm/test/MC/RISCV/rv32zkne-only-invalid.s
index 9ace21cae5eff1..4ef23ad80d77cc 100644
--- a/llvm/test/MC/RISCV/rv32zkne-only-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zkne-only-invalid.s
@@ -1,17 +1,14 @@
# With Zk extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zk < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zk < %s
# With Zkn extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zkn < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zkn < %s
# With Zkne extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zkne < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zkne < %s
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
aes32esmi a0, a1, a2, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
aes32esi a0, a1, a2, 8
diff --git a/llvm/test/MC/RISCV/rv32zksed-invalid.s b/llvm/test/MC/RISCV/rv32zksed-invalid.s
index feb9bc09b60bf1..bf0692daf70518 100644
--- a/llvm/test/MC/RISCV/rv32zksed-invalid.s
+++ b/llvm/test/MC/RISCV/rv32zksed-invalid.s
@@ -1,13 +1,11 @@
# With Zks extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zks < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zks < %s
# With Zksed extension:
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zksed < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zksed < %s
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
sm4ed a0, a1, a2, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
sm4ks a0, a1, a2, 8
diff --git a/llvm/test/MC/RISCV/rv32zmmul-invaild.s b/llvm/test/MC/RISCV/rv32zmmul-invaild.s
index b5f1ee64016b84..48e2acd941d2e4 100644
--- a/llvm/test/MC/RISCV/rv32zmmul-invaild.s
+++ b/llvm/test/MC/RISCV/rv32zmmul-invaild.s
@@ -1,14 +1,13 @@
-# RUN: not llvm-mc %s -triple=riscv32 -mattr=+zmmul -M no-aliases 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify %s -triple=riscv32 -mattr=+zmmul -M no-aliases
-# CHECK-ERROR: 5:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
div s0, s0, s0
-# CHECK-ERROR: 8:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
divu gp, a0, a1
-# CHECK-ERROR: 11:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
rem s2, s2, s8
-# CHECK-ERROR: 14:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
remu x18, x18, x24
diff --git a/llvm/test/MC/RISCV/rv64d-invalid.s b/llvm/test/MC/RISCV/rv64d-invalid.s
index 79a8bcbf41d8c6..62eafd9bdb7c47 100644
--- a/llvm/test/MC/RISCV/rv64d-invalid.s
+++ b/llvm/test/MC/RISCV/rv64d-invalid.s
@@ -1,21 +1,21 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+d < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+d < %s
# Integer registers where FP regs are expected
-fcvt.l.d ft0, a0 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:10: note: register must be a GPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer)
-fcvt.lu.d ft1, a1 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:11: note: register must be a GPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer)
-fmv.x.d ft2, a2 # CHECK: :[[@LINE]]:9: error: register must be a GPR
+fcvt.l.d ft0, a0 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:10 {{register must be a GPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
+fcvt.lu.d ft1, a1 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:11 {{register must be a GPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
+fmv.x.d ft2, a2 # expected-error:9 {{register must be a GPR}}
# FP registers where integer regs are expected
-fcvt.d.l a3, ft3 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:10: note: register must be a FPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer)
+fcvt.d.l a3, ft3 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:10 {{register must be a FPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
-fcvt.d.lu a4, ft4 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:11: note: register must be a FPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zdinx' (Double in Integer)
+fcvt.d.lu a4, ft4 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:11 {{register must be a FPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zdinx' (Double in Integer)}}
-fmv.d.x a5, ft5 # CHECK: :[[@LINE]]:9: error: register must be a FPR
+fmv.d.x a5, ft5 # expected-error:9 {{register must be a FPR}}
diff --git a/llvm/test/MC/RISCV/rv64d-valid.s b/llvm/test/MC/RISCV/rv64d-valid.s
index 8a9f608b664d22..51f2b727497b14 100644
--- a/llvm/test/MC/RISCV/rv64d-valid.s
+++ b/llvm/test/MC/RISCV/rv64d-valid.s
@@ -4,48 +4,47 @@
# RUN: | llvm-objdump --mattr=+d -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+d < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+d < %s
# CHECK-ASM-AND-OBJ: fcvt.l.d a0, ft0, dyn
# CHECK-ASM: encoding: [0x53,0x75,0x20,0xc2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.d a0, ft0, dyn
# CHECK-ASM-AND-OBJ: fcvt.lu.d a1, ft1, dyn
# CHECK-ASM: encoding: [0xd3,0xf5,0x30,0xc2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.d a1, ft1, dyn
# CHECK-ASM-AND-OBJ: fmv.x.d a2, ft2
# CHECK-ASM: encoding: [0x53,0x06,0x01,0xe2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fmv.x.d a2, ft2
# CHECK-ASM-AND-OBJ: fcvt.d.l ft3, a3, dyn
# CHECK-ASM: encoding: [0xd3,0xf1,0x26,0xd2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.l ft3, a3, dyn
# CHECK-ASM-AND-OBJ: fcvt.d.lu ft4, a4, dyn
# CHECK-ASM: encoding: [0x53,0x72,0x37,0xd2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.lu ft4, a4, dyn
# CHECK-ASM-AND-OBJ: fmv.d.x ft5, a5
# CHECK-ASM: encoding: [0xd3,0x82,0x07,0xf2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fmv.d.x ft5, a5
# Rounding modes
# CHECK-ASM-AND-OBJ: fcvt.d.l ft3, a3, rne
# CHECK-ASM: encoding: [0xd3,0x81,0x26,0xd2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.l ft3, a3, rne
# CHECK-ASM-AND-OBJ: fcvt.d.lu ft4, a4, rtz
# CHECK-ASM: encoding: [0x53,0x12,0x37,0xd2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.lu ft4, a4, rtz
# CHECK-ASM-AND-OBJ: fcvt.l.d a0, ft0, rdn
# CHECK-ASM: encoding: [0x53,0x25,0x20,0xc2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.d a0, ft0, rdn
# CHECK-ASM-AND-OBJ: fcvt.lu.d a1, ft1, rup
# CHECK-ASM: encoding: [0xd3,0xb5,0x30,0xc2]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.d a1, ft1, rup
diff --git a/llvm/test/MC/RISCV/rv64e-xqccmp-invalid.s b/llvm/test/MC/RISCV/rv64e-xqccmp-invalid.s
index 5e69b289ae8b7d..abe5577f8c1315 100644
--- a/llvm/test/MC/RISCV/rv64e-xqccmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv64e-xqccmp-invalid.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+e,+xqccmp < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+e,+xqccmp < %s
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+xqccmp < %s \
# RUN: | llvm-objdump --mattr=+e,+xqccmp -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefix=CHECK-DIS %s
@@ -8,17 +8,17 @@
# CHECK-DIS: b872 <unknown>
-# CHECK: :[[@LINE+1]]:19: error: invalid register
+# expected-error at +1:19 {{invalid register}}
qc.cm.push {ra,s0-s2}, -32
# CHECK-DIS: be72 <unknown>
-# CHECK: :[[@LINE+1]]:21: error: invalid register
+# expected-error at +1:21 {{invalid register}}
qc.cm.popret {ra,s0-s2}, 32
# CHECK-DIS: ba72 <unknown>
-# CHECK: :[[@LINE+1]]:23: error: invalid register
+# expected-error at +1:23 {{invalid register}}
qc.cm.pop {x1, x8-x9, x18}, 32
# CHECK-DIS: b972 <unknown>
-# CHECK: :[[@LINE+1]]:26: error: invalid register
+# expected-error at +1:26 {{invalid register}}
qc.cm.pushfp {x1, x8-x9, x18}, -32
# CHECK-DIS: b972 <unknown>
-# CHECK: :[[@LINE+1]]:22: error: invalid register
+# expected-error at +1:22 {{invalid register}}
qc.cm.pushfp {ra, s0-s2}, -32
diff --git a/llvm/test/MC/RISCV/rv64e-zcmp-invalid.s b/llvm/test/MC/RISCV/rv64e-zcmp-invalid.s
index 45081c65a2bc50..d36212483bd049 100644
--- a/llvm/test/MC/RISCV/rv64e-zcmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv64e-zcmp-invalid.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+e,+zcmp < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+e,+zcmp < %s
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zcmp < %s \
# RUN: | llvm-objdump --mattr=+e,+zcmp -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefix=CHECK-DIS %s
@@ -8,14 +8,14 @@
# CHECK-DIS: b872 <unknown>
-# CHECK: :[[@LINE+1]]:16: error: invalid register
+# expected-error at +1:16 {{invalid register}}
cm.push {ra,s0-s2}, -32
# CHECK-DIS: be72 <unknown>
-# CHECK: :[[@LINE+1]]:18: error: invalid register
+# expected-error at +1:18 {{invalid register}}
cm.popret {ra,s0-s2}, 32
# CHECK-DIS: ba72 <unknown>
-# CHECK: :[[@LINE+1]]:20: error: invalid register
+# expected-error at +1:20 {{invalid register}}
cm.pop {x1, x8-x9, x18}, 32
# CHECK-DIS: ba72 <unknown>
-# CHECK: :[[@LINE+1]]:16: error: invalid register
+# expected-error at +1:16 {{invalid register}}
cm.pop {ra, s0-s2}, 32
diff --git a/llvm/test/MC/RISCV/rv64f-invalid.s b/llvm/test/MC/RISCV/rv64f-invalid.s
index b11e1247127810..fd3b62fcaf1938 100644
--- a/llvm/test/MC/RISCV/rv64f-invalid.s
+++ b/llvm/test/MC/RISCV/rv64f-invalid.s
@@ -1,18 +1,18 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+f < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+f < %s
# Integer registers where FP regs are expected
-fcvt.l.s ft0, a0 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:10: note: register must be a GPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zfinx' (Float in Integer)
-fcvt.lu.s ft1, a1 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:11: note: register must be a GPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zfinx' (Float in Integer)
+fcvt.l.s ft0, a0 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:10 {{register must be a GPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zfinx' (Float in Integer)}}
+fcvt.lu.s ft1, a1 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:11 {{register must be a GPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zfinx' (Float in Integer)}}
# FP registers where integer regs are expected
-fcvt.s.l a2, ft2 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:10: note: register must be a FPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zfinx' (Float in Integer)
+fcvt.s.l a2, ft2 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:10 {{register must be a FPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zfinx' (Float in Integer)}}
-fcvt.s.lu a3, ft3 # CHECK: :[[@LINE]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-1]]:11: note: register must be a FPR
-# CHECK: :[[@LINE-2]]:1: note: instruction requires the following: 'Zfinx' (Float in Integer)
+fcvt.s.lu a3, ft3 # expected-error:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -1:11 {{register must be a FPR}}
+# expected-note at -2:1 {{instruction requires the following: 'Zfinx' (Float in Integer)}}
diff --git a/llvm/test/MC/RISCV/rv64f-valid.s b/llvm/test/MC/RISCV/rv64f-valid.s
index 1fea7874e30e9a..6654ba60cf697a 100644
--- a/llvm/test/MC/RISCV/rv64f-valid.s
+++ b/llvm/test/MC/RISCV/rv64f-valid.s
@@ -4,36 +4,35 @@
# RUN: | llvm-objdump --mattr=+f -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+f < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+f < %s
# CHECK-ASM-AND-OBJ: fcvt.l.s a0, ft0, dyn
# CHECK-ASM: encoding: [0x53,0x75,0x20,0xc0]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.s a0, ft0, dyn
# CHECK-ASM-AND-OBJ: fcvt.lu.s a1, ft1, dyn
# CHECK-ASM: encoding: [0xd3,0xf5,0x30,0xc0]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.s a1, ft1, dyn
# CHECK-ASM-AND-OBJ: fcvt.s.l ft2, a2, dyn
# CHECK-ASM: encoding: [0x53,0x71,0x26,0xd0]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.l ft2, a2, dyn
# CHECK-ASM-AND-OBJ: fcvt.s.lu ft3, a3, dyn
# CHECK-ASM: encoding: [0xd3,0xf1,0x36,0xd0]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.lu ft3, a3, dyn
# Rounding modes
# CHECK-ASM-AND-OBJ: fcvt.l.s a4, ft4, rne
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.s a4, ft4, rne
# CHECK-ASM-AND-OBJ: fcvt.lu.s a5, ft5, rtz
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.s a5, ft5, rtz
# CHECK-ASM-AND-OBJ: fcvt.s.l ft6, a6, rdn
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.l ft6, a6, rdn
# CHECK-ASM-AND-OBJ: fcvt.s.lu ft7, a7, rup
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.lu ft7, a7, rup
diff --git a/llvm/test/MC/RISCV/rv64h-invalid.s b/llvm/test/MC/RISCV/rv64h-invalid.s
index 94a642b9803575..b6954da40a1bfa 100644
--- a/llvm/test/MC/RISCV/rv64h-invalid.s
+++ b/llvm/test/MC/RISCV/rv64h-invalid.s
@@ -1,22 +1,20 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+h < %s 2>&1 \
-# RUN: | FileCheck %s -check-prefixes=CHECK-OFFSET
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 \
-# RUN: | FileCheck %s -check-prefixes=CHECK,CHECK-OFFSET
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+h < %s
+# RUN: llvm-mc --verify=check,expected -triple riscv64 < %s
-hfence.gvma zero, zero # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.gvma zero, zero # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.gvma zero # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.gvma zero # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.gvma # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.gvma # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.vvma zero, zero # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.vvma zero, zero # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.vvma zero # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.vvma zero # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hfence.vvma # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hfence.vvma # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hlv.h a0, 0(a1) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hlv.h a0, 0(a1) # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hlv.wu a0, 0(a1) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'H' (Hypervisor)
+hlv.wu a0, 0(a1) # check-error:1 {{instruction requires the following: 'H' (Hypervisor)}}
-hlv.b a0, 100(a1) # CHECK-OFFSET: :[[@LINE]]:13: error: optional integer offset must be 0
+hlv.b a0, 100(a1) # expected-error:13 {{optional integer offset must be 0}}
diff --git a/llvm/test/MC/RISCV/rv64i-aliases-invalid.s b/llvm/test/MC/RISCV/rv64i-aliases-invalid.s
index 23fa343c0e2412..013f9ca89aae5a 100644
--- a/llvm/test/MC/RISCV/rv64i-aliases-invalid.s
+++ b/llvm/test/MC/RISCV/rv64i-aliases-invalid.s
@@ -1,175 +1,175 @@
# UNSUPPORTED: target={{.*-windows.*}}
-# RUN: not llvm-mc -triple=riscv64 -M no-aliases < %s -o /dev/null 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple=riscv64 < %s 2>&1 -o /dev/null | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv64 -M no-aliases -o /dev/null < %s
+# RUN: llvm-mc --verify -triple=riscv64 -o /dev/null < %s
-li t5, 0x10000000000000000 # CHECK: :[[@LINE]]:8: error: unknown operand
+li t5, 0x10000000000000000 # expected-error:8 {{unknown operand}}
li t4, foo
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-# CHECK: :[[@LINE-3]]:8: note: operand must be a constant 64-bit integer
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+# expected-note at -3:8 {{operand must be a constant 64-bit integer}}
-la t5, 0x10000000000000000 # CHECK: :[[@LINE]]:8: error: unknown operand
+la t5, 0x10000000000000000 # expected-error:8 {{unknown operand}}
la x1, %pcrel_hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la x1, %pcrel_lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la x1, %pcrel_hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la x1, %pcrel_lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la x1, %hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la x1, %lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la x1, %hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la x1, %lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
la a1, foo+foo
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:8: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:8: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:8 {{operand must be a bare symbol name}}
+# expected-note at -3:8 {{operand either must be a constant 64-bit integer or a bare symbol name}}
-lla t5, 0x10000000000000000 # CHECK: :[[@LINE]]:9: error: unknown operand
+lla t5, 0x10000000000000000 # expected-error:9 {{unknown operand}}
lla x1, %pcrel_hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla x1, %pcrel_lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla x1, %pcrel_hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla x1, %pcrel_lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla x1, %hi(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla x1, %lo(1234)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla x1, %hi(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla x1, %lo(foo)
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
lla a1, foo+foo
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:9: note: operand must be a bare symbol name
-# CHECK: :[[@LINE-3]]:9: note: operand either must be a constant 64-bit integer or a bare symbol name
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:9 {{operand must be a bare symbol name}}
+# expected-note at -3:9 {{operand either must be a constant 64-bit integer or a bare symbol name}}
-lla a2, foo at plt # CHECK: :[[@LINE]]:12: error: unexpected token
+lla a2, foo at plt # expected-error:12 {{unexpected token}}
-rdinstreth x29 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set{{$}}
+rdinstreth x29 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
-rdcycleh x27 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set{{$}}
+rdcycleh x27 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
-rdtimeh x28 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set{{$}}
+rdtimeh x28 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
sll x2, x3, 64
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 63]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 63]}}
srl x2, x3, 64
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 63]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 63]}}
sra x2, x3, 64
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 63]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 63]}}
sll x2, x3, -1
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 63]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 63]}}
srl x2, x3, -2
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 63]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 63]}}
sra x2, x3, -3
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:13: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:13: note: immediate must be an integer in the range [0, 63]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:13 {{register must be a GPR}}
+# expected-note at -3:13 {{immediate must be an integer in the range [0, 63]}}
sllw x2, x3, 32
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:14: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:14: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:14 {{register must be a GPR}}
+# expected-note at -3:14 {{immediate must be an integer in the range [0, 31]}}
srlw x2, x3, 32
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:14: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:14: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:14 {{register must be a GPR}}
+# expected-note at -3:14 {{immediate must be an integer in the range [0, 31]}}
sraw x2, x3, 32
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:14: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:14: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:14 {{register must be a GPR}}
+# expected-note at -3:14 {{immediate must be an integer in the range [0, 31]}}
sllw x2, x3, -1
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:14: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:14: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:14 {{register must be a GPR}}
+# expected-note at -3:14 {{immediate must be an integer in the range [0, 31]}}
srlw x2, x3, -2
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:14: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:14: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:14 {{register must be a GPR}}
+# expected-note at -3:14 {{immediate must be an integer in the range [0, 31]}}
sraw x2, x3, -3
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:14: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:14: note: immediate must be an integer in the range [0, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:14 {{register must be a GPR}}
+# expected-note at -3:14 {{immediate must be an integer in the range [0, 31]}}
foo:
.space 8
diff --git a/llvm/test/MC/RISCV/rv64i-invalid.s b/llvm/test/MC/RISCV/rv64i-invalid.s
index ed254593b96a32..b87b17ea8824fd 100644
--- a/llvm/test/MC/RISCV/rv64i-invalid.s
+++ b/llvm/test/MC/RISCV/rv64i-invalid.s
@@ -1,30 +1,30 @@
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
# Out of range immediates
## uimm5
-slliw a0, a0, 32 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-srliw a0, a0, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-sraiw a0, a0, -19 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
+slliw a0, a0, 32 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+srliw a0, a0, -1 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+sraiw a0, a0, -19 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
## uimm6
-slli a0, a0, 64 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
-srli a0, a0, -1 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
-srai a0, a0, -19 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
+slli a0, a0, 64 # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
+srli a0, a0, -1 # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
+srai a0, a0, -19 # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
## simm12
-addiw a0, a1, -2049 # CHECK: :[[@LINE]]:15: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-ld ra, 2048(sp) # CHECK: :[[@LINE]]:8: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+addiw a0, a1, -2049 # expected-error:15 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+ld ra, 2048(sp) # expected-error:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Illegal operand modifier
## uimm5
-slliw a0, a0, %lo(1) # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-srliw a0, a0, %lo(a) # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-sraiw a0, a0, %hi(2) # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
+slliw a0, a0, %lo(1) # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+srliw a0, a0, %lo(a) # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+sraiw a0, a0, %hi(2) # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
## uimm6
-slli a0, a0, %lo(1) # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
-srli a0, a0, %lo(a) # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
-srai a0, a0, %hi(2) # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
+slli a0, a0, %lo(1) # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
+srli a0, a0, %lo(a) # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
+srai a0, a0, %hi(2) # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
## simm12
-addiw a0, a1, %hi(foo) # CHECK: :[[@LINE]]:15: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+addiw a0, a1, %hi(foo) # expected-error:15 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
diff --git a/llvm/test/MC/RISCV/rv64ih-valid.s b/llvm/test/MC/RISCV/rv64ih-valid.s
index 13ca4f0635a703..4220b9be345b18 100644
--- a/llvm/test/MC/RISCV/rv64ih-valid.s
+++ b/llvm/test/MC/RISCV/rv64ih-valid.s
@@ -4,35 +4,34 @@
# RUN: | llvm-objdump --mattr=+h -M no-aliases -d - \
# RUN: | FileCheck -check-prefix=CHECK-INST %s
-# RUN: not llvm-mc -triple riscv32 -mattr=+h < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+h < %s
# CHECK-INST: hlv.wu a0, (a1)
# CHECK: encoding: [0x73,0xc5,0x15,0x68]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
hlv.wu a0, (a1)
# CHECK-INST: hlv.wu a0, (a1)
# CHECK: encoding: [0x73,0xc5,0x15,0x68]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
hlv.wu a0, 0(a1)
# CHECK-INST: hlv.d a0, (a1)
# CHECK: encoding: [0x73,0xc5,0x05,0x6c]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
hlv.d a0, (a1)
# CHECK-INST: hlv.d a0, (a1)
# CHECK: encoding: [0x73,0xc5,0x05,0x6c]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
hlv.d a0, 0(a1)
# CHECK-INST: hsv.d a0, (a1)
# CHECK: encoding: [0x73,0xc0,0xa5,0x6e]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
hsv.d a0, (a1)
# CHECK-INST: hsv.d a0, (a1)
# CHECK: encoding: [0x73,0xc0,0xa5,0x6e]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
hsv.d a0, 0(a1)
diff --git a/llvm/test/MC/RISCV/rv64p-invalid.s b/llvm/test/MC/RISCV/rv64p-invalid.s
index 412fff140cb21f..f1f9ba2254a633 100644
--- a/llvm/test/MC/RISCV/rv64p-invalid.s
+++ b/llvm/test/MC/RISCV/rv64p-invalid.s
@@ -1,72 +1,71 @@
-# RUN: not llvm-mc -triple=riscv64 --mattr=+experimental-p %s 2>&1 \
-# RUN: | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv64 --mattr=+experimental-p %s
# Imm overflow
-pli.h a0, 0x400 # CHECK: :[[@LINE]]:11: error: immediate must be an integer in the range [-512, 511]
-plui.h a1, 0x400 # CHECK: :[[@LINE]]:12: error: immediate must be an integer in the range [-512, 1023]
-pli.w a1, -0x201 # CHECK: :[[@LINE]]:11: error: immediate must be an integer in the range [-512, 511]
+pli.h a0, 0x400 # expected-error:11 {{immediate must be an integer in the range [-512, 511]}}
+plui.h a1, 0x400 # expected-error:12 {{immediate must be an integer in the range [-512, 1023]}}
+pli.w a1, -0x201 # expected-error:11 {{immediate must be an integer in the range [-512, 511]}}
-pslli.b a6, a7, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 7]
-pslli.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 15]
-pslli.w ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 31]
+pslli.b a6, a7, 100 # expected-error:17 {{immediate must be an integer in the range [0, 7]}}
+pslli.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 15]}}
+pslli.w ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 31]}}
-ssha a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-sshar a0, a1, a2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
+ssha a0, a1, a2 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+sshar a0, a1, a2 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
-psslai.h t0, t1, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 15]
-psslai.w a4, a5, -1 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 31]
-sslai ra, sp, 10 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
+psslai.h t0, t1, 100 # expected-error:18 {{immediate must be an integer in the range [0, 15]}}
+psslai.w a4, a5, -1 # expected-error:18 {{immediate must be an integer in the range [0, 31]}}
+sslai ra, sp, 10 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
-psrli.b a6, a7, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 7]
-psrli.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 15]
-psrli.w ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 31]
+psrli.b a6, a7, 100 # expected-error:17 {{immediate must be an integer in the range [0, 7]}}
+psrli.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 15]}}
+psrli.w ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 31]}}
-pusati.h ra, sp, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 15]
-pusati.w ra, sp, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 31]
-usati ra, sp, 100 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
+pusati.h ra, sp, 100 # expected-error:18 {{immediate must be an integer in the range [0, 15]}}
+pusati.w ra, sp, 100 # expected-error:18 {{immediate must be an integer in the range [0, 31]}}
+usati ra, sp, 100 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
-psrai.b a6, a7, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 7]
-psrai.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 15]
-psrai.w ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 31]
+psrai.b a6, a7, 100 # expected-error:17 {{immediate must be an integer in the range [0, 7]}}
+psrai.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 15]}}
+psrai.w ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [0, 31]}}
-psrari.h ra, sp, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 15]
-psrari.w ra, sp, 100 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 31]
-srari ra, sp, 100 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
+psrari.h ra, sp, 100 # expected-error:18 {{immediate must be an integer in the range [0, 15]}}
+psrari.w ra, sp, 100 # expected-error:18 {{immediate must be an integer in the range [0, 31]}}
+srari ra, sp, 100 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
-psati.h ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [1, 16]
-psati.w ra, sp, 100 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [1, 32]
-sati ra, sp, 100 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [1, 64]
+psati.h ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [1, 16]}}
+psati.w ra, sp, 100 # expected-error:17 {{immediate must be an integer in the range [1, 32]}}
+sati ra, sp, 100 # expected-error:14 {{immediate must be an integer in the range [1, 64]}}
-sadd t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-aadd t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-saddu t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-aaddu t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-ssub t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-asub t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-ssubu t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-asubu t1, a7, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
+sadd t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+aadd t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+saddu t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+aaddu t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+ssub t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+asub t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+ssubu t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+asubu t1, a7, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
-mul.h01 t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-macc.h01 t3, t4, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-mulu.h01 t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-maccu.h01 t3, t4, t5 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
+mul.h01 t0, t1, t2 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+macc.h01 t3, t4, t5 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+mulu.h01 t0, t1, t2 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+maccu.h01 t3, t4, t5 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
-ssh1sadd t0, t1, t2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
+ssh1sadd t0, t1, t2 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
-mul.h00 a4, t4, s2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-macc.h00 a4, a0, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-mul.h11 a0, a4, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-macc.h11 s6, a4, s4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-mulu.h00 s6, s0, a0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-maccu.h00 s0, s6, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-mulu.h11 s0, s4, s6 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-maccu.h11 s0, t4, t4 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-mulsu.h00 a4, s4, s6 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-maccsu.h00 s4, s4, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-mulsu.h11 s8, s4, s0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
-maccsu.h11 s0, a2, s6 # CHECK: :[[@LINE]]:1: error: instruction requires the following: RV32I Base Instruction Set
+mul.h00 a4, t4, s2 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+macc.h00 a4, a0, s0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+mul.h11 a0, a4, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+macc.h11 s6, a4, s4 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+mulu.h00 s6, s0, a0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+maccu.h00 s0, s6, s0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+mulu.h11 s0, s4, s6 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+maccu.h11 s0, t4, t4 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+mulsu.h00 a4, s4, s6 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+maccsu.h00 s4, s4, s0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+mulsu.h11 s8, s4, s0 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
+maccsu.h11 s0, a2, s6 # expected-error:1 {{instruction requires the following: RV32I Base Instruction Set}}
# FIXME: This error doesn't make sense. Should say that we need RV32I.
-pli.dh a0, 1 # CHECK: :[[@LINE]]:1: error: invalid instruction
-pli.db s0, 1 # CHECK: :[[@LINE]]:1: error: invalid instruction
-plui.dh t1, 1 # CHECK: :[[@LINE]]:1: error: invalid instruction
+pli.dh a0, 1 # expected-error:1 {{invalid instruction}}
+pli.db s0, 1 # expected-error:1 {{invalid instruction}}
+plui.dh t1, 1 # expected-error:1 {{invalid instruction}}
diff --git a/llvm/test/MC/RISCV/rv64q-invalid.s b/llvm/test/MC/RISCV/rv64q-invalid.s
index cc2b657e3e492e..8f1ea35491b65f 100644
--- a/llvm/test/MC/RISCV/rv64q-invalid.s
+++ b/llvm/test/MC/RISCV/rv64q-invalid.s
@@ -1,9 +1,9 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+q < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+q < %s
# Integer registers where FP regs are expected
-fcvt.l.q ft0, a0 # CHECK: :[[@LINE]]:10: error: register must be a GPR
-fcvt.lu.q ft1, a1 # CHECK: :[[@LINE]]:11: error: register must be a GPR
+fcvt.l.q ft0, a0 # expected-error:10 {{register must be a GPR}}
+fcvt.lu.q ft1, a1 # expected-error:11 {{register must be a GPR}}
# FP registers where integer regs are expected
-fcvt.q.l a3, ft3 # CHECK: :[[@LINE]]:10: error: register must be a FPR
-fcvt.q.lu a4, ft4 # CHECK: :[[@LINE]]:11: error: register must be a FPR
+fcvt.q.l a3, ft3 # expected-error:10 {{register must be a FPR}}
+fcvt.q.lu a4, ft4 # expected-error:11 {{register must be a FPR}}
diff --git a/llvm/test/MC/RISCV/rv64q-valid.s b/llvm/test/MC/RISCV/rv64q-valid.s
index 81bb2852eac0f4..aa923c59a2f5ec 100644
--- a/llvm/test/MC/RISCV/rv64q-valid.s
+++ b/llvm/test/MC/RISCV/rv64q-valid.s
@@ -4,40 +4,39 @@
# RUN: | llvm-objdump --mattr=+q -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+q < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+q < %s
# CHECK-ASM-AND-OBJ: fcvt.l.q a0, ft0, dyn
# CHECK-ASM: encoding: [0x53,0x75,0x20,0xc6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.q a0, ft0, dyn
# CHECK-ASM-AND-OBJ: fcvt.lu.q a1, ft1, dyn
# CHECK-ASM: encoding: [0xd3,0xf5,0x30,0xc6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.q a1, ft1, dyn
# CHECK-ASM-AND-OBJ: fcvt.q.l ft3, a3, dyn
# CHECK-ASM: encoding: [0xd3,0xf1,0x26,0xd6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.q.l ft3, a3, dyn
# CHECK-ASM-AND-OBJ: fcvt.q.lu ft4, a4, dyn
# CHECK-ASM: encoding: [0x53,0x72,0x37,0xd6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.q.lu ft4, a4, dyn
# Rounding modes
# CHECK-ASM-AND-OBJ: fcvt.q.l ft3, a3
# CHECK-ASM: encoding: [0xd3,0x81,0x26,0xd6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.q.l ft3, a3, rne
# CHECK-ASM-AND-OBJ: fcvt.q.lu ft4, a4, rtz
# CHECK-ASM: encoding: [0x53,0x12,0x37,0xd6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.q.lu ft4, a4, rtz
# CHECK-ASM-AND-OBJ: fcvt.l.q a0, ft0, rdn
# CHECK-ASM: encoding: [0x53,0x25,0x20,0xc6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.q a0, ft0, rdn
# CHECK-ASM-AND-OBJ: fcvt.lu.q a1, ft1, rup
# CHECK-ASM: encoding: [0xd3,0xb5,0x30,0xc6]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.q a1, ft1, rup
diff --git a/llvm/test/MC/RISCV/rv64xqccmp-invalid.s b/llvm/test/MC/RISCV/rv64xqccmp-invalid.s
index 890eacba472383..06523114cd1b87 100644
--- a/llvm/test/MC/RISCV/rv64xqccmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv64xqccmp-invalid.s
@@ -1,35 +1,34 @@
-# RUN: not llvm-mc -triple=riscv64 -mattr=xqccmp -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=xqccmp -M no-aliases -show-encoding < %s
-# CHECK-ERROR: :[[@LINE+1]]:14: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:14 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
qc.cm.mvsa01 a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:14: error: rs1 and rs2 must be different
+# expected-error at +1:14 {{rs1 and rs2 must be different}}
qc.cm.mvsa01 s0, s0
-# CHECK-ERROR: :[[@LINE+1]]:14: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:14 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
qc.cm.mva01s a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:15: error: invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported
+# expected-error at +1:15 {{invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported}}
qc.cm.popretz {ra, s0-s10}, 112
-# CHECK-ERROR: :[[@LINE+1]]:28: error: stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]
+# expected-error at +1:28 {{stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]}}
qc.cm.popretz {ra, s0-s1}, 112
-# CHECK-ERROR: :[[@LINE+1]]:18: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:18 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.push {ra}, 16
-# CHECK-ERROR: :[[@LINE+1]]:24: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:24 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.pushfp {ra, s0}, 16
-# CHECK-ERROR: :[[@LINE+1]]:24: error: stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]
+# expected-error at +1:24 {{stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]}}
qc.cm.pop {ra, s0-s1}, -32
-# CHECK-ERROR: :[[@LINE+1]]:18: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:18 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.push {ra}, -15
-# CHECK-ERROR: :[[@LINE+1]]:22: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:22 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
qc.cm.push {ra, s0}, -15
-# CHECK-ERROR: :[[@LINE+1]]:24: error: stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]
+# expected-error at +1:24 {{stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]}}
qc.cm.pop {ra, s0-s1}, -33
diff --git a/llvm/test/MC/RISCV/rv64xtheadbs-invalid.s b/llvm/test/MC/RISCV/rv64xtheadbs-invalid.s
index db9e7dc813d627..37b8fdbb4fd5bb 100644
--- a/llvm/test/MC/RISCV/rv64xtheadbs-invalid.s
+++ b/llvm/test/MC/RISCV/rv64xtheadbs-invalid.s
@@ -1,5 +1,5 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadbs < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xtheadbs < %s
# Immediate operand out of range
-th.tst t0, t1, 64 # CHECK: :[[@LINE]]:16: error: immediate must be an integer in the range [0, 63]
-th.tst t0, t1, -1 # CHECK: :[[@LINE]]:16: error: immediate must be an integer in the range [0, 63]
+th.tst t0, t1, 64 # expected-error:16 {{immediate must be an integer in the range [0, 63]}}
+th.tst t0, t1, -1 # expected-error:16 {{immediate must be an integer in the range [0, 63]}}
diff --git a/llvm/test/MC/RISCV/rv64xtheadfmemidx-invalid.s b/llvm/test/MC/RISCV/rv64xtheadfmemidx-invalid.s
index 47d2e6881bda19..ad396671e0739d 100644
--- a/llvm/test/MC/RISCV/rv64xtheadfmemidx-invalid.s
+++ b/llvm/test/MC/RISCV/rv64xtheadfmemidx-invalid.s
@@ -1,9 +1,9 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+d -mattr=+xtheadfmemidx < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+d -mattr=+xtheadfmemidx < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+d -mattr=+xtheadfmemidx < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+d -mattr=+xtheadfmemidx < %s
-th.flrd fa0, a1, a2, 5 # CHECK: :[[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
-th.flrd a0, a1, a2, 3 # CHECK: :[[@LINE]]:9: error: register must be a FPR
-th.flrw 0(fa0), a1, a2, 0 # CHECK: :[[@LINE]]:9: error: register must be a FPR
-th.flrw fa0, 4(a1), a2, 3 # CHECK: :[[@LINE]]:14: error: register must be a GPR
-th.fsrd fa0, a1, -1(a2), 0 # CHECK: :[[@LINE]]:18: error: register must be a GPR
-th.fsrd fa0, a1, a2, -3 # CHECK: :[[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
+th.flrd fa0, a1, a2, 5 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
+th.flrd a0, a1, a2, 3 # expected-error:9 {{register must be a FPR}}
+th.flrw 0(fa0), a1, a2, 0 # expected-error:9 {{register must be a FPR}}
+th.flrw fa0, 4(a1), a2, 3 # expected-error:14 {{register must be a GPR}}
+th.fsrd fa0, a1, -1(a2), 0 # expected-error:18 {{register must be a GPR}}
+th.fsrd fa0, a1, a2, -3 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
diff --git a/llvm/test/MC/RISCV/rv64xtheadmemidx-invalid.s b/llvm/test/MC/RISCV/rv64xtheadmemidx-invalid.s
index 62ad7fbd3730e0..4cf46cd31bfc27 100644
--- a/llvm/test/MC/RISCV/rv64xtheadmemidx-invalid.s
+++ b/llvm/test/MC/RISCV/rv64xtheadmemidx-invalid.s
@@ -1,84 +1,82 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadmemidx < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-RV32 %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadmemidx < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-RV64 %s
+# RUN: llvm-mc --verify=rv32 -triple riscv32 -mattr=+xtheadmemidx < %s
+# RUN: llvm-mc --verify=rv64 -triple riscv64 -mattr=+xtheadmemidx < %s
-# CHECK-RV32: :[[@LINE+2]]:1: error: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV64: :[[@LINE+1]]:9: error: register must be a GPR
+# rv32-error at +2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv64-error at +1:9 {{register must be a GPR}}
th.ldia 0(a0), (a1), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:1: error: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV64: :[[@LINE+1]]:14: error: expected '('
+# rv32-error at +2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv64-error at +1:14 {{expected '('}}
th.ldib a0, 2(a1), 15, 1
-# CHECK-RV32: :[[@LINE+2]]:20: error: immediate must be an integer in the range [-16, 15]
-# CHECK-RV64: :[[@LINE+1]]:20: error: immediate must be an integer in the range [-16, 15]
+# rv32-error at +2:20 {{immediate must be an integer in the range [-16, 15]}}
+# rv64-error at +1:20 {{immediate must be an integer in the range [-16, 15]}}
th.lwia a0, (a1), 30, 2
-# CHECK-RV32: :[[@LINE+2]]:25: error: immediate must be an integer in the range [0, 3]
-# CHECK-RV64: :[[@LINE+1]]:25: error: immediate must be an integer in the range [0, 3]
+# rv32-error at +2:25 {{immediate must be an integer in the range [0, 3]}}
+# rv64-error at +1:25 {{immediate must be an integer in the range [0, 3]}}
th.lwib a0, (a1), -16, 43
-# CHECK-RV32: :[[@LINE+2]]:20: error: immediate must be an integer in the range [-16, 15]
-# CHECK-RV64: :[[@LINE+1]]:20: error: immediate must be an integer in the range [-16, 15]
+# rv32-error at +2:20 {{immediate must be an integer in the range [-16, 15]}}
+# rv64-error at +1:20 {{immediate must be an integer in the range [-16, 15]}}
th.lhib a0, (a1), -17, 3
-# CHECK-RV32: :[[@LINE+2]]:9: error: register must be a GPR
-# CHECK-RV64: :[[@LINE+1]]:9: error: register must be a GPR
+# rv32-error at +2:9 {{register must be a GPR}}
+# rv64-error at +1:9 {{register must be a GPR}}
th.lrb -2(a0), a1, a2, 0
-# CHECK-RV32: :[[@LINE+2]]:13: error: register must be a GPR
-# CHECK-RV64: :[[@LINE+1]]:13: error: register must be a GPR
+# rv32-error at +2:13 {{register must be a GPR}}
+# rv64-error at +1:13 {{register must be a GPR}}
th.lrw a0, 3(a1), a2, 1
-# CHECK-RV32: :[[@LINE+2]]:17: error: register must be a GPR
-# CHECK-RV64: :[[@LINE+1]]:17: error: register must be a GPR
+# rv32-error at +2:17 {{register must be a GPR}}
+# rv64-error at +1:17 {{register must be a GPR}}
th.lrw a0, a1, 4(a2), 2
-# CHECK-RV32: :[[@LINE+2]]:21: error: immediate must be an integer in the range [0, 3]
-# CHECK-RV64: :[[@LINE+1]]:21: error: immediate must be an integer in the range [0, 3]
+# rv32-error at +2:21 {{immediate must be an integer in the range [0, 3]}}
+# rv64-error at +1:21 {{immediate must be an integer in the range [0, 3]}}
th.lrh a0, a1, a2, 5
-# CHECK-RV32: :[[@LINE+2]]:22: error: immediate must be an integer in the range [0, 3]
-# CHECK-RV64: :[[@LINE+1]]:22: error: immediate must be an integer in the range [0, 3]
+# rv32-error at +2:22 {{immediate must be an integer in the range [0, 3]}}
+# rv64-error at +1:22 {{immediate must be an integer in the range [0, 3]}}
th.lrhu a0, a1, a2, -1
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lbia a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lbib a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lbuia a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lbuib a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lhia a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lhib a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lhuia a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lhuib a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lwia a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lwib a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:1: error: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lwuia a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:1: error: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lwuib a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:1: error: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.ldia a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:1: error: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.ldib a0, (a0), 0, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lbia a0, (x10), 1, 0
-# CHECK-RV32: :[[@LINE+2]]:10: error: rd and rs1 must be different
-# CHECK-RV64: :[[@LINE+1]]:10: error: rd and rs1 must be different
+# rv32-error at +2:10 {{rd and rs1 must be different}}
+# rv64-error at +1:10 {{rd and rs1 must be different}}
th.lbia zero, (zero), 0, 0
diff --git a/llvm/test/MC/RISCV/rv64xtheadmempair-invalid.s b/llvm/test/MC/RISCV/rv64xtheadmempair-invalid.s
index fcbae40f671e6a..2d7faf8f8a5979 100644
--- a/llvm/test/MC/RISCV/rv64xtheadmempair-invalid.s
+++ b/llvm/test/MC/RISCV/rv64xtheadmempair-invalid.s
@@ -1,19 +1,19 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadmempair < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xtheadmempair < %s
-th.ldd t0, t1, (t2), 5, 4 # CHECK: [[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
-th.ldd t0, t1, (t2) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.ldd t0, t1, (t2), 3, 5 # CHECK: [[@LINE]]:25: error: operand must be constant 4
-th.sdd a0, a1, (a2), 5, 4 # CHECK: [[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
-th.sdd a0, a1, (a2) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.sdd a0, a1, (a2), 3, 5 # CHECK: [[@LINE]]:25: error: operand must be constant 4
-th.lwud t0, t1, (t2), 5, 4 # CHECK: [[@LINE]]:23: error: immediate must be an integer in the range [0, 3]
-th.lwud t0, t1, (t2) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.lwud t0, t1, (t2), 3, 5 # CHECK: [[@LINE]]:26: error: operand must be constant 3
-th.lwd a3, a4, (a5), 5, 4 # CHECK: [[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
-th.lwd a3, a4, (a5) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.lwd a3, a4, (a5), 3, 5 # CHECK: [[@LINE]]:25: error: operand must be constant 3
-th.swd t3, t4, (t5), 5, 4 # CHECK: [[@LINE]]:22: error: immediate must be an integer in the range [0, 3]
-th.swd t3, t4, (t5) # CHECK: [[@LINE]]:29: error: too few operands for instruction
-th.swd t3, t4, (t5), 3, 5 # CHECK: [[@LINE]]:25: error: operand must be constant 3
-th.ldd x6, x6, (x7), 2, 4 # CHECK: [[@LINE]]:8: error: rs1, rd1, and rd2 cannot overlap
-th.lwud x6, x6, (x6), 2, 3 # CHECK: [[@LINE]]:9: error: rs1, rd1, and rd2 cannot overlap
+th.ldd t0, t1, (t2), 5, 4 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
+th.ldd t0, t1, (t2) # expected-error:29 {{too few operands for instruction}}
+th.ldd t0, t1, (t2), 3, 5 # expected-error:25 {{operand must be constant 4}}
+th.sdd a0, a1, (a2), 5, 4 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
+th.sdd a0, a1, (a2) # expected-error:29 {{too few operands for instruction}}
+th.sdd a0, a1, (a2), 3, 5 # expected-error:25 {{operand must be constant 4}}
+th.lwud t0, t1, (t2), 5, 4 # expected-error:23 {{immediate must be an integer in the range [0, 3]}}
+th.lwud t0, t1, (t2) # expected-error:29 {{too few operands for instruction}}
+th.lwud t0, t1, (t2), 3, 5 # expected-error:26 {{operand must be constant 3}}
+th.lwd a3, a4, (a5), 5, 4 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
+th.lwd a3, a4, (a5) # expected-error:29 {{too few operands for instruction}}
+th.lwd a3, a4, (a5), 3, 5 # expected-error:25 {{operand must be constant 3}}
+th.swd t3, t4, (t5), 5, 4 # expected-error:22 {{immediate must be an integer in the range [0, 3]}}
+th.swd t3, t4, (t5) # expected-error:29 {{too few operands for instruction}}
+th.swd t3, t4, (t5), 3, 5 # expected-error:25 {{operand must be constant 3}}
+th.ldd x6, x6, (x7), 2, 4 # expected-error:8 {{rs1, rd1, and rd2 cannot overlap}}
+th.lwud x6, x6, (x6), 2, 3 # expected-error:9 {{rs1, rd1, and rd2 cannot overlap}}
diff --git a/llvm/test/MC/RISCV/rv64zaamo-invalid.s b/llvm/test/MC/RISCV/rv64zaamo-invalid.s
index cb219a79bc7eea..9dae6b86558473 100644
--- a/llvm/test/MC/RISCV/rv64zaamo-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zaamo-invalid.s
@@ -1,12 +1,12 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+a < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zaamo < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+a < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zaamo < %s
# Final operand must have parentheses
-amoswap.d a1, a2, a3 # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amomin.d a1, a2, 1 # CHECK: :[[@LINE]]:20: error: expected '(' after optional integer offset
-amomin.d a1, a2, 1(a3) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
+amoswap.d a1, a2, a3 # expected-error:19 {{expected '(' or optional integer offset}}
+amomin.d a1, a2, 1 # expected-error:20 {{expected '(' after optional integer offset}}
+amomin.d a1, a2, 1(a3) # expected-error:18 {{optional integer offset must be 0}}
# Only .aq, .rl, and .aqrl suffixes are valid
-amoxor.d.rlqa a2, a3, (a4) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
-amoor.d.aq.rl a4, a5, (a6) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
-amoor.d. a4, a5, (a6) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
+amoxor.d.rlqa a2, a3, (a4) # expected-error:1 {{unrecognized instruction mnemonic}}
+amoor.d.aq.rl a4, a5, (a6) # expected-error:1 {{unrecognized instruction mnemonic}}
+amoor.d. a4, a5, (a6) # expected-error:1 {{unrecognized instruction mnemonic}}
diff --git a/llvm/test/MC/RISCV/rv64zaamo-valid.s b/llvm/test/MC/RISCV/rv64zaamo-valid.s
index c401ce10cc8f80..e6f5af926914b2 100644
--- a/llvm/test/MC/RISCV/rv64zaamo-valid.s
+++ b/llvm/test/MC/RISCV/rv64zaamo-valid.s
@@ -4,8 +4,7 @@
# RUN: | llvm-objdump --mattr=+a -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+a < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+a < %s
#
# RUN: llvm-mc %s -triple=riscv64 -mattr=+zaamo -M no-aliases -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
@@ -13,154 +12,153 @@
# RUN: | llvm-objdump --mattr=+zaamo -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+zaamo < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zaamo < %s
# CHECK-ASM-AND-OBJ: amoswap.d a4, ra, (s0)
# CHECK-ASM: encoding: [0x2f,0x37,0x14,0x08]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoswap.d a4, ra, (s0)
# CHECK-ASM-AND-OBJ: amoadd.d a1, a2, (a3)
# CHECK-ASM: encoding: [0xaf,0xb5,0xc6,0x00]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoadd.d a1, a2, (a3)
# CHECK-ASM-AND-OBJ: amoxor.d a2, a3, (a4)
# CHECK-ASM: encoding: [0x2f,0x36,0xd7,0x20]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoxor.d a2, a3, (a4)
# CHECK-ASM-AND-OBJ: amoand.d a3, a4, (a5)
# CHECK-ASM: encoding: [0xaf,0xb6,0xe7,0x60]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoand.d a3, a4, (a5)
# CHECK-ASM-AND-OBJ: amoor.d a4, a5, (a6)
# CHECK-ASM: encoding: [0x2f,0x37,0xf8,0x40]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoor.d a4, a5, (a6)
# CHECK-ASM-AND-OBJ: amomin.d a5, a6, (a7)
# CHECK-ASM: encoding: [0xaf,0xb7,0x08,0x81]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomin.d a5, a6, (a7)
# CHECK-ASM-AND-OBJ: amomax.d s7, s6, (s5)
# CHECK-ASM: encoding: [0xaf,0xbb,0x6a,0xa1]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomax.d s7, s6, (s5)
# CHECK-ASM-AND-OBJ: amominu.d s6, s5, (s4)
# CHECK-ASM: encoding: [0x2f,0x3b,0x5a,0xc1]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amominu.d s6, s5, (s4)
# CHECK-ASM-AND-OBJ: amomaxu.d s5, s4, (s3)
# CHECK-ASM: encoding: [0xaf,0xba,0x49,0xe1]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomaxu.d s5, s4, (s3)
# CHECK-ASM-AND-OBJ: amoswap.d.aq a4, ra, (s0)
# CHECK-ASM: encoding: [0x2f,0x37,0x14,0x0c]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoswap.d.aq a4, ra, (s0)
# CHECK-ASM-AND-OBJ: amoadd.d.aq a1, a2, (a3)
# CHECK-ASM: encoding: [0xaf,0xb5,0xc6,0x04]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoadd.d.aq a1, a2, (a3)
# CHECK-ASM-AND-OBJ: amoxor.d.aq a2, a3, (a4)
# CHECK-ASM: encoding: [0x2f,0x36,0xd7,0x24]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoxor.d.aq a2, a3, (a4)
# CHECK-ASM-AND-OBJ: amoand.d.aq a3, a4, (a5)
# CHECK-ASM: encoding: [0xaf,0xb6,0xe7,0x64]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoand.d.aq a3, a4, (a5)
# CHECK-ASM-AND-OBJ: amoor.d.aq a4, a5, (a6)
# CHECK-ASM: encoding: [0x2f,0x37,0xf8,0x44]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoor.d.aq a4, a5, (a6)
# CHECK-ASM-AND-OBJ: amomin.d.aq a5, a6, (a7)
# CHECK-ASM: encoding: [0xaf,0xb7,0x08,0x85]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomin.d.aq a5, a6, (a7)
# CHECK-ASM-AND-OBJ: amomax.d.aq s7, s6, (s5)
# CHECK-ASM: encoding: [0xaf,0xbb,0x6a,0xa5]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomax.d.aq s7, s6, (s5)
# CHECK-ASM-AND-OBJ: amominu.d.aq s6, s5, (s4)
# CHECK-ASM: encoding: [0x2f,0x3b,0x5a,0xc5]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amominu.d.aq s6, s5, (s4)
# CHECK-ASM-AND-OBJ: amomaxu.d.aq s5, s4, (s3)
# CHECK-ASM: encoding: [0xaf,0xba,0x49,0xe5]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomaxu.d.aq s5, s4, (s3)
# CHECK-ASM-AND-OBJ: amoswap.d.rl a4, ra, (s0)
# CHECK-ASM: encoding: [0x2f,0x37,0x14,0x0a]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoswap.d.rl a4, ra, (s0)
# CHECK-ASM-AND-OBJ: amoadd.d.rl a1, a2, (a3)
# CHECK-ASM: encoding: [0xaf,0xb5,0xc6,0x02]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoadd.d.rl a1, a2, (a3)
# CHECK-ASM-AND-OBJ: amoxor.d.rl a2, a3, (a4)
# CHECK-ASM: encoding: [0x2f,0x36,0xd7,0x22]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoxor.d.rl a2, a3, (a4)
# CHECK-ASM-AND-OBJ: amoand.d.rl a3, a4, (a5)
# CHECK-ASM: encoding: [0xaf,0xb6,0xe7,0x62]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoand.d.rl a3, a4, (a5)
# CHECK-ASM-AND-OBJ: amoor.d.rl a4, a5, (a6)
# CHECK-ASM: encoding: [0x2f,0x37,0xf8,0x42]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoor.d.rl a4, a5, (a6)
# CHECK-ASM-AND-OBJ: amomin.d.rl a5, a6, (a7)
# CHECK-ASM: encoding: [0xaf,0xb7,0x08,0x83]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomin.d.rl a5, a6, (a7)
# CHECK-ASM-AND-OBJ: amomax.d.rl s7, s6, (s5)
# CHECK-ASM: encoding: [0xaf,0xbb,0x6a,0xa3]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomax.d.rl s7, s6, (s5)
# CHECK-ASM-AND-OBJ: amominu.d.rl s6, s5, (s4)
# CHECK-ASM: encoding: [0x2f,0x3b,0x5a,0xc3]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amominu.d.rl s6, s5, (s4)
# CHECK-ASM-AND-OBJ: amomaxu.d.rl s5, s4, (s3)
# CHECK-ASM: encoding: [0xaf,0xba,0x49,0xe3]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomaxu.d.rl s5, s4, (s3)
# CHECK-ASM-AND-OBJ: amoswap.d.aqrl a4, ra, (s0)
# CHECK-ASM: encoding: [0x2f,0x37,0x14,0x0e]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoswap.d.aqrl a4, ra, (s0)
# CHECK-ASM-AND-OBJ: amoadd.d.aqrl a1, a2, (a3)
# CHECK-ASM: encoding: [0xaf,0xb5,0xc6,0x06]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoadd.d.aqrl a1, a2, (a3)
# CHECK-ASM-AND-OBJ: amoxor.d.aqrl a2, a3, (a4)
# CHECK-ASM: encoding: [0x2f,0x36,0xd7,0x26]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoxor.d.aqrl a2, a3, (a4)
# CHECK-ASM-AND-OBJ: amoand.d.aqrl a3, a4, (a5)
# CHECK-ASM: encoding: [0xaf,0xb6,0xe7,0x66]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoand.d.aqrl a3, a4, (a5)
# CHECK-ASM-AND-OBJ: amoor.d.aqrl a4, a5, (a6)
# CHECK-ASM: encoding: [0x2f,0x37,0xf8,0x46]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amoor.d.aqrl a4, a5, (a6)
# CHECK-ASM-AND-OBJ: amomin.d.aqrl a5, a6, (a7)
# CHECK-ASM: encoding: [0xaf,0xb7,0x08,0x87]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomin.d.aqrl a5, a6, (a7)
# CHECK-ASM-AND-OBJ: amomax.d.aqrl s7, s6, (s5)
# CHECK-ASM: encoding: [0xaf,0xbb,0x6a,0xa7]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomax.d.aqrl s7, s6, (s5)
# CHECK-ASM-AND-OBJ: amominu.d.aqrl s6, s5, (s4)
# CHECK-ASM: encoding: [0x2f,0x3b,0x5a,0xc7]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amominu.d.aqrl s6, s5, (s4)
# CHECK-ASM-AND-OBJ: amomaxu.d.aqrl s5, s4, (s3)
# CHECK-ASM: encoding: [0xaf,0xba,0x49,0xe7]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
amomaxu.d.aqrl s5, s4, (s3)
diff --git a/llvm/test/MC/RISCV/rv64zacas-invalid.s b/llvm/test/MC/RISCV/rv64zacas-invalid.s
index e75ff9e9f94ca0..77039f0be58732 100644
--- a/llvm/test/MC/RISCV/rv64zacas-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zacas-invalid.s
@@ -1,16 +1,16 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+a,+zacas < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+a,+zacas < %s
# Non-zero offsets not supported for the third operand (rs1).
-amocas.w a1, a3, 1(a5) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amocas.d a1, a3, 2(a5) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amocas.q a0, a2, 3(a5) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
+amocas.w a1, a3, 1(a5) # expected-error:18 {{optional integer offset must be 0}}
+amocas.d a1, a3, 2(a5) # expected-error:18 {{optional integer offset must be 0}}
+amocas.q a0, a2, 3(a5) # expected-error:18 {{optional integer offset must be 0}}
# First and second operands (rd and rs2) of amocas.q must be even.
-amocas.q a1, a2, (a1) # CHECK: :[[@LINE]]:10: error: register must be even
-amocas.q a0, a1, (a1) # CHECK: :[[@LINE]]:14: error: register must be even
-amocas.q.aq a1, a2, (a1) # CHECK: :[[@LINE]]:13: error: register must be even
-amocas.q.aq a0, a1, (a1) # CHECK: :[[@LINE]]:17: error: register must be even
-amocas.q.rl a1, a2, (a1) # CHECK: :[[@LINE]]:13: error: register must be even
-amocas.q.rl a0, a1, (a1) # CHECK: :[[@LINE]]:17: error: register must be even
-amocas.q.aqrl a1, a2, (a1) # CHECK: :[[@LINE]]:15: error: register must be even
-amocas.q.aqrl a0, a1, (a1) # CHECK: :[[@LINE]]:19: error: register must be even
+amocas.q a1, a2, (a1) # expected-error:10 {{register must be even}}
+amocas.q a0, a1, (a1) # expected-error:14 {{register must be even}}
+amocas.q.aq a1, a2, (a1) # expected-error:13 {{register must be even}}
+amocas.q.aq a0, a1, (a1) # expected-error:17 {{register must be even}}
+amocas.q.rl a1, a2, (a1) # expected-error:13 {{register must be even}}
+amocas.q.rl a0, a1, (a1) # expected-error:17 {{register must be even}}
+amocas.q.aqrl a1, a2, (a1) # expected-error:15 {{register must be even}}
+amocas.q.aqrl a0, a1, (a1) # expected-error:19 {{register must be even}}
diff --git a/llvm/test/MC/RISCV/rv64zalasr-invalid.s b/llvm/test/MC/RISCV/rv64zalasr-invalid.s
index d289e731dc285e..54b83f683235f9 100644
--- a/llvm/test/MC/RISCV/rv64zalasr-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zalasr-invalid.s
@@ -1,28 +1,28 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zalasr < %s 2>&1 | FileCheck -check-prefixes=CHECK %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zalasr < %s
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
lw. a1, (t0)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
lw.rl t3, 0(t5)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
lh.rlaq t4, (t6)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
sb. a1, (t0)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
sh.aq t3, 0(t5)
-# CHECK: error: unrecognized instruction mnemonic
+# expected-error at +1 {{unrecognized instruction mnemonic}}
sh.rlaq t4, (t6)
-# CHECK: error: optional integer offset must be 0
+# expected-error at +1 {{optional integer offset must be 0}}
lw.aq zero, 1(a0)
-# CHECK: error: optional integer offset must be 0
+# expected-error at +1 {{optional integer offset must be 0}}
sw.rl t1, 2(s0)
-# CHECK: error: optional integer offset must be 0
+# expected-error at +1 {{optional integer offset must be 0}}
sb.aqrl sp, 3(s2)
diff --git a/llvm/test/MC/RISCV/rv64zalasr-valid.s b/llvm/test/MC/RISCV/rv64zalasr-valid.s
index 6613cf3a1c8eeb..4235037d0b7721 100644
--- a/llvm/test/MC/RISCV/rv64zalasr-valid.s
+++ b/llvm/test/MC/RISCV/rv64zalasr-valid.s
@@ -4,28 +4,26 @@
# RUN: | llvm-objdump --mattr=+zalasr -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv64 \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck --check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv64 -M no-aliases -show-encoding < %s
# CHECK-ASM-AND-OBJ: ld.aq t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x33,0x05,0x34]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
ld.aq t1, (a0)
# CHECK-ASM-AND-OBJ: ld.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x33,0x05,0x36]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
ld.aqrl t1, 0(a0)
# CHECK-ASM-AND-OBJ: sd.rl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x30,0x65,0x3a]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sd.rl t1, 0(a0)
# CHECK-ASM-AND-OBJ: sd.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x30,0x65,0x3e]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sd.aqrl t1, (a0)
diff --git a/llvm/test/MC/RISCV/rv64zalrsc-invalid.s b/llvm/test/MC/RISCV/rv64zalrsc-invalid.s
index c9579067d398f2..9f05cb01ba917b 100644
--- a/llvm/test/MC/RISCV/rv64zalrsc-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zalrsc-invalid.s
@@ -1,8 +1,8 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+a < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zalrsc < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+a < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zalrsc < %s
# Final operand must have parentheses
-lr.d a4, a5 # CHECK: :[[@LINE]]:10: error: expected '(' or optional integer offset
+lr.d a4, a5 # expected-error:10 {{expected '(' or optional integer offset}}
# lr only takes two operands
-lr.d s0, (s1), s2 # CHECK: :[[@LINE]]:16: error: unexpected extra operand for instruction
+lr.d s0, (s1), s2 # expected-error:16 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/rv64zalrsc-valid.s b/llvm/test/MC/RISCV/rv64zalrsc-valid.s
index 98ac38dcd53965..1bc38398a0f40c 100644
--- a/llvm/test/MC/RISCV/rv64zalrsc-valid.s
+++ b/llvm/test/MC/RISCV/rv64zalrsc-valid.s
@@ -4,8 +4,7 @@
# RUN: | llvm-objdump --mattr=+a -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+a < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+a < %s
#
# RUN: llvm-mc %s -triple=riscv64 -mattr=+zalrsc -M no-aliases -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
@@ -13,39 +12,38 @@
# RUN: | llvm-objdump --mattr=+zalrsc -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+zalrsc < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zalrsc < %s
# CHECK-ASM-AND-OBJ: lr.d t0, (t1)
# CHECK-ASM: encoding: [0xaf,0x32,0x03,0x10]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lr.d t0, (t1)
# CHECK-ASM-AND-OBJ: lr.d.aq t1, (t2)
# CHECK-ASM: encoding: [0x2f,0xb3,0x03,0x14]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lr.d.aq t1, (t2)
# CHECK-ASM-AND-OBJ: lr.d.rl t2, (t3)
# CHECK-ASM: encoding: [0xaf,0x33,0x0e,0x12]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lr.d.rl t2, (t3)
# CHECK-ASM-AND-OBJ: lr.d.aqrl t3, (t4)
# CHECK-ASM: encoding: [0x2f,0xbe,0x0e,0x16]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lr.d.aqrl t3, (t4)
# CHECK-ASM-AND-OBJ: sc.d t6, t5, (t4)
# CHECK-ASM: encoding: [0xaf,0xbf,0xee,0x19]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
sc.d t6, t5, (t4)
# CHECK-ASM-AND-OBJ: sc.d.aq t5, t4, (t3)
# CHECK-ASM: encoding: [0x2f,0x3f,0xde,0x1d]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
sc.d.aq t5, t4, (t3)
# CHECK-ASM-AND-OBJ: sc.d.rl t4, t3, (t2)
# CHECK-ASM: encoding: [0xaf,0xbe,0xc3,0x1b]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
sc.d.rl t4, t3, (t2)
# CHECK-ASM-AND-OBJ: sc.d.aqrl t3, t2, (t1)
# CHECK-ASM: encoding: [0x2f,0x3e,0x73,0x1e]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
sc.d.aqrl t3, t2, (t1)
diff --git a/llvm/test/MC/RISCV/rv64zba-invalid.s b/llvm/test/MC/RISCV/rv64zba-invalid.s
index 8dbea991950b47..b98b968130bd75 100644
--- a/llvm/test/MC/RISCV/rv64zba-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zba-invalid.s
@@ -1,15 +1,15 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zba < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zba < %s
# Too few operands
-slli.uw t0, t1 # CHECK: :[[@LINE]]:15: error: too few operands for instruction
+slli.uw t0, t1 # expected-error:15 {{too few operands for instruction}}
# Immediate operand out of range
-slli.uw t0, t1, 64 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 63]
-slli.uw t0, t1, -1 # CHECK: :[[@LINE]]:17: error: immediate must be an integer in the range [0, 63]
+slli.uw t0, t1, 64 # expected-error:17 {{immediate must be an integer in the range [0, 63]}}
+slli.uw t0, t1, -1 # expected-error:17 {{immediate must be an integer in the range [0, 63]}}
# Too few operands
-add.uw t0, t1 # CHECK: :[[@LINE]]:14: error: too few operands for instruction
+add.uw t0, t1 # expected-error:14 {{too few operands for instruction}}
# Too few operands
-sh1add.uw t0, t1 # CHECK: :[[@LINE]]:17: error: too few operands for instruction
+sh1add.uw t0, t1 # expected-error:17 {{too few operands for instruction}}
# Too few operands
-sh2add.uw t0, t1 # CHECK: :[[@LINE]]:17: error: too few operands for instruction
+sh2add.uw t0, t1 # expected-error:17 {{too few operands for instruction}}
# Too few operands
-sh3add.uw t0, t1 # CHECK: :[[@LINE]]:17: error: too few operands for instruction
+sh3add.uw t0, t1 # expected-error:17 {{too few operands for instruction}}
diff --git a/llvm/test/MC/RISCV/rv64zbb-invalid.s b/llvm/test/MC/RISCV/rv64zbb-invalid.s
index 0fa27983f09b25..23433aa4d9ed95 100644
--- a/llvm/test/MC/RISCV/rv64zbb-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zbb-invalid.s
@@ -1,19 +1,19 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zbb < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zbb < %s
# Too many operands
-clzw t0, t1, t2 # CHECK: :[[@LINE]]:14: error: unexpected extra operand for instruction
+clzw t0, t1, t2 # expected-error:14 {{unexpected extra operand for instruction}}
# Too many operands
-ctzw t0, t1, t2 # CHECK: :[[@LINE]]:14: error: unexpected extra operand for instruction
+ctzw t0, t1, t2 # expected-error:14 {{unexpected extra operand for instruction}}
# Too many operands
-cpopw t0, t1, t2 # CHECK: :[[@LINE]]:15: error: unexpected extra operand for instruction
+cpopw t0, t1, t2 # expected-error:15 {{unexpected extra operand for instruction}}
# Too few operands
-rolw t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+rolw t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-rorw t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+rorw t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-roriw t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+roriw t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-roriw t0, t1, 32 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-roriw t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 31]
-rori t0, t1, 64 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
-rori t0, t1, -1 # CHECK: :[[@LINE]]:14: error: immediate must be an integer in the range [0, 63]
+roriw t0, t1, 32 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+roriw t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 31]}}
+rori t0, t1, 64 # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
+rori t0, t1, -1 # expected-error:14 {{immediate must be an integer in the range [0, 63]}}
diff --git a/llvm/test/MC/RISCV/rv64zbs-invalid.s b/llvm/test/MC/RISCV/rv64zbs-invalid.s
index 1e5949211b1671..10162c36d929b0 100644
--- a/llvm/test/MC/RISCV/rv64zbs-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zbs-invalid.s
@@ -1,30 +1,30 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zbs < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zbs < %s
# Too few operands
-bclr t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+bclr t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-bset t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+bset t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-binv t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+binv t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-bext t0, t1 # CHECK: :[[@LINE]]:12: error: too few operands for instruction
+bext t0, t1 # expected-error:12 {{too few operands for instruction}}
# Too few operands
-bclri t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+bclri t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-bclri t0, t1, 64 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
-bclri t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
+bclri t0, t1, 64 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
+bclri t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
# Too few operands
-bseti t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+bseti t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-bseti t0, t1, 64 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
-bseti t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
+bseti t0, t1, 64 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
+bseti t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
# Too few operands
-binvi t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+binvi t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-binvi t0, t1, 64 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
-binvi t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
+binvi t0, t1, 64 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
+binvi t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
# Too few operands
-bexti t0, t1 # CHECK: :[[@LINE]]:13: error: too few operands for instruction
+bexti t0, t1 # expected-error:13 {{too few operands for instruction}}
# Immediate operand out of range
-bexti t0, t1, 64 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
-bexti t0, t1, -1 # CHECK: :[[@LINE]]:15: error: immediate must be an integer in the range [0, 63]
+bexti t0, t1, 64 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
+bexti t0, t1, -1 # expected-error:15 {{immediate must be an integer in the range [0, 63]}}
diff --git a/llvm/test/MC/RISCV/rv64zcmp-invalid.s b/llvm/test/MC/RISCV/rv64zcmp-invalid.s
index db8305b72bdff7..3b68b20be7b5af 100644
--- a/llvm/test/MC/RISCV/rv64zcmp-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zcmp-invalid.s
@@ -1,101 +1,100 @@
-# RUN: not llvm-mc -triple=riscv64 -mattr=zcmp -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=zcmp -M no-aliases -show-encoding < %s
-# CHECK-ERROR: :[[@LINE+1]]:11: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:11 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
cm.mvsa01 a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:11: error: rs1 and rs2 must be different
+# expected-error at +1:11 {{rs1 and rs2 must be different}}
cm.mvsa01 s0, s0
-# CHECK-ERROR: :[[@LINE+1]]:11: error: register must be GPR from s0 to s7 (x8, x9 or x18-x23)
+# expected-error at +1:11 {{register must be GPR from s0 to s7 (x8, x9 or x18-x23)}}
cm.mva01s a1, a2
-# CHECK-ERROR: :[[@LINE+1]]:12: error: invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported
+# expected-error at +1:12 {{invalid register list, '{ra, s0-s10}' or '{x1, x8-x9, x18-x26}' is not supported}}
cm.popretz {ra, s0-s10}, 112
-# CHECK-ERROR: :[[@LINE+1]]:25: error: stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]
+# expected-error at +1:25 {{stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]}}
cm.popretz {ra, s0-s1}, 112
-# CHECK-ERROR: :[[@LINE+1]]:15: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:15 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
cm.push {ra}, 16
-# CHECK-ERROR: :[[@LINE+1]]:21: error: stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]
+# expected-error at +1:21 {{stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]}}
cm.pop {ra, s0-s1}, -32
-# CHECK-ERROR: :[[@LINE+1]]:15: error: stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]
+# expected-error at +1:15 {{stack adjustment for register list must be a multiple of 16 bytes in the range [-64, -16]}}
cm.push {ra}, -15
-# CHECK-ERROR: :[[@LINE+1]]:21: error: stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]
+# expected-error at +1:21 {{stack adjustment for register list must be a multiple of 16 bytes in the range [32, 80]}}
cm.pop {ra, s0-s1}, -33
-# CHECK-ERROR: :[[@LINE+1]]:9: error: register list must start from 'ra' or 'x1'
+# expected-error at +1:9 {{register list must start from 'ra' or 'x1'}}
cm.pop {s0}, -40
-# CHECK-ERROR: :[[@LINE+1]]:13: error: register must be 's0'
+# expected-error at +1:13 {{register must be 's0'}}
cm.pop {ra, t1}, -40
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be in the range 's1' to 's11'
+# expected-error at +1:16 {{register must be in the range 's1' to 's11'}}
cm.pop {ra, s0-t1}, -40
-# CHECK-ERROR: :[[@LINE+1]]:20: error: register must be 'x18'
+# expected-error at +1:20 {{register must be 'x18'}}
cm.pop {x1, x8-x9, x28}, -40
-# CHECK-ERROR: :[[@LINE+1]]:24: error: register must be in the range 'x19' to 'x27'
+# expected-error at +1:24 {{register must be in the range 'x19' to 'x27'}}
cm.pop {x1, x8-x9, x18-x28}, -40
-# CHECK-ERROR: :[[@LINE+1]]:24: error: register must be in the range 'x19' to 'x27'
+# expected-error at +1:24 {{register must be in the range 'x19' to 'x27'}}
cm.pop {x1, x8-x9, x18-x17}, -40
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be 'x9'
+# expected-error at +1:16 {{register must be 'x9'}}
cm.pop {x1, x8-f8, x18-x17}, -40
-# CHECK-ERROR: :[[@LINE+1]]:15: error: stack adjustment is invalid for this instruction and register list
+# expected-error at +1:15 {{stack adjustment is invalid for this instruction and register list}}
cm.pop {ra}, -x1
-# CHECK-ERROR: :[[@LINE+1]]:15: error: stack adjustment is invalid for this instruction and register list
+# expected-error at +1:15 {{stack adjustment is invalid for this instruction and register list}}
cm.push {ra}, x1
-# CHECK-ERROR: :[[@LINE+1]]:12: error: register 'x1' cannot start a multiple register range
+# expected-error at +1:12 {{register 'x1' cannot start a multiple register range}}
cm.push {x1-x9}, -32
-# CHECK-ERROR: :[[@LINE+1]]:12: error: register 'ra' cannot start a multiple register range
+# expected-error at +1:12 {{register 'ra' cannot start a multiple register range}}
cm.push {ra-s0}, -32
-# CHECK-ERROR: :[[@LINE+1]]:13: error: register must be 'x8'
+# expected-error at +1:13 {{register must be 'x8'}}
cm.push {x1,s0}, -32
-# CHECK-ERROR: :[[@LINE+1]]:13: error: register must be 's0'
+# expected-error at +1:13 {{register must be 's0'}}
cm.push {ra,x8}, -32
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be 'x9'
+# expected-error at +1:16 {{register must be 'x9'}}
cm.push {x1,x8-s1}, -32
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be in the range 's1' to 's11'
+# expected-error at +1:16 {{register must be in the range 's1' to 's11'}}
cm.push {ra,s0-x9}, -32
-# CHECK-ERROR: :[[@LINE+1]]:16: error: register must be 'x9'
+# expected-error at +1:16 {{register must be 'x9'}}
cm.push {x1,x8-x18}, -32
-# CHECK-ERROR: :[[@LINE+1]]:19: error: register must be 'x18'
+# expected-error at +1:19 {{register must be 'x18'}}
cm.push {x1,x8-x9,s2}, -32
-# CHECK-ERROR: :[[@LINE+1]]:19: error: too many register ranges
+# expected-error at +1:19 {{too many register ranges}}
cm.push {ra,s0-s1,x18}, -32
-# CHECK-ERROR: :[[@LINE+1]]:19: error: too many register ranges
+# expected-error at +1:19 {{too many register ranges}}
cm.push {ra,s0-s1,s2}, -32
-# CHECK-ERROR: :[[@LINE+1]]:23: error: register must be in the range 'x19' to 'x27'
+# expected-error at +1:23 {{register must be in the range 'x19' to 'x27'}}
cm.push {x1,x8-x9,x18-s3}, -32
-# CHECK-ERROR: :[[@LINE+1]]:27: error: too many register ranges
+# expected-error at +1:27 {{too many register ranges}}
cm.push {x1,x8-x9,x18-x19,x20}, -32
-# CHECK-ERROR: :[[@LINE+1]]:19: error: too many register ranges
+# expected-error at +1:19 {{too many register ranges}}
cm.push {ra,s0-s1,s3}, -32
-# CHECK-ERROR: :[[@LINE+1]]:18: error: expected ',' or '}'
+# expected-error at +1:18 {{expected ',' or '}'}}
cm.push {ra,s0-s1-s2}, -32
-# CHECK-ERROR: :[[@LINE+1]]:16: error: expected ',' or '}'
+# expected-error at +1:16 {{expected ',' or '}'}}
cm.push {ra, s0+s11}, -32
diff --git a/llvm/test/MC/RISCV/rv64zdinx-invalid.s b/llvm/test/MC/RISCV/rv64zdinx-invalid.s
index 9d1431bb307927..20bc5188157597 100644
--- a/llvm/test/MC/RISCV/rv64zdinx-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zdinx-invalid.s
@@ -1,15 +1,15 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zdinx %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zdinx %s
# Not support float registers
-fld fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
-ld a0, -2049(a1) # CHECK: :[[@LINE]]:8: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+fld fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
+ld a0, -2049(a1) # expected-error:8 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Invalid instructions
-fsd a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'D' (Double-Precision Floating-Point)
-sd fa4, 64(sp) # CHECK: :[[@LINE]]:4: error: register must be a GPR
-fmv.x.d t2, a2 # CHECK: :[[@LINE]]:1: error: invalid instruction
-fmv.d.x a5, t5 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fsd a5, 12(sp) # expected-error:1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
+sd fa4, 64(sp) # expected-error:4 {{register must be a GPR}}
+fmv.x.d t2, a2 # expected-error:1 {{invalid instruction}}
+fmv.d.x a5, t5 # expected-error:1 {{invalid instruction}}
# FP registers where integer regs are expected
-fcvt.d.l a3, ft3 # CHECK: :[[@LINE]]:14: error: register must be a GPR
-fcvt.d.lu a4, ft4 # CHECK: :[[@LINE]]:15: error: register must be a GPR
+fcvt.d.l a3, ft3 # expected-error:14 {{register must be a GPR}}
+fcvt.d.lu a4, ft4 # expected-error:15 {{register must be a GPR}}
diff --git a/llvm/test/MC/RISCV/rv64zdinx-valid.s b/llvm/test/MC/RISCV/rv64zdinx-valid.s
index 411f42430ac231..1df187bd70e5f7 100644
--- a/llvm/test/MC/RISCV/rv64zdinx-valid.s
+++ b/llvm/test/MC/RISCV/rv64zdinx-valid.s
@@ -4,40 +4,39 @@
# RUN: | llvm-objdump --mattr=+zdinx -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+zdinx %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zdinx %s
# CHECK-ASM-AND-OBJ: fcvt.l.d a0, t0, dyn
# CHECK-ASM: encoding: [0x53,0xf5,0x22,0xc2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.d a0, t0, dyn
# CHECK-ASM-AND-OBJ: fcvt.lu.d a1, t1, dyn
# CHECK-ASM: encoding: [0xd3,0x75,0x33,0xc2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.d a1, t1, dyn
# CHECK-ASM-AND-OBJ: fcvt.d.l t3, a3, dyn
# CHECK-ASM: encoding: [0x53,0xfe,0x26,0xd2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.l t3, a3, dyn
# CHECK-ASM-AND-OBJ: fcvt.d.lu t4, a4, dyn
# CHECK-ASM: encoding: [0xd3,0x7e,0x37,0xd2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.lu t4, a4, dyn
# Rounding modes
# CHECK-ASM-AND-OBJ: fcvt.d.l t3, a3, rne
# CHECK-ASM: encoding: [0x53,0x8e,0x26,0xd2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.l t3, a3, rne
# CHECK-ASM-AND-OBJ: fcvt.d.lu t4, a4, rtz
# CHECK-ASM: encoding: [0xd3,0x1e,0x37,0xd2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.d.lu t4, a4, rtz
# CHECK-ASM-AND-OBJ: fcvt.l.d a0, t0, rdn
# CHECK-ASM: encoding: [0x53,0xa5,0x22,0xc2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.d a0, t0, rdn
# CHECK-ASM-AND-OBJ: fcvt.lu.d a1, t1, rup
# CHECK-ASM: encoding: [0xd3,0x35,0x33,0xc2]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.d a1, t1, rup
diff --git a/llvm/test/MC/RISCV/rv64zfa-only-valid.s b/llvm/test/MC/RISCV/rv64zfa-only-valid.s
index 95fb253b145c1c..d10307df910e51 100644
--- a/llvm/test/MC/RISCV/rv64zfa-only-valid.s
+++ b/llvm/test/MC/RISCV/rv64zfa-only-valid.s
@@ -4,16 +4,14 @@
# RUN: | llvm-objdump --mattr=+zfa,+q,+zfh -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv64 -mattr=+q,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+q,+zfh -M no-aliases -show-encoding < %s
# CHECK-ASM-AND-OBJ: fmvh.x.q a1, fs1
# CHECK-ASM: encoding: [0xd3,0x85,0x14,0xe6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmvh.x.q a1, fs1
# CHECK-ASM-AND-OBJ: fmvp.q.x fs1, a1, a2
# CHECK-ASM: encoding: [0xd3,0x84,0xc5,0xb6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmvp.q.x fs1, a1, a2
diff --git a/llvm/test/MC/RISCV/rv64zfh-invalid.s b/llvm/test/MC/RISCV/rv64zfh-invalid.s
index b2513d47e37279..9935dd0a295bf5 100644
--- a/llvm/test/MC/RISCV/rv64zfh-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zfh-invalid.s
@@ -1,29 +1,28 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfh < %s 2>&1 | \
-# RUN: FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zfh < %s
# Out of range immediates
## simm12
-flh ft1, -2049(a0) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-fsh ft2, 2048(a1) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+flh ft1, -2049(a0) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+fsh ft2, 2048(a1) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Integer registers where FP regs are expected
fcvt.l.h ft0, a0
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:10: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:1: note: instruction requires the following: 'Zhinx' (Half Float in Integer)
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:10 {{register must be a GPR}}
+# expected-note at -3:1 {{instruction requires the following: 'Zhinx' (Half Float in Integer)}}
fcvt.lu.h ft1, a1
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:11: note: register must be a GPR
-# CHECK: :[[@LINE-3]]:1: note: instruction requires the following: 'Zhinx' (Half Float in Integer)
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{register must be a GPR}}
+# expected-note at -3:1 {{instruction requires the following: 'Zhinx' (Half Float in Integer)}}
# FP registers where integer regs are expected
fcvt.h.l a2, ft2
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:10: note: register must be a FPR
-# CHECK: :[[@LINE-3]]:1: note: instruction requires the following: 'Zhinx' (Half Float in Integer)
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:10 {{register must be a FPR}}
+# expected-note at -3:1 {{instruction requires the following: 'Zhinx' (Half Float in Integer)}}
fcvt.h.lu a3, ft3
-# CHECK: :[[@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE-2]]:11: note: register must be a FPR
-# CHECK: :[[@LINE-3]]:1: note: instruction requires the following: 'Zhinx' (Half Float in Integer)
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:11 {{register must be a FPR}}
+# expected-note at -3:1 {{instruction requires the following: 'Zhinx' (Half Float in Integer)}}
diff --git a/llvm/test/MC/RISCV/rv64zfh-valid.s b/llvm/test/MC/RISCV/rv64zfh-valid.s
index 5fb8ba5e66379b..e9d60dfaa09479 100644
--- a/llvm/test/MC/RISCV/rv64zfh-valid.s
+++ b/llvm/test/MC/RISCV/rv64zfh-valid.s
@@ -4,36 +4,35 @@
# RUN: | llvm-objdump --mattr=+zfh -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfh < %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfh < %s
# CHECK-ASM-AND-OBJ: fcvt.l.h a0, ft0, dyn
# CHECK-ASM: encoding: [0x53,0x75,0x20,0xc4]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.h a0, ft0, dyn
# CHECK-ASM-AND-OBJ: fcvt.lu.h a1, ft1, dyn
# CHECK-ASM: encoding: [0xd3,0xf5,0x30,0xc4]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.h a1, ft1, dyn
# CHECK-ASM-AND-OBJ: fcvt.h.l ft2, a2, dyn
# CHECK-ASM: encoding: [0x53,0x71,0x26,0xd4]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.l ft2, a2, dyn
# CHECK-ASM-AND-OBJ: fcvt.h.lu ft3, a3, dyn
# CHECK-ASM: encoding: [0xd3,0xf1,0x36,0xd4]
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.lu ft3, a3, dyn
# Rounding modes
# CHECK-ASM-AND-OBJ: fcvt.l.h a4, ft4, rne
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.h a4, ft4, rne
# CHECK-ASM-AND-OBJ: fcvt.lu.h a5, ft5, rtz
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.h a5, ft5, rtz
# CHECK-ASM-AND-OBJ: fcvt.h.l ft6, a6, rdn
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.l ft6, a6, rdn
# CHECK-ASM-AND-OBJ: fcvt.h.lu ft7, a7, rup
-# CHECK-RV32: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.lu ft7, a7, rup
diff --git a/llvm/test/MC/RISCV/rv64zfinx-invalid.s b/llvm/test/MC/RISCV/rv64zfinx-invalid.s
index a065eedabf39a5..984a64048073a7 100644
--- a/llvm/test/MC/RISCV/rv64zfinx-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zfinx-invalid.s
@@ -1,13 +1,13 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfinx %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zfinx %s
# Not support float registers
-flw fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point){{$}}
+flw fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
# Invalid instructions
-fsw a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'F' (Single-Precision Floating-Point)
-fmv.x.w t2, a2 # CHECK: :[[@LINE]]:1: error: invalid instruction
-fmv.w.x a5, t5 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fsw a5, 12(sp) # expected-error:1 {{instruction requires the following: 'F' (Single-Precision Floating-Point)}}
+fmv.x.w t2, a2 # expected-error:1 {{invalid instruction}}
+fmv.w.x a5, t5 # expected-error:1 {{invalid instruction}}
# FP registers where integer regs are expected
-fcvt.s.l a2, ft2 # CHECK: :[[@LINE]]:14: error: register must be a GPR
-fcvt.s.lu a3, ft3 # CHECK: :[[@LINE]]:15: error: register must be a GPR
+fcvt.s.l a2, ft2 # expected-error:14 {{register must be a GPR}}
+fcvt.s.lu a3, ft3 # expected-error:15 {{register must be a GPR}}
diff --git a/llvm/test/MC/RISCV/rv64zfinx-valid.s b/llvm/test/MC/RISCV/rv64zfinx-valid.s
index 63006e99a0f96e..a3b00639f87242 100644
--- a/llvm/test/MC/RISCV/rv64zfinx-valid.s
+++ b/llvm/test/MC/RISCV/rv64zfinx-valid.s
@@ -4,40 +4,39 @@
# RUN: | llvm-objdump --mattr=+zfinx -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfinx %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfinx %s
# CHECK-ASM-AND-OBJ: fcvt.l.s a0, t0, dyn
# CHECK-ASM: encoding: [0x53,0xf5,0x22,0xc0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.s a0, t0, dyn
# CHECK-ASM-AND-OBJ: fcvt.lu.s a1, t1, dyn
# CHECK-ASM: encoding: [0xd3,0x75,0x33,0xc0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.s a1, t1, dyn
# CHECK-ASM-AND-OBJ: fcvt.s.l t2, a2, dyn
# CHECK-ASM: encoding: [0xd3,0x73,0x26,0xd0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.l t2, a2, dyn
# CHECK-ASM-AND-OBJ: fcvt.s.lu t3, a3, dyn
# CHECK-ASM: encoding: [0x53,0xfe,0x36,0xd0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.lu t3, a3, dyn
# Rounding modes
# CHECK-ASM-AND-OBJ: fcvt.l.s a4, t4, rne
# CHECK-ASM: encoding: [0x53,0x87,0x2e,0xc0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.s a4, t4, rne
# CHECK-ASM-AND-OBJ: fcvt.lu.s a5, t5, rtz
# CHECK-ASM: encoding: [0xd3,0x17,0x3f,0xc0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.s a5, t5, rtz
# CHECK-ASM-AND-OBJ: fcvt.s.l t6, a6, rdn
# CHECK-ASM: encoding: [0xd3,0x2f,0x28,0xd0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.l t6, a6, rdn
# CHECK-ASM-AND-OBJ: fcvt.s.lu s7, a7, rup
# CHECK-ASM: encoding: [0xd3,0xbb,0x38,0xd0]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.s.lu s7, a7, rup
diff --git a/llvm/test/MC/RISCV/rv64zhinx-invalid.s b/llvm/test/MC/RISCV/rv64zhinx-invalid.s
index 87bfcb497d6f15..11fb8667ffc58a 100644
--- a/llvm/test/MC/RISCV/rv64zhinx-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zhinx-invalid.s
@@ -1,13 +1,13 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zhinx %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zhinx %s
# Not support float registers
-flh fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts){{$}}
+flh fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts)}}
# Invalid instructions
-fsh a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts)
-fmv.x.h t2, a2 # CHECK: :[[@LINE]]:1: error: invalid instruction
-fmv.h.x a5, t5 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fsh a5, 12(sp) # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts)}}
+fmv.x.h t2, a2 # expected-error:1 {{invalid instruction}}
+fmv.h.x a5, t5 # expected-error:1 {{invalid instruction}}
# FP registers where integer regs are expected
-fcvt.h.l a2, ft2 # CHECK: :[[@LINE]]:14: error: register must be a GPR
-fcvt.h.lu a3, ft3 # CHECK: :[[@LINE]]:15: error: register must be a GPR
+fcvt.h.l a2, ft2 # expected-error:14 {{register must be a GPR}}
+fcvt.h.lu a3, ft3 # expected-error:15 {{register must be a GPR}}
diff --git a/llvm/test/MC/RISCV/rv64zhinx-valid.s b/llvm/test/MC/RISCV/rv64zhinx-valid.s
index c6aa55946fc6c6..75cd9a2d8478da 100644
--- a/llvm/test/MC/RISCV/rv64zhinx-valid.s
+++ b/llvm/test/MC/RISCV/rv64zhinx-valid.s
@@ -4,40 +4,39 @@
# RUN: | llvm-objdump --mattr=+zhinx -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+zhinx %s 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV32 %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zhinx %s
# CHECK-ASM-AND-OBJ: fcvt.l.h a0, t0, dyn
# CHECK-ASM: encoding: [0x53,0xf5,0x22,0xc4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.h a0, t0, dyn
# CHECK-ASM-AND-OBJ: fcvt.lu.h a1, t1, dyn
# CHECK-ASM: encoding: [0xd3,0x75,0x33,0xc4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.h a1, t1, dyn
# CHECK-ASM-AND-OBJ: fcvt.h.l t2, a2, dyn
# CHECK-ASM: encoding: [0xd3,0x73,0x26,0xd4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.l t2, a2, dyn
# CHECK-ASM-AND-OBJ: fcvt.h.lu t3, a3, dyn
# CHECK-ASM: encoding: [0x53,0xfe,0x36,0xd4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.lu t3, a3, dyn
# Rounding modes
# CHECK-ASM-AND-OBJ: fcvt.l.h a4, t4, rne
# CHECK-ASM: encoding: [0x53,0x87,0x2e,0xc4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.l.h a4, t4, rne
# CHECK-ASM-AND-OBJ: fcvt.lu.h a5, t5, rtz
# CHECK-ASM: encoding: [0xd3,0x17,0x3f,0xc4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.lu.h a5, t5, rtz
# CHECK-ASM-AND-OBJ: fcvt.h.l t6, a6, rdn
# CHECK-ASM: encoding: [0xd3,0x2f,0x28,0xd4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.l t6, a6, rdn
# CHECK-ASM-AND-OBJ: fcvt.h.lu s7, a7, rup
# CHECK-ASM: encoding: [0xd3,0xbb,0x38,0xd4]
-# CHECK-RV32: :[[#@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set{{$}}
+# expected-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
fcvt.h.lu s7, a7, rup
diff --git a/llvm/test/MC/RISCV/rv64zhinxmin-invalid.s b/llvm/test/MC/RISCV/rv64zhinxmin-invalid.s
index 72755f9e052a45..85ce78037cfda3 100644
--- a/llvm/test/MC/RISCV/rv64zhinxmin-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zhinxmin-invalid.s
@@ -1,13 +1,13 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zhinxmin %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zhinxmin %s
# Not support float registers
-flh fa4, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts){{$}}
+flh fa4, 12(sp) # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts)}}
# Invalid instructions
-fsh a5, 12(sp) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts)
-fmv.x.h t2, a2 # CHECK: :[[@LINE]]:1: error: invalid instruction
-fmv.h.x a5, t5 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fsh a5, 12(sp) # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal) or 'Zfbfmin' (Scalar BF16 Converts)}}
+fmv.x.h t2, a2 # expected-error:1 {{invalid instruction}}
+fmv.h.x a5, t5 # expected-error:1 {{invalid instruction}}
# FP registers where integer regs are expected
-fcvt.d.h a0, fa2 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zdinx' (Double in Integer), RV32I Base Instruction Set
-fcvt.h.d a0, fa2 # CHECK: :[[@LINE]]:1: error: invalid instruction
+fcvt.d.h a0, fa2 # expected-error:1 {{instruction requires the following: 'Zdinx' (Double in Integer), RV32I Base Instruction Set}}
+fcvt.h.d a0, fa2 # expected-error:1 {{invalid instruction}}
diff --git a/llvm/test/MC/RISCV/rv64zkne-only-invalid.s b/llvm/test/MC/RISCV/rv64zkne-only-invalid.s
index 5a7331fa0a9bb5..d9362b5b38839a 100644
--- a/llvm/test/MC/RISCV/rv64zkne-only-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zkne-only-invalid.s
@@ -1,17 +1,14 @@
# With Zk extension:
-# RUN: not llvm-mc -triple=riscv64 -mattr=+zk < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+zk < %s
# With Zkn extension:
-# RUN: not llvm-mc -triple=riscv64 -mattr=+zkn < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+zkn < %s
# With Zkne extension:
-# RUN: not llvm-mc -triple=riscv64 -mattr=+zkne < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+zkne < %s
-# CHECK-ERROR: immediate must be an integer in the range [0, 10]
+# expected-error at +1 {{immediate must be an integer in the range [0, 10]}}
aes64ks1i a0, a1, 11
-# CHECK-ERROR: immediate must be an integer in the range [0, 10]
+# expected-error at +1 {{immediate must be an integer in the range [0, 10]}}
aes64ks1i a0, a1, -1
diff --git a/llvm/test/MC/RISCV/rv64zksed-invalid.s b/llvm/test/MC/RISCV/rv64zksed-invalid.s
index 2c55ac461f51fd..b454a4270e19de 100644
--- a/llvm/test/MC/RISCV/rv64zksed-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zksed-invalid.s
@@ -1,13 +1,11 @@
# With Zks extension:
-# RUN: not llvm-mc -triple=riscv64 -mattr=+zks < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+zks < %s
# With Zksed extension:
-# RUN: not llvm-mc -triple=riscv64 -mattr=+zksed < %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+zksed < %s
sm4ed a0, a1, a2, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
sm4ks a0, a1, a2, 8
-# CHECK-ERROR: immediate must be an integer in the range [0, 3]
+# expected-error at -1 {{immediate must be an integer in the range [0, 3]}}
diff --git a/llvm/test/MC/RISCV/rv64zmmul-invalid.s b/llvm/test/MC/RISCV/rv64zmmul-invalid.s
index 3d27ed90ae08b5..d8607671af7a7d 100644
--- a/llvm/test/MC/RISCV/rv64zmmul-invalid.s
+++ b/llvm/test/MC/RISCV/rv64zmmul-invalid.s
@@ -1,14 +1,13 @@
-# RUN: not llvm-mc %s -triple=riscv64 -mattr=+zmmul -M no-aliases 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify %s -triple=riscv64 -mattr=+zmmul -M no-aliases
-# CHECK-ERROR: 5:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
divw tp, t0, t1
-# CHECK-ERROR: 8:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
divuw t2, s0, s2
-# CHECK-ERROR: 11:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
remw a0, a1, a2
-# CHECK-ERROR: 14:1: error: instruction requires the following: 'M' (Integer Multiplication and Division){{$}}
+# expected-error at +1 {{instruction requires the following: 'M' (Integer Multiplication and Division)}}
remuw a3, a4, a5
diff --git a/llvm/test/MC/RISCV/rva-aliases-invalid.s b/llvm/test/MC/RISCV/rva-aliases-invalid.s
index 6d6edd2063819a..5edbf5c49cf062 100644
--- a/llvm/test/MC/RISCV/rva-aliases-invalid.s
+++ b/llvm/test/MC/RISCV/rva-aliases-invalid.s
@@ -1,116 +1,116 @@
-# RUN: not llvm-mc %s -triple=riscv32 2>&1 | FileCheck %s
-# RUN: not llvm-mc %s -triple=riscv64 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify %s -triple=riscv32
+# RUN: llvm-mc --verify %s -triple=riscv64
# The below tests for lr(.w), sc(.w) and amo*(.w), using `0(reg)` are actually
# implemented using a custom parser. These tests ensure the custom parser gives
# good error messages.
-lr.w a1, a0 # CHECK: :[[@LINE]]:10: error: expected '(' or optional integer offset
-lr.w a1, foo # CHECK: :[[@LINE]]:10: error: expected '(' or optional integer offset
-lr.w a1, 1(a0) # CHECK: :[[@LINE]]:10: error: optional integer offset must be 0
-lr.w a1, (foo) # CHECK: :[[@LINE]]:11: error: expected register
-lr.w a1, 0(foo) # CHECK: :[[@LINE]]:12: error: expected register
-lr.w a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-lr.w a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-lr.w a1, 0(a0 # CHECK: :[[@LINE]]:17: error: expected ')'
-lr.w a1, (a0 # CHECK: :[[@LINE]]:17: error: expected ')'
+lr.w a1, a0 # expected-error:10 {{expected '(' or optional integer offset}}
+lr.w a1, foo # expected-error:10 {{expected '(' or optional integer offset}}
+lr.w a1, 1(a0) # expected-error:10 {{optional integer offset must be 0}}
+lr.w a1, (foo) # expected-error:11 {{expected register}}
+lr.w a1, 0(foo) # expected-error:12 {{expected register}}
+lr.w a1, (f0) # expected-error:1 {{invalid instruction}}
+lr.w a1, 0(f0) # expected-error:1 {{invalid instruction}}
+lr.w a1, 0(a0 # expected-error:17 {{expected ')'}}
+lr.w a1, (a0 # expected-error:17 {{expected ')'}}
-sc.w a2, a1, a0 # CHECK: :[[@LINE]]:14: error: expected '(' or optional integer offset
-sc.w a2, a1, foo # CHECK: :[[@LINE]]:14: error: expected '(' or optional integer offset
-sc.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:14: error: optional integer offset must be 0
-sc.w a2, a1, (foo) # CHECK: :[[@LINE]]:15: error: expected register
-sc.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:16: error: expected register
-sc.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-sc.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-sc.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:21: error: expected ')'
-sc.w a2, a1, (a0 # CHECK: :[[@LINE]]:21: error: expected ')'
+sc.w a2, a1, a0 # expected-error:14 {{expected '(' or optional integer offset}}
+sc.w a2, a1, foo # expected-error:14 {{expected '(' or optional integer offset}}
+sc.w a2, a1, 1(a0) # expected-error:14 {{optional integer offset must be 0}}
+sc.w a2, a1, (foo) # expected-error:15 {{expected register}}
+sc.w a2, a1, 0(foo) # expected-error:16 {{expected register}}
+sc.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+sc.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+sc.w a2, a1, 0(a0 # expected-error:21 {{expected ')'}}
+sc.w a2, a1, (a0 # expected-error:21 {{expected ')'}}
-amoswap.w a2, a1, a0 # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amoswap.w a2, a1, foo # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amoswap.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:19: error: optional integer offset must be 0
-amoswap.w a2, a1, (foo) # CHECK: :[[@LINE]]:20: error: expected register
-amoswap.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:21: error: expected register
-amoswap.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoswap.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoswap.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:26: error: expected ')'
-amoswap.w a2, a1, (a0 # CHECK: :[[@LINE]]:26: error: expected ')'
+amoswap.w a2, a1, a0 # expected-error:19 {{expected '(' or optional integer offset}}
+amoswap.w a2, a1, foo # expected-error:19 {{expected '(' or optional integer offset}}
+amoswap.w a2, a1, 1(a0) # expected-error:19 {{optional integer offset must be 0}}
+amoswap.w a2, a1, (foo) # expected-error:20 {{expected register}}
+amoswap.w a2, a1, 0(foo) # expected-error:21 {{expected register}}
+amoswap.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amoswap.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amoswap.w a2, a1, 0(a0 # expected-error:26 {{expected ')'}}
+amoswap.w a2, a1, (a0 # expected-error:26 {{expected ')'}}
-amoadd.w a2, a1, a0 # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amoadd.w a2, a1, foo # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amoadd.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amoadd.w a2, a1, (foo) # CHECK: :[[@LINE]]:19: error: expected register
-amoadd.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:20: error: expected register
-amoadd.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoadd.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoadd.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:25: error: expected ')'
-amoadd.w a2, a1, (a0 # CHECK: :[[@LINE]]:25: error: expected ')'
+amoadd.w a2, a1, a0 # expected-error:18 {{expected '(' or optional integer offset}}
+amoadd.w a2, a1, foo # expected-error:18 {{expected '(' or optional integer offset}}
+amoadd.w a2, a1, 1(a0) # expected-error:18 {{optional integer offset must be 0}}
+amoadd.w a2, a1, (foo) # expected-error:19 {{expected register}}
+amoadd.w a2, a1, 0(foo) # expected-error:20 {{expected register}}
+amoadd.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amoadd.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amoadd.w a2, a1, 0(a0 # expected-error:25 {{expected ')'}}
+amoadd.w a2, a1, (a0 # expected-error:25 {{expected ')'}}
-amoxor.w a2, a1, a0 # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amoxor.w a2, a1, foo # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amoxor.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amoxor.w a2, a1, (foo) # CHECK: :[[@LINE]]:19: error: expected register
-amoxor.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:20: error: expected register
-amoxor.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoxor.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoxor.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:25: error: expected ')'
-amoxor.w a2, a1, (a0 # CHECK: :[[@LINE]]:25: error: expected ')'
+amoxor.w a2, a1, a0 # expected-error:18 {{expected '(' or optional integer offset}}
+amoxor.w a2, a1, foo # expected-error:18 {{expected '(' or optional integer offset}}
+amoxor.w a2, a1, 1(a0) # expected-error:18 {{optional integer offset must be 0}}
+amoxor.w a2, a1, (foo) # expected-error:19 {{expected register}}
+amoxor.w a2, a1, 0(foo) # expected-error:20 {{expected register}}
+amoxor.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amoxor.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amoxor.w a2, a1, 0(a0 # expected-error:25 {{expected ')'}}
+amoxor.w a2, a1, (a0 # expected-error:25 {{expected ')'}}
-amoand.w a2, a1, a0 # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amoand.w a2, a1, foo # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amoand.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amoand.w a2, a1, (foo) # CHECK: :[[@LINE]]:19: error: expected register
-amoand.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:20: error: expected register
-amoand.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoand.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoand.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:25: error: expected ')'
-amoand.w a2, a1, (a0 # CHECK: :[[@LINE]]:25: error: expected ')'
+amoand.w a2, a1, a0 # expected-error:18 {{expected '(' or optional integer offset}}
+amoand.w a2, a1, foo # expected-error:18 {{expected '(' or optional integer offset}}
+amoand.w a2, a1, 1(a0) # expected-error:18 {{optional integer offset must be 0}}
+amoand.w a2, a1, (foo) # expected-error:19 {{expected register}}
+amoand.w a2, a1, 0(foo) # expected-error:20 {{expected register}}
+amoand.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amoand.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amoand.w a2, a1, 0(a0 # expected-error:25 {{expected ')'}}
+amoand.w a2, a1, (a0 # expected-error:25 {{expected ')'}}
-amoor.w a2, a1, a0 # CHECK: :[[@LINE]]:17: error: expected '(' or optional integer offset
-amoor.w a2, a1, foo # CHECK: :[[@LINE]]:17: error: expected '(' or optional integer offset
-amoor.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:17: error: optional integer offset must be 0
-amoor.w a2, a1, (foo) # CHECK: :[[@LINE]]:18: error: expected register
-amoor.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:19: error: expected register
-amoor.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoor.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amoor.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:24: error: expected ')'
-amoor.w a2, a1, (a0 # CHECK: :[[@LINE]]:24: error: expected ')'
+amoor.w a2, a1, a0 # expected-error:17 {{expected '(' or optional integer offset}}
+amoor.w a2, a1, foo # expected-error:17 {{expected '(' or optional integer offset}}
+amoor.w a2, a1, 1(a0) # expected-error:17 {{optional integer offset must be 0}}
+amoor.w a2, a1, (foo) # expected-error:18 {{expected register}}
+amoor.w a2, a1, 0(foo) # expected-error:19 {{expected register}}
+amoor.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amoor.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amoor.w a2, a1, 0(a0 # expected-error:24 {{expected ')'}}
+amoor.w a2, a1, (a0 # expected-error:24 {{expected ')'}}
-amomin.w a2, a1, a0 # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amomin.w a2, a1, foo # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amomin.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amomin.w a2, a1, (foo) # CHECK: :[[@LINE]]:19: error: expected register
-amomin.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:20: error: expected register
-amomin.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amomin.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amomin.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:25: error: expected ')'
-amomin.w a2, a1, (a0 # CHECK: :[[@LINE]]:25: error: expected ')'
+amomin.w a2, a1, a0 # expected-error:18 {{expected '(' or optional integer offset}}
+amomin.w a2, a1, foo # expected-error:18 {{expected '(' or optional integer offset}}
+amomin.w a2, a1, 1(a0) # expected-error:18 {{optional integer offset must be 0}}
+amomin.w a2, a1, (foo) # expected-error:19 {{expected register}}
+amomin.w a2, a1, 0(foo) # expected-error:20 {{expected register}}
+amomin.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amomin.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amomin.w a2, a1, 0(a0 # expected-error:25 {{expected ')'}}
+amomin.w a2, a1, (a0 # expected-error:25 {{expected ')'}}
-amomax.w a2, a1, a0 # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amomax.w a2, a1, foo # CHECK: :[[@LINE]]:18: error: expected '(' or optional integer offset
-amomax.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amomax.w a2, a1, (foo) # CHECK: :[[@LINE]]:19: error: expected register
-amomax.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:20: error: expected register
-amomax.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amomax.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amomax.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:25: error: expected ')'
-amomax.w a2, a1, (a0 # CHECK: :[[@LINE]]:25: error: expected ')'
+amomax.w a2, a1, a0 # expected-error:18 {{expected '(' or optional integer offset}}
+amomax.w a2, a1, foo # expected-error:18 {{expected '(' or optional integer offset}}
+amomax.w a2, a1, 1(a0) # expected-error:18 {{optional integer offset must be 0}}
+amomax.w a2, a1, (foo) # expected-error:19 {{expected register}}
+amomax.w a2, a1, 0(foo) # expected-error:20 {{expected register}}
+amomax.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amomax.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amomax.w a2, a1, 0(a0 # expected-error:25 {{expected ')'}}
+amomax.w a2, a1, (a0 # expected-error:25 {{expected ')'}}
-amominu.w a2, a1, a0 # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amominu.w a2, a1, foo # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amominu.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:19: error: optional integer offset must be 0
-amominu.w a2, a1, (foo) # CHECK: :[[@LINE]]:20: error: expected register
-amominu.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:21: error: expected register
-amominu.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amominu.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amominu.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:26: error: expected ')'
-amominu.w a2, a1, (a0 # CHECK: :[[@LINE]]:26: error: expected ')'
+amominu.w a2, a1, a0 # expected-error:19 {{expected '(' or optional integer offset}}
+amominu.w a2, a1, foo # expected-error:19 {{expected '(' or optional integer offset}}
+amominu.w a2, a1, 1(a0) # expected-error:19 {{optional integer offset must be 0}}
+amominu.w a2, a1, (foo) # expected-error:20 {{expected register}}
+amominu.w a2, a1, 0(foo) # expected-error:21 {{expected register}}
+amominu.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amominu.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amominu.w a2, a1, 0(a0 # expected-error:26 {{expected ')'}}
+amominu.w a2, a1, (a0 # expected-error:26 {{expected ')'}}
-amomaxu.w a2, a1, a0 # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amomaxu.w a2, a1, foo # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amomaxu.w a2, a1, 1(a0) # CHECK: :[[@LINE]]:19: error: optional integer offset must be 0
-amomaxu.w a2, a1, (foo) # CHECK: :[[@LINE]]:20: error: expected register
-amomaxu.w a2, a1, 0(foo) # CHECK: :[[@LINE]]:21: error: expected register
-amomaxu.w a2, a1, (f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amomaxu.w a2, a1, 0(f0) # CHECK: :[[@LINE]]:1: error: invalid instruction
-amomaxu.w a2, a1, 0(a0 # CHECK: :[[@LINE]]:26: error: expected ')'
-amomaxu.w a2, a1, (a0 # CHECK: :[[@LINE]]:26: error: expected ')'
+amomaxu.w a2, a1, a0 # expected-error:19 {{expected '(' or optional integer offset}}
+amomaxu.w a2, a1, foo # expected-error:19 {{expected '(' or optional integer offset}}
+amomaxu.w a2, a1, 1(a0) # expected-error:19 {{optional integer offset must be 0}}
+amomaxu.w a2, a1, (foo) # expected-error:20 {{expected register}}
+amomaxu.w a2, a1, 0(foo) # expected-error:21 {{expected register}}
+amomaxu.w a2, a1, (f0) # expected-error:1 {{invalid instruction}}
+amomaxu.w a2, a1, 0(f0) # expected-error:1 {{invalid instruction}}
+amomaxu.w a2, a1, 0(a0 # expected-error:26 {{expected ')'}}
+amomaxu.w a2, a1, (a0 # expected-error:26 {{expected ')'}}
diff --git a/llvm/test/MC/RISCV/rvc-hints-invalid.s b/llvm/test/MC/RISCV/rvc-hints-invalid.s
index acef8123db6ccb..57f273aec54d8b 100644
--- a/llvm/test/MC/RISCV/rvc-hints-invalid.s
+++ b/llvm/test/MC/RISCV/rvc-hints-invalid.s
@@ -1,33 +1,31 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+c < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK,CHECK-RV32 %s --implicit-check-not="error:"
-# RUN: not llvm-mc -triple=riscv64 -mattr=+c < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK %s --implicit-check-not="error:"
+# RUN: llvm-mc --verify=expected,rv32 -triple=riscv32 -mattr=+c < %s
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+c < %s
c.nop 0
-# CHECK: :[[#@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[#@LINE-2]]:7: note: unexpected extra operand for instruction
-# CHECK: :[[#@LINE-3]]:7: note: immediate must be non-zero in the range [-32, 31]
+# expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:7 {{unexpected extra operand for instruction}}
+# expected-note at -3:7 {{immediate must be non-zero in the range [-32, 31]}}
c.addi x0, 33
-# CHECK: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:12 {{immediate must be an integer in the range [-32, 31]}}
c.li x0, 42
-# CHECK: :[[#@LINE-1]]:10: error: immediate must be an integer in the range [-32, 31]
+# expected-error at -1:10 {{immediate must be an integer in the range [-32, 31]}}
c.lui x0, 0
-# CHECK: :[[#@LINE-1]]:11: error: immediate must be in [0xfffe0, 0xfffff] or [1, 31]
+# expected-error at -1:11 {{immediate must be in [0xfffe0, 0xfffff] or [1, 31]}}
c.mv x0, x0
-# CHECK: :[[#@LINE-1]]:10: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:10 {{register must be a GPR excluding zero (x0)}}
c.add x0, x0
-# CHECK: :[[#@LINE-1]]:11: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:11 {{register must be a GPR excluding zero (x0)}}
c.slli x0, 32
-# CHECK-RV32: :[[#@LINE-1]]:12: error: immediate must be an integer in the range [0, 31]
+# rv32-error at -1:12 {{immediate must be an integer in the range [0, 31]}}
c.srli64 x30
-# CHECK: :[[#@LINE-1]]:10: error: register must be a GPR from x8 to x15
+# expected-error at -1:10 {{register must be a GPR from x8 to x15}}
c.srai64 x31
-# CHECK: :[[#@LINE-1]]:10: error: register must be a GPR from x8 to x15
+# expected-error at -1:10 {{register must be a GPR from x8 to x15}}
diff --git a/llvm/test/MC/RISCV/rve-invalid.s b/llvm/test/MC/RISCV/rve-invalid.s
index dfa8136a32597b..5cbd64bba635bc 100644
--- a/llvm/test/MC/RISCV/rve-invalid.s
+++ b/llvm/test/MC/RISCV/rve-invalid.s
@@ -1,8 +1,8 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+e,+zca < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+e,+zca < %s
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+zca < %s \
# RUN: | llvm-objdump --mattr=+e,+zca -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefix=CHECK-DIS %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+e,+zca < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+e,+zca < %s
# RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+zca < %s \
# RUN: | llvm-objdump --mattr=+e,+zca -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefix=CHECK-DIS %s
@@ -13,112 +13,112 @@
.option push
.option exact
# CHECK-DIS: 00001837 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x16, 1
# CHECK-DIS: 000028b7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x17, 2
# CHECK-DIS: 00003937 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x18, 3
# CHECK-DIS: 000049b7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x19, 4
# CHECK-DIS: 00005a37 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x20, 5
# CHECK-DIS: 00006ab7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x21, 6
# CHECK-DIS: 00007b37 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x22, 7
# CHECK-DIS: 00008bb7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x23, 8
# CHECK-DIS: 00009c37 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x24, 9
# CHECK-DIS: 0000acb7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x25, 10
# CHECK-DIS: 0000bd37 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x26, 11
# CHECK-DIS: 0000cdb7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x27, 12
# CHECK-DIS: 0000de37 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x28, 13
# CHECK-DIS: 0000eeb7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x29, 14
# CHECK-DIS: 0000ff37 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x30, 15
# CHECK-DIS: 00010fb7 <unknown>
-# CHECK: :[[@LINE+1]]:5: error: register must be a GPR
+# expected-error at +1:5 {{register must be a GPR}}
lui x31, 16
# CHECK-DIS: 00011817 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc a6, 17
# CHECK-DIS: 00012897 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc a7, 18
# CHECK-DIS: 00013917 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s2, 19
# CHECK-DIS: 00014997 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s3, 20
# CHECK-DIS: 00015a17 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s4, 21
# CHECK-DIS: 00016a97 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s5, 22
# CHECK-DIS: 00017b17 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s6, 23
# CHECK-DIS: 00018b97 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s7, 24
# CHECK-DIS: 00019c17 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s8, 25
# CHECK-DIS: 0001ac97 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s9, 26
# CHECK-DIS: 0001bd17 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s10, 27
# CHECK-DIS: 0001cd97 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc s11, 28
# CHECK-DIS: 0001de17 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc t3, 29
# CHECK-DIS: 0001ee97 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc t4, 30
# CHECK-DIS: 0001ff17 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc t5, 31
# CHECK-DIS: 00020f97 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
auipc t6, 32
.option pop
# CHECK-DIS: 0f81 <unknown>
-# CHECK: :[[@LINE+3]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK: :[[@LINE+2]]:8: note: register must be zero (x0)
-# CHECK: :[[@LINE+1]]:8: note: register must be a GPR excluding zero (x0)
+# expected-error at +3:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at +2:8 {{register must be zero (x0)}}
+# expected-note at +1:8 {{register must be a GPR excluding zero (x0)}}
c.addi x31, 0
# CHECK-DIS: 9846 <unknown>
-# CHECK: :[[@LINE+1]]:7: error: register must be a GPR
+# expected-error at +1:7 {{register must be a GPR}}
c.add x16, x17
# CHECK-DIS: 8046 <unknown>
-# CHECK: :[[@LINE+1]]:10: error: register must be a GPR excluding zero (x0)
+# expected-error at +1:10 {{register must be a GPR excluding zero (x0)}}
c.mv x0, x17
diff --git a/llvm/test/MC/RISCV/rvi-pseudos-invalid.s b/llvm/test/MC/RISCV/rvi-pseudos-invalid.s
index ffb1c0d70d5db9..688aecab8c80a0 100644
--- a/llvm/test/MC/RISCV/rvi-pseudos-invalid.s
+++ b/llvm/test/MC/RISCV/rvi-pseudos-invalid.s
@@ -1,67 +1,67 @@
-# RUN: not llvm-mc -triple=riscv32 < %s 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-RV32 %s --implicit-check-not=error:
-# RUN: not llvm-mc -triple=riscv64 < %s 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-RV64 %s --implicit-check-not=error:
+# RUN: llvm-mc --verify=expected,rv32 -triple=riscv32 < %s
+# RUN: llvm-mc --verify=expected,rv64 -triple=riscv64 < %s
lga x1, 1234
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %pcrel_hi(1234)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %pcrel_lo(1234)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %pcrel_hi(foo)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %pcrel_lo(foo)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %hi(1234)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %lo(1234)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %hi(foo)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
lga x1, %lo(foo)
-# CHECK: :[[#@LINE-1]]:9: error: operand must be a bare symbol name
+# expected-error at -1:9 {{operand must be a bare symbol name}}
sw a2, %hi(a_symbol), a3
-# CHECK-RV32: :[[@LINE-1]]:8: error: operand must be a bare symbol name
-# CHECK-RV64: :[[@LINE-2]]:8: error: operand must be a bare symbol name
+# rv32-error at -1:8 {{operand must be a bare symbol name}}
+# rv64-error at -2:8 {{operand must be a bare symbol name}}
sw a2, %lo(a_symbol), a3
-# CHECK: :[[#@LINE-1]]:8: error: operand must be a bare symbol name
+# expected-error at -1:8 {{operand must be a bare symbol name}}
sw a2, %lo(a_symbol)(a4), a3
-# CHECK: :[[#@LINE-1]]:27: error: expected '%' relocation specifier
+# expected-error at -1:27 {{expected '%' relocation specifier}}
# Too few operands must be rejected
sw a2, a_symbol
-# CHECK: :[[#@LINE-1]]:16: error: too few operands for instruction
+# expected-error at -1:16 {{too few operands for instruction}}
# Zero register as the destination/temporary for load/store pseudos is illegal
# since that would result in the auipc result being ignored.
lb x0, a_symbol
-# CHECK: :[[#@LINE-1]]:4: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:4 {{register must be a GPR excluding zero (x0)}}
lbu x0, a_symbol
-# CHECK: :[[#@LINE-1]]:5: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:5 {{register must be a GPR excluding zero (x0)}}
lh x0, a_symbol
-# CHECK: :[[#@LINE-1]]:4: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:4 {{register must be a GPR excluding zero (x0)}}
lhu x0, a_symbol
-# CHECK: :[[#@LINE-1]]:5: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:5 {{register must be a GPR excluding zero (x0)}}
lw x0, a_symbol
-# CHECK: :[[#@LINE-1]]:4: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:4 {{register must be a GPR excluding zero (x0)}}
lwu x0, a_symbol
-# CHECK-RV32: :[[#@LINE-1]]:1: error: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV64: :[[#@LINE-2]]:5: error: register must be a GPR excluding zero (x0)
+# rv32-error at -1:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv64-error at -2:5 {{register must be a GPR excluding zero (x0)}}
ld x0, a_symbol
-# CHECK-RV32: :[[#@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV32: :[[#@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV32: :[[#@LINE-3]]:1: note: instruction requires the following: 'Zilsd' (Load/Store pair instructions)
-# CHECK-RV64: :[[#@LINE-4]]:4: error: register must be a GPR excluding zero (x0)
+# rv32-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# rv32-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv32-note at -3:1 {{instruction requires the following: 'Zilsd' (Load/Store pair instructions)}}
+# rv64-error at -4:4 {{register must be a GPR excluding zero (x0)}}
sb a2, a_symbol, x0
-# CHECK: :[[#@LINE-1]]:18: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:18 {{register must be a GPR excluding zero (x0)}}
sh a2, a_symbol, x0
-# CHECK: :[[#@LINE-1]]:18: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:18 {{register must be a GPR excluding zero (x0)}}
sw a2, a_symbol, x0
-# CHECK: :[[#@LINE-1]]:18: error: register must be a GPR excluding zero (x0)
+# expected-error at -1:18 {{register must be a GPR excluding zero (x0)}}
sd a2, a_symbol, x0
-# CHECK-RV32: :[[#@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV32: :[[#@LINE-2]]:1: note: instruction requires the following: RV64I Base Instruction Set
-# CHECK-RV32: :[[#@LINE-3]]:1: note: instruction requires the following: 'Zilsd' (Load/Store pair instructions)
-# CHECK-RV64: :[[#@LINE-4]]:18: error: register must be a GPR excluding zero (x0)
+# rv32-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+# rv32-note at -2:1 {{instruction requires the following: RV64I Base Instruction Set}}
+# rv32-note at -3:1 {{instruction requires the following: 'Zilsd' (Load/Store pair instructions)}}
+# rv64-error at -4:18 {{register must be a GPR excluding zero (x0)}}
diff --git a/llvm/test/MC/RISCV/rvq-zfhmin-invalid.s b/llvm/test/MC/RISCV/rvq-zfhmin-invalid.s
index fc5664cb9798d9..b94159587e7285 100644
--- a/llvm/test/MC/RISCV/rvq-zfhmin-invalid.s
+++ b/llvm/test/MC/RISCV/rvq-zfhmin-invalid.s
@@ -1,12 +1,10 @@
-# RUN: not llvm-mc -triple=riscv64 -mattr=+q < %s 2>&1 \
-# RUN: | FileCheck --check-prefix=CHECK-NO-ZFHMIN %s
-# RUN: not llvm-mc -triple=riscv64 -mattr=+zfhmin < %s 2>&1 \
-# RUN: | FileCheck --check-prefix=CHECK-NO-Q %s
+# RUN: llvm-mc --verify=no-zfhmin -triple=riscv64 -mattr=+q < %s
+# RUN: llvm-mc --verify=no-q -triple=riscv64 -mattr=+zfhmin < %s
-# CHECK-NO-ZFHMIN: :[[@LINE+2]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal){{$}}
-# CHECK-NO-Q: :[[@LINE+1]]:1: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# no-zfhmin-error at +2:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+# no-q-error at +1:1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fcvt.q.h fa0, ft0
-# CHECK-NO-ZFHMIN: :[[@LINE+2]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal){{$}}
-# CHECK-NO-Q: :[[@LINE+1]]:1: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# no-zfhmin-error at +2:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+# no-q-error at +1:1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fcvt.h.q ft2, fa2
diff --git a/llvm/test/MC/RISCV/rvv/add.s b/llvm/test/MC/RISCV/rvv/add.s
index dd820e5af8587b..9de330748c0a02 100644
--- a/llvm/test/MC/RISCV/rvv/add.s
+++ b/llvm/test/MC/RISCV/rvv/add.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,294 +8,294 @@
vadd.vv v8, v4, v20, v0.t
# CHECK-INST: vadd.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadd.vv v8, v4, v20
# CHECK-INST: vadd.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadd.vx v8, v4, a0, v0.t
# CHECK-INST: vadd.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadd.vx v8, v4, a0
# CHECK-INST: vadd.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadd.vi v8, v4, 15, v0.t
# CHECK-INST: vadd.vi v8, v4, 15, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadd.vi v8, v4, 15
# CHECK-INST: vadd.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.vv v8, v4, v20, v0.t
# CHECK-INST: vwaddu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.vv v8, v4, v20
# CHECK-INST: vwaddu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.vx v8, v4, a0, v0.t
# CHECK-INST: vwaddu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.vx v8, v4, a0
# CHECK-INST: vwaddu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.vv v8, v4, v20, v0.t
# CHECK-INST: vwadd.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.vv v8, v4, v20
# CHECK-INST: vwadd.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.vx v8, v4, a0, v0.t
# CHECK-INST: vwadd.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.vx v8, v4, a0
# CHECK-INST: vwadd.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.wv v8, v4, v20, v0.t
# CHECK-INST: vwaddu.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xd0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.wv v8, v4, v20
# CHECK-INST: vwaddu.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xd2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.wx v8, v4, a0, v0.t
# CHECK-INST: vwaddu.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xd0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwaddu.wx v8, v4, a0
# CHECK-INST: vwaddu.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xd2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.wv v8, v4, v20, v0.t
# CHECK-INST: vwadd.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xd4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.wv v8, v4, v20
# CHECK-INST: vwadd.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xd6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.wx v8, v4, a0, v0.t
# CHECK-INST: vwadd.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xd4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwadd.wx v8, v4, a0
# CHECK-INST: vwadd.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xd6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadc.vvm v8, v4, v20, v0
# CHECK-INST: vadc.vvm v8, v4, v20, v0
# CHECK-ENCODING: [0x57,0x04,0x4a,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadc.vvm v4, v4, v20, v0
# CHECK-INST: vadc.vvm v4, v4, v20, v0
# CHECK-ENCODING: [0x57,0x02,0x4a,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadc.vvm v8, v4, v8, v0
# CHECK-INST: vadc.vvm v8, v4, v8, v0
# CHECK-ENCODING: [0x57,0x04,0x44,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadc.vxm v8, v4, a0, v0
# CHECK-INST: vadc.vxm v8, v4, a0, v0
# CHECK-ENCODING: [0x57,0x44,0x45,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vadc.vim v8, v4, 15, v0
# CHECK-INST: vadc.vim v8, v4, 15, v0
# CHECK-ENCODING: [0x57,0xb4,0x47,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vvm v8, v4, v20, v0
# CHECK-INST: vmadc.vvm v8, v4, v20, v0
# CHECK-ENCODING: [0x57,0x04,0x4a,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vvm v4, v4, v20, v0
# CHECK-INST: vmadc.vvm v4, v4, v20, v0
# CHECK-ENCODING: [0x57,0x02,0x4a,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vvm v8, v4, v8, v0
# CHECK-INST: vmadc.vvm v8, v4, v8, v0
# CHECK-ENCODING: [0x57,0x04,0x44,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vxm v8, v4, a0, v0
# CHECK-INST: vmadc.vxm v8, v4, a0, v0
# CHECK-ENCODING: [0x57,0x44,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vim v8, v4, 15, v0
# CHECK-INST: vmadc.vim v8, v4, 15, v0
# CHECK-ENCODING: [0x57,0xb4,0x47,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vv v8, v4, v20
# CHECK-INST: vmadc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vx v8, v4, a0
# CHECK-INST: vmadc.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadc.vi v8, v4, 15
# CHECK-INST: vmadc.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsaddu.vv v8, v4, v20, v0.t
# CHECK-INST: vsaddu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsaddu.vv v8, v4, v20
# CHECK-INST: vsaddu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsaddu.vx v8, v4, a0, v0.t
# CHECK-INST: vsaddu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsaddu.vx v8, v4, a0
# CHECK-INST: vsaddu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsaddu.vi v8, v4, 15, v0.t
# CHECK-INST: vsaddu.vi v8, v4, 15, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsaddu.vi v8, v4, 15
# CHECK-INST: vsaddu.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsadd.vv v8, v4, v20, v0.t
# CHECK-INST: vsadd.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsadd.vv v8, v4, v20
# CHECK-INST: vsadd.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsadd.vx v8, v4, a0, v0.t
# CHECK-INST: vsadd.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsadd.vx v8, v4, a0
# CHECK-INST: vsadd.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsadd.vi v8, v4, 15, v0.t
# CHECK-INST: vsadd.vi v8, v4, 15, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsadd.vi v8, v4, 15
# CHECK-INST: vsadd.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaadd.vv v8, v4, v20, v0.t
# CHECK-INST: vaadd.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaadd.vv v8, v4, v20
# CHECK-INST: vaadd.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaadd.vx v8, v4, a0, v0.t
# CHECK-INST: vaadd.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaadd.vx v8, v4, a0
# CHECK-INST: vaadd.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaaddu.vv v8, v4, v20, v0.t
# CHECK-INST: vaaddu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaaddu.vv v8, v4, v20
# CHECK-INST: vaaddu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaaddu.vx v8, v4, a0, v0.t
# CHECK-INST: vaaddu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vaaddu.vx v8, v4, a0
# CHECK-INST: vaaddu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwcvt.x.x.v v8, v4, v0.t
# CHECK-INST: vwcvt.x.x.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x40,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwcvt.x.x.v v8, v4
# CHECK-INST: vwcvt.x.x.v v8, v4
# CHECK-ENCODING: [0x57,0x64,0x40,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwcvtu.x.x.v v8, v4, v0.t
# CHECK-INST: vwcvtu.x.x.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x40,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwcvtu.x.x.v v8, v4
# CHECK-INST: vwcvtu.x.x.v v8, v4
# CHECK-ENCODING: [0x57,0x64,0x40,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/and.s b/llvm/test/MC/RISCV/rvv/and.s
index 596fa050ac4af7..f6a7d35ba560fd 100644
--- a/llvm/test/MC/RISCV/rvv/and.s
+++ b/llvm/test/MC/RISCV/rvv/and.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,29 +8,29 @@
vand.vv v8, v4, v20, v0.t
# CHECK-INST: vand.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vand.vv v8, v4, v20
# CHECK-INST: vand.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vand.vx v8, v4, a0, v0.t
# CHECK-INST: vand.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vand.vx v8, v4, a0
# CHECK-INST: vand.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vand.vi v8, v4, 15, v0.t
# CHECK-INST: vand.vi v8, v4, 15, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vand.vi v8, v4, 15
# CHECK-INST: vand.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/clip.s b/llvm/test/MC/RISCV/rvv/clip.s
index ed9b262626da50..c314d353efcbb2 100644
--- a/llvm/test/MC/RISCV/rvv/clip.s
+++ b/llvm/test/MC/RISCV/rvv/clip.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,59 +8,59 @@
vnclipu.wv v8, v4, v20, v0.t
# CHECK-INST: vnclipu.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xb8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclipu.wv v8, v4, v20
# CHECK-INST: vnclipu.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xba]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclipu.wx v8, v4, a0, v0.t
# CHECK-INST: vnclipu.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xb8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclipu.wx v8, v4, a0
# CHECK-INST: vnclipu.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xba]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclipu.wi v8, v4, 31, v0.t
# CHECK-INST: vnclipu.wi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xb8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclipu.wi v8, v4, 31
# CHECK-INST: vnclipu.wi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xba]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclip.wv v8, v4, v20, v0.t
# CHECK-INST: vnclip.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xbc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclip.wv v8, v4, v20
# CHECK-INST: vnclip.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xbe]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclip.wx v8, v4, a0, v0.t
# CHECK-INST: vnclip.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xbc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclip.wx v8, v4, a0
# CHECK-INST: vnclip.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xbe]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclip.wi v8, v4, 31, v0.t
# CHECK-INST: vnclip.wi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xbc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnclip.wi v8, v4, 31
# CHECK-INST: vnclip.wi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xbe]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/compare.s b/llvm/test/MC/RISCV/rvv/compare.s
index daaf262fddf22a..68abde4d8bc79d 100644
--- a/llvm/test/MC/RISCV/rvv/compare.s
+++ b/llvm/test/MC/RISCV/rvv/compare.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,356 +8,356 @@
vmslt.vv v0, v4, v20, v0.t
# CHECK-INST: vmslt.vv v0, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x00,0x4a,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmseq.vv v8, v4, v20, v0.t
# CHECK-INST: vmseq.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmseq.vv v8, v4, v20
# CHECK-INST: vmseq.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmseq.vx v8, v4, a0, v0.t
# CHECK-INST: vmseq.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmseq.vx v8, v4, a0
# CHECK-INST: vmseq.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmseq.vi v8, v4, 15, v0.t
# CHECK-INST: vmseq.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmseq.vi v8, v4, 15
# CHECK-INST: vmseq.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsne.vv v8, v4, v20, v0.t
# CHECK-INST: vmsne.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsne.vv v8, v4, v20
# CHECK-INST: vmsne.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsne.vx v8, v4, a0, v0.t
# CHECK-INST: vmsne.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsne.vx v8, v4, a0
# CHECK-INST: vmsne.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsne.vi v8, v4, 15, v0.t
# CHECK-INST: vmsne.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsne.vi v8, v4, 15
# CHECK-INST: vmsne.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vv v8, v4, v20, v0.t
# CHECK-INST: vmsltu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vv v8, v4, v20
# CHECK-INST: vmsltu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vx v8, v4, a0, v0.t
# CHECK-INST: vmsltu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vx v8, v4, a0
# CHECK-INST: vmsltu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmslt.vv v8, v4, v20, v0.t
# CHECK-INST: vmslt.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmslt.vv v8, v4, v20
# CHECK-INST: vmslt.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmslt.vx v8, v4, a0, v0.t
# CHECK-INST: vmslt.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmslt.vx v8, v4, a0
# CHECK-INST: vmslt.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsleu.vv v8, v4, v20, v0.t
# CHECK-INST: vmsleu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x70]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsleu.vv v8, v4, v20
# CHECK-INST: vmsleu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x72]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsleu.vx v8, v4, a0, v0.t
# CHECK-INST: vmsleu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x70]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsleu.vx v8, v4, a0
# CHECK-INST: vmsleu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x72]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsleu.vi v8, v4, 15, v0.t
# CHECK-INST: vmsleu.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x70]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsleu.vi v8, v4, 15
# CHECK-INST: vmsleu.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x72]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsle.vv v8, v4, v20, v0.t
# CHECK-INST: vmsle.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x74]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsle.vv v8, v4, v20
# CHECK-INST: vmsle.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsle.vx v8, v4, a0, v0.t
# CHECK-INST: vmsle.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x74]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsle.vx v8, v4, a0
# CHECK-INST: vmsle.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsle.vi v8, v4, 15, v0.t
# CHECK-INST: vmsle.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x74]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsle.vi v8, v4, 15
# CHECK-INST: vmsle.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgtu.vx v8, v4, a0, v0.t
# CHECK-INST: vmsgtu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x78]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgtu.vx v8, v4, a0
# CHECK-INST: vmsgtu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x7a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgtu.vi v8, v4, 15, v0.t
# CHECK-INST: vmsgtu.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x78]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgtu.vi v8, v4, 15
# CHECK-INST: vmsgtu.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x7a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgt.vx v8, v4, a0, v0.t
# CHECK-INST: vmsgt.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x7c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgt.vx v8, v4, a0
# CHECK-INST: vmsgt.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x7e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgt.vi v8, v4, 15, v0.t
# CHECK-INST: vmsgt.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x7c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgt.vi v8, v4, 15
# CHECK-INST: vmsgt.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x7e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgtu.vv v8, v20, v4, v0.t
# CHECK-INST: vmsltu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgtu.vv v8, v20, v4
# CHECK-INST: vmsltu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgt.vv v8, v20, v4, v0.t
# CHECK-INST: vmslt.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgt.vv v8, v20, v4
# CHECK-INST: vmslt.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vv v8, v20, v4, v0.t
# CHECK-INST: vmsleu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x70]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vv v8, v20, v4
# CHECK-INST: vmsleu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x72]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vv v8, v20, v4, v0.t
# CHECK-INST: vmsle.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x74]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vv v8, v20, v4
# CHECK-INST: vmsle.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vi v8, v4, 16, v0.t
# CHECK-INST: vmsleu.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x70]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vi v8, v4, 16
# CHECK-INST: vmsleu.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x72]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vi v8, v4, 0, v0.t
# CHECK-INST: vmsne.vv v8, v4, v4, v0.t
# CHECK-ENCODING: [0x57,0x04,0x42,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsltu.vi v8, v4, 0
# CHECK-INST: vmsne.vv v8, v4, v4
# CHECK-ENCODING: [0x57,0x04,0x42,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmslt.vi v8, v4, 16, v0.t
# CHECK-INST: vmsle.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x74]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmslt.vi v8, v4, 16
# CHECK-INST: vmsle.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vi v8, v4, 16, v0.t
# CHECK-INST: vmsgtu.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x78]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vi v8, v4, 16
# CHECK-INST: vmsgtu.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x7a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vi v8, v4, 0, v0.t
# CHECK-INST: vmseq.vv v8, v4, v4, v0.t
# CHECK-ENCODING: [0x57,0x04,0x42,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vi v8, v4, 0
# CHECK-INST: vmseq.vv v8, v4, v4
# CHECK-ENCODING: [0x57,0x04,0x42,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vi v8, v4, 16, v0.t
# CHECK-INST: vmsgt.vi v8, v4, 0xf, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x7c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vi v8, v4, 16
# CHECK-INST: vmsgt.vi v8, v4, 0xf
# CHECK-ENCODING: [0x57,0xb4,0x47,0x7e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vx v8, v4, a0
# CHECK-INST: vmsltu.vx v8, v4, a0
# CHECK-INST: vmnot.m v8, v8
# CHECK-ENCODING: [0x57,0x44,0x45,0x6a]
# CHECK-ENCODING: [0x57,0x24,0x84,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -5 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vx v0, v4, a0
# CHECK-INST: vmslt.vx v0, v4, a0
# CHECK-INST: vmnot.m v0, v0
# CHECK-ENCODING: [0x57,0x40,0x45,0x6e]
# CHECK-ENCODING: [0x57,0x20,0x00,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -5 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vx v8, v4, a0
# CHECK-INST: vmslt.vx v8, v4, a0
# CHECK-INST: vmnot.m v8, v8
# CHECK-ENCODING: [0x57,0x44,0x45,0x6e]
# CHECK-ENCODING: [0x57,0x24,0x84,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -5 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vx v8, v4, a0, v0.t
# CHECK-INST: vmsltu.vx v8, v4, a0, v0.t
# CHECK-INST: vmxor.mm v8, v8, v0
# CHECK-ENCODING: [0x57,0x44,0x45,0x68]
# CHECK-ENCODING: [0x57,0x24,0x80,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -5 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vx v8, v4, a0, v0.t
# CHECK-INST: vmslt.vx v8, v4, a0, v0.t
# CHECK-INST: vmxor.mm v8, v8, v0
# CHECK-ENCODING: [0x57,0x44,0x45,0x6c]
# CHECK-ENCODING: [0x57,0x24,0x80,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -5 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vx v0, v4, a0, v0.t, v2
# CHECK-INST: vmsltu.vx v2, v4, a0
# CHECK-INST: vmandn.mm v0, v0, v2
# CHECK-ENCODING: [0x57,0x41,0x45,0x6a]
# CHECK-ENCODING: [0x57,0x20,0x01,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -5 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vx v0, v4, a0, v0.t, v2
# CHECK-INST: vmslt.vx v2, v4, a0
# CHECK-INST: vmandn.mm v0, v0, v2
# CHECK-ENCODING: [0x57,0x41,0x45,0x6e]
# CHECK-ENCODING: [0x57,0x20,0x01,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -5 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsgeu.vx v9, v4, a0, v0.t, v2
# CHECK-INST: vmsltu.vx v2, v4, a0
@@ -369,7 +368,7 @@ vmsgeu.vx v9, v4, a0, v0.t, v2
# CHECK-ENCODING: [0x57,0x21,0x01,0x62]
# CHECK-ENCODING: [0xd7,0x24,0x90,0x62]
# CHECK-ENCODING: [0xd7,0xa4,0x24,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -9 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsge.vx v8, v4, a0, v0.t, v2
# CHECK-INST: vmslt.vx v2, v4, a0
@@ -380,4 +379,4 @@ vmsge.vx v8, v4, a0, v0.t, v2
# CHECK-ENCODING: [0x57,0x21,0x01,0x62]
# CHECK-ENCODING: [0x57,0x24,0x80,0x62]
# CHECK-ENCODING: [0x57,0x24,0x24,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -9 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/convert.s b/llvm/test/MC/RISCV/rvv/convert.s
index 43f8c0e4e4535c..6e3b251b16b809 100644
--- a/llvm/test/MC/RISCV/rvv/convert.s
+++ b/llvm/test/MC/RISCV/rvv/convert.s
@@ -1,8 +1,7 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: --mattr=+f \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: --mattr=+f \
# RUN: | llvm-objdump -d --mattr=+v --mattr=+f - \
@@ -11,214 +10,214 @@
vfcvt.xu.f.v v8, v4, v0.t
# CHECK-INST: vfcvt.xu.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x40,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.xu.f.v v8, v4
# CHECK-INST: vfcvt.xu.f.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x40,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.x.f.v v8, v4, v0.t
# CHECK-INST: vfcvt.x.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x40,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.x.f.v v8, v4
# CHECK-INST: vfcvt.x.f.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x40,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.f.xu.v v8, v4, v0.t
# CHECK-INST: vfcvt.f.xu.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x41,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.f.xu.v v8, v4
# CHECK-INST: vfcvt.f.xu.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x41,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.f.x.v v8, v4, v0.t
# CHECK-INST: vfcvt.f.x.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x41,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.f.x.v v8, v4
# CHECK-INST: vfcvt.f.x.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x41,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.rtz.xu.f.v v8, v4, v0.t
# CHECK-INST: vfcvt.rtz.xu.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x43,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.rtz.xu.f.v v8, v4
# CHECK-INST: vfcvt.rtz.xu.f.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x43,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.rtz.x.f.v v8, v4, v0.t
# CHECK-INST: vfcvt.rtz.x.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x43,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfcvt.rtz.x.f.v v8, v4
# CHECK-INST: vfcvt.rtz.x.f.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x43,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.xu.f.v v8, v4, v0.t
# CHECK-INST: vfwcvt.xu.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x44,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.xu.f.v v8, v4
# CHECK-INST: vfwcvt.xu.f.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x44,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.x.f.v v8, v4, v0.t
# CHECK-INST: vfwcvt.x.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x44,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.x.f.v v8, v4
# CHECK-INST: vfwcvt.x.f.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x44,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.f.xu.v v8, v4, v0.t
# CHECK-INST: vfwcvt.f.xu.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x45,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.f.xu.v v8, v4
# CHECK-INST: vfwcvt.f.xu.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x45,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.f.x.v v8, v4, v0.t
# CHECK-INST: vfwcvt.f.x.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x45,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.f.x.v v8, v4
# CHECK-INST: vfwcvt.f.x.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x45,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.f.f.v v8, v4, v0.t
# CHECK-INST: vfwcvt.f.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x46,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.f.f.v v8, v4
# CHECK-INST: vfwcvt.f.f.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x46,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.rtz.xu.f.v v8, v4, v0.t
# CHECK-INST: vfwcvt.rtz.xu.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x47,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.rtz.xu.f.v v8, v4
# CHECK-INST: vfwcvt.rtz.xu.f.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x47,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.rtz.x.f.v v8, v4, v0.t
# CHECK-INST: vfwcvt.rtz.x.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x47,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwcvt.rtz.x.f.v v8, v4
# CHECK-INST: vfwcvt.rtz.x.f.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x47,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.xu.f.w v8, v4, v0.t
# CHECK-INST: vfncvt.xu.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x48,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.xu.f.w v4, v4, v0.t
# CHECK-INST: vfncvt.xu.f.w v4, v4, v0.t
# CHECK-ENCODING: [0x57,0x12,0x48,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.xu.f.w v8, v4
# CHECK-INST: vfncvt.xu.f.w v8, v4
# CHECK-ENCODING: [0x57,0x14,0x48,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.x.f.w v8, v4, v0.t
# CHECK-INST: vfncvt.x.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x48,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.x.f.w v8, v4
# CHECK-INST: vfncvt.x.f.w v8, v4
# CHECK-ENCODING: [0x57,0x94,0x48,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.f.xu.w v8, v4, v0.t
# CHECK-INST: vfncvt.f.xu.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x49,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.f.xu.w v8, v4
# CHECK-INST: vfncvt.f.xu.w v8, v4
# CHECK-ENCODING: [0x57,0x14,0x49,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.f.x.w v8, v4, v0.t
# CHECK-INST: vfncvt.f.x.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x49,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.f.x.w v8, v4
# CHECK-INST: vfncvt.f.x.w v8, v4
# CHECK-ENCODING: [0x57,0x94,0x49,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.f.f.w v8, v4, v0.t
# CHECK-INST: vfncvt.f.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.f.f.w v8, v4
# CHECK-INST: vfncvt.f.f.w v8, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.rod.f.f.w v8, v4, v0.t
# CHECK-INST: vfncvt.rod.f.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x4a,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.rod.f.f.w v8, v4
# CHECK-INST: vfncvt.rod.f.f.w v8, v4
# CHECK-ENCODING: [0x57,0x94,0x4a,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.rtz.xu.f.w v8, v4, v0.t
# CHECK-INST: vfncvt.rtz.xu.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4b,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.rtz.xu.f.w v8, v4
# CHECK-INST: vfncvt.rtz.xu.f.w v8, v4
# CHECK-ENCODING: [0x57,0x14,0x4b,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.rtz.x.f.w v8, v4, v0.t
# CHECK-INST: vfncvt.rtz.x.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x4b,0x48]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfncvt.rtz.x.f.w v8, v4
# CHECK-INST: vfncvt.rtz.x.f.w v8, v4
# CHECK-ENCODING: [0x57,0x94,0x4b,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/div.s b/llvm/test/MC/RISCV/rvv/div.s
index a50673ddbafe49..bdbb65e4e5e39c 100644
--- a/llvm/test/MC/RISCV/rvv/div.s
+++ b/llvm/test/MC/RISCV/rvv/div.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,79 +8,79 @@
vdivu.vv v8, v4, v20, v0.t
# CHECK-INST: vdivu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vdivu.vv v8, v4, v20
# CHECK-INST: vdivu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vdivu.vx v8, v4, a0, v0.t
# CHECK-INST: vdivu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vdivu.vx v8, v4, a0
# CHECK-INST: vdivu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vdiv.vv v8, v4, v20, v0.t
# CHECK-INST: vdiv.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vdiv.vv v8, v4, v20
# CHECK-INST: vdiv.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vdiv.vx v8, v4, a0, v0.t
# CHECK-INST: vdiv.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vdiv.vx v8, v4, a0
# CHECK-INST: vdiv.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vremu.vv v8, v4, v20, v0.t
# CHECK-INST: vremu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vremu.vv v8, v4, v20
# CHECK-INST: vremu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vremu.vx v8, v4, a0, v0.t
# CHECK-INST: vremu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vremu.vx v8, v4, a0
# CHECK-INST: vremu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrem.vv v8, v4, v20, v0.t
# CHECK-INST: vrem.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrem.vv v8, v4, v20
# CHECK-INST: vrem.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrem.vx v8, v4, a0, v0.t
# CHECK-INST: vrem.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrem.vx v8, v4, a0
# CHECK-INST: vrem.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/ext.s b/llvm/test/MC/RISCV/rvv/ext.s
index ebf6141f11e33d..715c9e9476de67 100644
--- a/llvm/test/MC/RISCV/rvv/ext.s
+++ b/llvm/test/MC/RISCV/rvv/ext.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,59 +8,59 @@
vzext.vf2 v8, v4, v0.t
# CHECK-INST: vzext.vf2 v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x43,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vzext.vf2 v8, v4
# CHECK-INST: vzext.vf2 v8, v4
# CHECK-ENCODING: [0x57,0x24,0x43,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsext.vf2 v8, v4, v0.t
# CHECK-INST: vsext.vf2 v8, v4, v0.t
# CHECK-ENCODING: [0x57,0xa4,0x43,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsext.vf2 v8, v4
# CHECK-INST: vsext.vf2 v8, v4
# CHECK-ENCODING: [0x57,0xa4,0x43,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vzext.vf4 v8, v4, v0.t
# CHECK-INST: vzext.vf4 v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x42,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vzext.vf4 v8, v4
# CHECK-INST: vzext.vf4 v8, v4
# CHECK-ENCODING: [0x57,0x24,0x42,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsext.vf4 v8, v4, v0.t
# CHECK-INST: vsext.vf4 v8, v4, v0.t
# CHECK-ENCODING: [0x57,0xa4,0x42,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsext.vf4 v8, v4
# CHECK-INST: vsext.vf4 v8, v4
# CHECK-ENCODING: [0x57,0xa4,0x42,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vzext.vf8 v8, v4, v0.t
# CHECK-INST: vzext.vf8 v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x41,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vzext.vf8 v8, v4
# CHECK-INST: vzext.vf8 v8, v4
# CHECK-ENCODING: [0x57,0x24,0x41,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsext.vf8 v8, v4, v0.t
# CHECK-INST: vsext.vf8 v8, v4, v0.t
# CHECK-ENCODING: [0x57,0xa4,0x41,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsext.vf8 v8, v4
# CHECK-INST: vsext.vf8 v8, v4
# CHECK-ENCODING: [0x57,0xa4,0x41,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fadd.s b/llvm/test/MC/RISCV/rvv/fadd.s
index 7bd887420c4a41..d74c6567413d19 100644
--- a/llvm/test/MC/RISCV/rvv/fadd.s
+++ b/llvm/test/MC/RISCV/rvv/fadd.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,59 +8,59 @@
vfadd.vv v8, v4, v20, v0.t
# CHECK-INST: vfadd.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x00]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfadd.vv v8, v4, v20
# CHECK-INST: vfadd.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x02]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfadd.vf v8, v4, fa0, v0.t
# CHECK-INST: vfadd.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x00]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfadd.vf v8, v4, fa0
# CHECK-INST: vfadd.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x02]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.vv v8, v4, v20, v0.t
# CHECK-INST: vfwadd.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.vv v8, v4, v20
# CHECK-INST: vfwadd.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.vf v8, v4, fa0, v0.t
# CHECK-INST: vfwadd.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.vf v8, v4, fa0
# CHECK-INST: vfwadd.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.wv v8, v4, v20, v0.t
# CHECK-INST: vfwadd.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xd0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.wv v8, v4, v20
# CHECK-INST: vfwadd.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0xd2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.wf v8, v4, fa0, v0.t
# CHECK-INST: vfwadd.wf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xd0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwadd.wf v8, v4, fa0
# CHECK-INST: vfwadd.wf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0xd2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fcompare.s b/llvm/test/MC/RISCV/rvv/fcompare.s
index 1779288ddd748a..ed065d86bb7f69 100644
--- a/llvm/test/MC/RISCV/rvv/fcompare.s
+++ b/llvm/test/MC/RISCV/rvv/fcompare.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,124 +8,124 @@
vmfeq.vv v8, v4, v20, v0.t
# CHECK-INST: vmfeq.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x60]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfeq.vv v8, v4, v20
# CHECK-INST: vmfeq.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x62]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfeq.vf v8, v4, fa0, v0.t
# CHECK-INST: vmfeq.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x60]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfeq.vf v8, v4, fa0
# CHECK-INST: vmfeq.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x62]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfne.vv v8, v4, v20, v0.t
# CHECK-INST: vmfne.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x70]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfne.vv v8, v4, v20
# CHECK-INST: vmfne.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x72]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfne.vf v8, v4, fa0, v0.t
# CHECK-INST: vmfne.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x70]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfne.vf v8, v4, fa0
# CHECK-INST: vmfne.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x72]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmflt.vv v8, v4, v20, v0.t
# CHECK-INST: vmflt.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmflt.vv v8, v4, v20
# CHECK-INST: vmflt.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmflt.vf v8, v4, fa0, v0.t
# CHECK-INST: vmflt.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmflt.vf v8, v4, fa0
# CHECK-INST: vmflt.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfle.vv v8, v4, v20, v0.t
# CHECK-INST: vmfle.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x64]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfle.vv v8, v4, v20
# CHECK-INST: vmfle.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x66]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfle.vf v8, v4, fa0, v0.t
# CHECK-INST: vmfle.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfle.vf v8, v4, fa0
# CHECK-INST: vmfle.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfgt.vf v8, v4, fa0, v0.t
# CHECK-INST: vmfgt.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x74]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfgt.vf v8, v4, fa0
# CHECK-INST: vmfgt.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x76]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfge.vf v8, v4, fa0, v0.t
# CHECK-INST: vmfge.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x7c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfge.vf v8, v4, fa0
# CHECK-INST: vmfge.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x7e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfgt.vv v8, v20, v4, v0.t
# CHECK-INST: vmflt.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfgt.vv v8, v20, v4
# CHECK-INST: vmflt.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfge.vv v8, v20, v4, v0.t
# CHECK-INST: vmfle.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x64]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfge.vv v8, v20, v4
# CHECK-INST: vmfle.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x66]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vmfeq.vv v0, v4, v20, v0.t
# CHECK-INST: vmfeq.vv v0, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x10,0x4a,0x60]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fdiv.s b/llvm/test/MC/RISCV/rvv/fdiv.s
index ce39f92cb2b278..08c00456529e14 100644
--- a/llvm/test/MC/RISCV/rvv/fdiv.s
+++ b/llvm/test/MC/RISCV/rvv/fdiv.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,29 +8,29 @@
vfdiv.vv v8, v4, v20, v0.t
# CHECK-INST: vfdiv.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x80]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfdiv.vv v8, v4, v20
# CHECK-INST: vfdiv.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x82]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfdiv.vf v8, v4, fa0, v0.t
# CHECK-INST: vfdiv.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x80]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfdiv.vf v8, v4, fa0
# CHECK-INST: vfdiv.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x82]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrdiv.vf v8, v4, fa0, v0.t
# CHECK-INST: vfrdiv.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrdiv.vf v8, v4, fa0
# CHECK-INST: vfrdiv.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fmacc.s b/llvm/test/MC/RISCV/rvv/fmacc.s
index 748c6ec81e67db..40f6a5b8ce6a4f 100644
--- a/llvm/test/MC/RISCV/rvv/fmacc.s
+++ b/llvm/test/MC/RISCV/rvv/fmacc.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,239 +8,239 @@
vfmacc.vv v8, v20, v4, v0.t
# CHECK-INST: vfmacc.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xb0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmacc.vv v8, v20, v4
# CHECK-INST: vfmacc.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xb2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmacc.vf v8, fa0, v4, v0.t
# CHECK-INST: vfmacc.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xb0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmacc.vf v8, fa0, v4
# CHECK-INST: vfmacc.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xb2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmacc.vv v8, v20, v4, v0.t
# CHECK-INST: vfnmacc.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xb4]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmacc.vv v8, v20, v4
# CHECK-INST: vfnmacc.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xb6]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmacc.vf v8, fa0, v4, v0.t
# CHECK-INST: vfnmacc.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xb4]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmacc.vf v8, fa0, v4
# CHECK-INST: vfnmacc.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xb6]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsac.vv v8, v20, v4, v0.t
# CHECK-INST: vfmsac.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xb8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsac.vv v8, v20, v4
# CHECK-INST: vfmsac.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xba]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsac.vf v8, fa0, v4, v0.t
# CHECK-INST: vfmsac.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xb8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsac.vf v8, fa0, v4
# CHECK-INST: vfmsac.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xba]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsac.vv v8, v20, v4, v0.t
# CHECK-INST: vfnmsac.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xbc]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsac.vv v8, v20, v4
# CHECK-INST: vfnmsac.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xbe]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsac.vf v8, fa0, v4, v0.t
# CHECK-INST: vfnmsac.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xbc]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsac.vf v8, fa0, v4
# CHECK-INST: vfnmsac.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xbe]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmadd.vv v8, v20, v4, v0.t
# CHECK-INST: vfmadd.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmadd.vv v8, v20, v4
# CHECK-INST: vfmadd.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmadd.vf v8, fa0, v4, v0.t
# CHECK-INST: vfmadd.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmadd.vf v8, fa0, v4
# CHECK-INST: vfmadd.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmadd.vv v8, v20, v4, v0.t
# CHECK-INST: vfnmadd.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmadd.vv v8, v20, v4
# CHECK-INST: vfnmadd.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmadd.vf v8, fa0, v4, v0.t
# CHECK-INST: vfnmadd.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmadd.vf v8, fa0, v4
# CHECK-INST: vfnmadd.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsub.vv v8, v20, v4, v0.t
# CHECK-INST: vfmsub.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsub.vv v8, v20, v4
# CHECK-INST: vfmsub.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsub.vf v8, fa0, v4, v0.t
# CHECK-INST: vfmsub.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmsub.vf v8, fa0, v4
# CHECK-INST: vfmsub.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsub.vv v8, v20, v4, v0.t
# CHECK-INST: vfnmsub.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xac]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsub.vv v8, v20, v4
# CHECK-INST: vfnmsub.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xae]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsub.vf v8, fa0, v4, v0.t
# CHECK-INST: vfnmsub.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfnmsub.vf v8, fa0, v4
# CHECK-INST: vfnmsub.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmacc.vv v8, v20, v4, v0.t
# CHECK-INST: vfwmacc.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xf0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmacc.vv v8, v20, v4
# CHECK-INST: vfwmacc.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xf2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmacc.vf v8, fa0, v4, v0.t
# CHECK-INST: vfwmacc.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xf0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmacc.vf v8, fa0, v4
# CHECK-INST: vfwmacc.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xf2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmacc.vv v8, v20, v4, v0.t
# CHECK-INST: vfwnmacc.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xf4]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmacc.vv v8, v20, v4
# CHECK-INST: vfwnmacc.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xf6]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmacc.vf v8, fa0, v4, v0.t
# CHECK-INST: vfwnmacc.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xf4]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmacc.vf v8, fa0, v4
# CHECK-INST: vfwnmacc.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xf6]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmsac.vv v8, v20, v4, v0.t
# CHECK-INST: vfwmsac.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xf8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmsac.vv v8, v20, v4
# CHECK-INST: vfwmsac.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xfa]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmsac.vf v8, fa0, v4, v0.t
# CHECK-INST: vfwmsac.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xf8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmsac.vf v8, fa0, v4
# CHECK-INST: vfwmsac.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xfa]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmsac.vv v8, v20, v4, v0.t
# CHECK-INST: vfwnmsac.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xfc]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmsac.vv v8, v20, v4
# CHECK-INST: vfwnmsac.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xfe]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmsac.vf v8, fa0, v4, v0.t
# CHECK-INST: vfwnmsac.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xfc]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwnmsac.vf v8, fa0, v4
# CHECK-INST: vfwnmsac.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xfe]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fminmax.s b/llvm/test/MC/RISCV/rvv/fminmax.s
index 1780397a49166d..661b4e0714edf7 100644
--- a/llvm/test/MC/RISCV/rvv/fminmax.s
+++ b/llvm/test/MC/RISCV/rvv/fminmax.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,39 +8,39 @@
vfmin.vv v8, v4, v20, v0.t
# CHECK-INST: vfmin.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x10]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmin.vv v8, v4, v20
# CHECK-INST: vfmin.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x12]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmin.vf v8, v4, fa0, v0.t
# CHECK-INST: vfmin.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x10]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmin.vf v8, v4, fa0
# CHECK-INST: vfmin.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x12]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmax.vv v8, v4, v20, v0.t
# CHECK-INST: vfmax.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x18]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmax.vv v8, v4, v20
# CHECK-INST: vfmax.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x1a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmax.vf v8, v4, fa0, v0.t
# CHECK-INST: vfmax.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x18]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmax.vf v8, v4, fa0
# CHECK-INST: vfmax.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x1a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fmul.s b/llvm/test/MC/RISCV/rvv/fmul.s
index 21be7095d8fbef..4a6989fcdd800c 100644
--- a/llvm/test/MC/RISCV/rvv/fmul.s
+++ b/llvm/test/MC/RISCV/rvv/fmul.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,39 +8,39 @@
vfmul.vv v8, v4, v20, v0.t
# CHECK-INST: vfmul.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x90]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmul.vv v8, v4, v20
# CHECK-INST: vfmul.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x92]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmul.vf v8, v4, fa0, v0.t
# CHECK-INST: vfmul.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x90]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmul.vf v8, v4, fa0
# CHECK-INST: vfmul.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x92]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmul.vv v8, v4, v20, v0.t
# CHECK-INST: vfwmul.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmul.vv v8, v4, v20
# CHECK-INST: vfwmul.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmul.vf v8, v4, fa0, v0.t
# CHECK-INST: vfwmul.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwmul.vf v8, v4, fa0
# CHECK-INST: vfwmul.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fmv.s b/llvm/test/MC/RISCV/rvv/fmv.s
index c310d720cda5f2..2e5052d6c6f1a9 100644
--- a/llvm/test/MC/RISCV/rvv/fmv.s
+++ b/llvm/test/MC/RISCV/rvv/fmv.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,14 +8,14 @@
vfmv.v.f v8, fa0
# CHECK-INST: vfmv.v.f v8, fa0
# CHECK-ENCODING: [0x57,0x54,0x05,0x5e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmv.f.s fa0, v4
# CHECK-INST: vfmv.f.s fa0, v4
# CHECK-ENCODING: [0x57,0x15,0x40,0x42]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmv.s.f v8, fa0
# CHECK-INST: vfmv.s.f v8, fa0
# CHECK-ENCODING: [0x57,0x54,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fothers.s b/llvm/test/MC/RISCV/rvv/fothers.s
index c9ad8ca40eebba..47d45347734379 100644
--- a/llvm/test/MC/RISCV/rvv/fothers.s
+++ b/llvm/test/MC/RISCV/rvv/fothers.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s --M no-aliases \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f -M no-aliases - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,64 +8,64 @@
vfsqrt.v v8, v4, v0.t
# CHECK-INST: vfsqrt.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x40,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsqrt.v v8, v4
# CHECK-INST: vfsqrt.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x40,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrsqrt7.v v8, v4, v0.t
# CHECK-INST: vfrsqrt7.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x42,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrsqrt7.v v8, v4
# CHECK-INST: vfrsqrt7.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x42,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrec7.v v8, v4, v0.t
# CHECK-INST: vfrec7.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x42,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrec7.v v8, v4
# CHECK-INST: vfrec7.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x42,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfclass.v v8, v4, v0.t
# CHECK-INST: vfclass.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x48,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfclass.v v8, v4
# CHECK-INST: vfclass.v v8, v4
# CHECK-ENCODING: [0x57,0x14,0x48,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfmerge.vfm v8, v4, fa0, v0
# CHECK-INST: vfmerge.vfm v8, v4, fa0, v0
# CHECK-ENCODING: [0x57,0x54,0x45,0x5c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfslide1up.vf v8, v4, fa0, v0.t
# CHECK-INST: vfslide1up.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x38]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfslide1up.vf v8, v4, fa0
# CHECK-INST: vfslide1up.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x3a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfslide1down.vf v8, v4, fa0, v0.t
# CHECK-INST: vfslide1down.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x3c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfslide1down.vf v8, v4, fa0
# CHECK-INST: vfslide1down.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x3e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/freduction.s b/llvm/test/MC/RISCV/rvv/freduction.s
index 874a6aeba18efe..2acc8ffdd37791 100644
--- a/llvm/test/MC/RISCV/rvv/freduction.s
+++ b/llvm/test/MC/RISCV/rvv/freduction.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s --M no-aliases \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f -M no-aliases - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,64 +8,64 @@
vfredosum.vs v8, v4, v20, v0.t
# CHECK-INST: vfredosum.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredosum.vs v8, v4, v20
# CHECK-INST: vfredosum.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredusum.vs v8, v4, v20, v0.t
# CHECK-INST: vfredusum.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x04]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredusum.vs v8, v4, v20
# CHECK-INST: vfredusum.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x06]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredmax.vs v8, v4, v20, v0.t
# CHECK-INST: vfredmax.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredmax.vs v8, v4, v20
# CHECK-INST: vfredmax.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x1e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredmin.vs v8, v4, v20, v0.t
# CHECK-INST: vfredmin.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x14]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredmin.vs v8, v4, v20
# CHECK-INST: vfredmin.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x16]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwredosum.vs v8, v4, v20, v0.t
# CHECK-INST: vfwredosum.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwredosum.vs v8, v4, v20
# CHECK-INST: vfwredosum.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0xce]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwredusum.vs v8, v4, v20, v0.t
# CHECK-INST: vfwredusum.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwredusum.vs v8, v4, v20
# CHECK-INST: vfwredusum.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfredosum.vs v0, v4, v20, v0.t
# CHECK-INST: vfredosum.vs v0, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x10,0x4a,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/fsub.s b/llvm/test/MC/RISCV/rvv/fsub.s
index 85fb827fc0d6c5..a238dc94df7d74 100644
--- a/llvm/test/MC/RISCV/rvv/fsub.s
+++ b/llvm/test/MC/RISCV/rvv/fsub.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32f %s \
# RUN: | llvm-objdump -d --mattr=+zve32f - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,69 +8,69 @@
vfsub.vv v8, v4, v20, v0.t
# CHECK-INST: vfsub.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x08]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsub.vv v8, v4, v20
# CHECK-INST: vfsub.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsub.vf v8, v4, fa0, v0.t
# CHECK-INST: vfsub.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x08]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsub.vf v8, v4, fa0
# CHECK-INST: vfsub.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrsub.vf v8, v4, fa0, v0.t
# CHECK-INST: vfrsub.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x9c]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfrsub.vf v8, v4, fa0
# CHECK-INST: vfrsub.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.vv v8, v4, v20, v0.t
# CHECK-INST: vfwsub.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.vv v8, v4, v20
# CHECK-INST: vfwsub.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0xca]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.vf v8, v4, fa0, v0.t
# CHECK-INST: vfwsub.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.vf v8, v4, fa0
# CHECK-INST: vfwsub.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0xca]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.wv v8, v4, v20, v0.t
# CHECK-INST: vfwsub.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xd8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.wv v8, v4, v20
# CHECK-INST: vfwsub.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0xda]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.wf v8, v4, fa0, v0.t
# CHECK-INST: vfwsub.wf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xd8]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfwsub.wf v8, v4, fa0
# CHECK-INST: vfwsub.wf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0xda]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/invalid-alt.s b/llvm/test/MC/RISCV/rvv/invalid-alt.s
index 108bbbce9e3fee..e96475986fbe32 100644
--- a/llvm/test/MC/RISCV/rvv/invalid-alt.s
+++ b/llvm/test/MC/RISCV/rvv/invalid-alt.s
@@ -1,10 +1,8 @@
-# RUN: not llvm-mc -triple=riscv64 --mattr=+experimental-zvfbfa --mattr=+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
-# RUN: not llvm-mc -triple=riscv64 --mattr=+experimental-zvfofp8min --mattr=+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 --mattr=+experimental-zvfbfa --mattr=+f %s
+# RUN: llvm-mc --verify -triple=riscv64 --mattr=+experimental-zvfofp8min --mattr=+f %s
vsetvli a2, a0, e32alt, m1, ta, ma
-# CHECK-ERROR: operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
+# expected-error at -1 {{operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]}}
vsetvli a2, a0, e64alt, m1, ta, ma
-# CHECK-ERROR: operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
+# expected-error at -1 {{operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]}}
diff --git a/llvm/test/MC/RISCV/rvv/invalid-eew.s b/llvm/test/MC/RISCV/rvv/invalid-eew.s
index 47a0f18954bbee..94643877eaea66 100644
--- a/llvm/test/MC/RISCV/rvv/invalid-eew.s
+++ b/llvm/test/MC/RISCV/rvv/invalid-eew.s
@@ -1,194 +1,193 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+zve32x %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+zve32x %s
vluxei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxei64.v v24, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxei64.v v24, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxei64.v v24, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxei64.v v24, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg2ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg2ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg3ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg3ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg4ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg4ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg5ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg5ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg6ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg6ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg7ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg7ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg8ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vluxseg8ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg2ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg2ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg3ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg3ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg4ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg4ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg5ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg5ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg6ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg6ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg7ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg7ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg8ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vloxseg8ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg2ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg2ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg3ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg3ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg4ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg4ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg5ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg5ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg6ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg6ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg7ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg7ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg8ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsuxseg8ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg2ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg2ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg3ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg3ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg4ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg4ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg5ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg5ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg6ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg6ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg7ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg7ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg8ei64.v v8, (a0), v4, v0.t
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
vsoxseg8ei64.v v8, (a0), v4
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set{{$}}
+# expected-error at -1 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors), RV64I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/rvv/load.s b/llvm/test/MC/RISCV/rvv/load.s
index 0f0db7a827f1de..4a28758e818308 100644
--- a/llvm/test/MC/RISCV/rvv/load.s
+++ b/llvm/test/MC/RISCV/rvv/load.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: --M no-aliases | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v -M no-aliases - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,319 +8,319 @@
vlm.v v0, (a0)
# CHECK-INST: vlm.v v0, (a0)
# CHECK-ENCODING: [0x07,0x00,0xb5,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlm.v v8, (a0)
# CHECK-INST: vlm.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0xb5,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle8.v v8, (a0), v0.t
# CHECK-INST: vle8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle8.v v8, (a0)
# CHECK-INST: vle8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle16.v v8, (a0), v0.t
# CHECK-INST: vle16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle16.v v8, (a0)
# CHECK-INST: vle16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle32.v v8, (a0), v0.t
# CHECK-INST: vle32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle32.v v8, (a0)
# CHECK-INST: vle32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle64.v v8, (a0), v0.t
# CHECK-INST: vle64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vle64.v v8, (a0)
# CHECK-INST: vle64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vle8ff.v v8, (a0), v0.t
# CHECK-INST: vle8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x01]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle8ff.v v8, (a0)
# CHECK-INST: vle8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x03]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle16ff.v v8, (a0), v0.t
# CHECK-INST: vle16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x01]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle16ff.v v8, (a0)
# CHECK-INST: vle16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x03]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle32ff.v v8, (a0), v0.t
# CHECK-INST: vle32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x01]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle32ff.v v8, (a0)
# CHECK-INST: vle32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x03]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle64ff.v v8, (a0), v0.t
# CHECK-INST: vle64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x01]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vle64ff.v v8, (a0)
# CHECK-INST: vle64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x03]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlse8.v v8, (a0), a1, v0.t
# CHECK-INST: vlse8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlse8.v v8, (a0), a1
# CHECK-INST: vlse8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlse16.v v8, (a0), a1, v0.t
# CHECK-INST: vlse16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlse16.v v8, (a0), a1
# CHECK-INST: vlse16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlse32.v v8, (a0), a1, v0.t
# CHECK-INST: vlse32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlse32.v v8, (a0), a1
# CHECK-INST: vlse32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlse64.v v8, (a0), a1, v0.t
# CHECK-INST: vlse64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlse64.v v8, (a0), a1
# CHECK-INST: vlse64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxei8.v v8, (a0), v4
# CHECK-INST: vluxei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxei16.v v8, (a0), v4
# CHECK-INST: vluxei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxei32.v v8, (a0), v4
# CHECK-INST: vluxei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxei64.v v8, (a0), v4
# CHECK-INST: vluxei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxei8.v v8, (a0), v4
# CHECK-INST: vloxei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxei16.v v8, (a0), v4
# CHECK-INST: vloxei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxei32.v v8, (a0), v4
# CHECK-INST: vloxei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxei64.v v8, (a0), v4
# CHECK-INST: vloxei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vl1re8.v v8, (a0)
# CHECK-INST: vl1re8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x85,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl1re16.v v8, (a0)
# CHECK-INST: vl1re16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x85,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl1re32.v v8, (a0)
# CHECK-INST: vl1re32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x85,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl1re64.v v8, (a0)
# CHECK-INST: vl1re64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x85,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vl2re8.v v8, (a0)
# CHECK-INST: vl2re8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x85,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl2re16.v v8, (a0)
# CHECK-INST: vl2re16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x85,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl2re32.v v8, (a0)
# CHECK-INST: vl2re32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x85,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl2re64.v v8, (a0)
# CHECK-INST: vl2re64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x85,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vl4re8.v v8, (a0)
# CHECK-INST: vl4re8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x85,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl4re16.v v8, (a0)
# CHECK-INST: vl4re16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x85,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl4re32.v v8, (a0)
# CHECK-INST: vl4re32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x85,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl4re64.v v8, (a0)
# CHECK-INST: vl4re64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x85,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vl8re8.v v8, (a0)
# CHECK-INST: vl8re8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x85,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl8re16.v v8, (a0)
# CHECK-INST: vl8re16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x85,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl8re32.v v8, (a0)
# CHECK-INST: vl8re32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x85,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vl8re64.v v8, (a0)
# CHECK-INST: vl8re64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x85,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlm.v v0, 0(a0)
# CHECK-INST: vlm.v v0, (a0)
# CHECK-ENCODING: [0x07,0x00,0xb5,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle8.v v8, 0(a0)
# CHECK-INST: vle8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vle8ff.v v8, 0(a0), v0.t
# CHECK-INST: vle8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x01]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlse16.v v8, 0(a0), a1, v0.t
# CHECK-INST: vlse16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxei32.v v8, 0(a0), v4
# CHECK-INST: vluxei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxei64.v v8, 0(a0), v4
# CHECK-INST: vloxei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/macc.s b/llvm/test/MC/RISCV/rvv/macc.s
index 4f2454291032a7..3cda0bcc117302 100644
--- a/llvm/test/MC/RISCV/rvv/macc.s
+++ b/llvm/test/MC/RISCV/rvv/macc.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,149 +8,149 @@
vmacc.vv v8, v20, v4, v0.t
# CHECK-INST: vmacc.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xb4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmacc.vv v8, v20, v4
# CHECK-INST: vmacc.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x24,0x4a,0xb6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmacc.vx v8, a0, v4, v0.t
# CHECK-INST: vmacc.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xb4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmacc.vx v8, a0, v4
# CHECK-INST: vmacc.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xb6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsac.vv v8, v20, v4, v0.t
# CHECK-INST: vnmsac.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xbc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsac.vv v8, v20, v4
# CHECK-INST: vnmsac.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x24,0x4a,0xbe]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsac.vx v8, a0, v4, v0.t
# CHECK-INST: vnmsac.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xbc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsac.vx v8, a0, v4
# CHECK-INST: vnmsac.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xbe]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadd.vv v8, v20, v4, v0.t
# CHECK-INST: vmadd.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadd.vv v8, v20, v4
# CHECK-INST: vmadd.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x24,0x4a,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadd.vx v8, a0, v4, v0.t
# CHECK-INST: vmadd.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmadd.vx v8, a0, v4
# CHECK-INST: vmadd.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsub.vv v8, v20, v4, v0.t
# CHECK-INST: vnmsub.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsub.vv v8, v20, v4
# CHECK-INST: vnmsub.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x24,0x4a,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsub.vx v8, a0, v4, v0.t
# CHECK-INST: vnmsub.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnmsub.vx v8, a0, v4
# CHECK-INST: vnmsub.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccu.vv v8, v20, v4, v0.t
# CHECK-INST: vwmaccu.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xf0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccu.vv v8, v20, v4
# CHECK-INST: vwmaccu.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x24,0x4a,0xf2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccu.vx v8, a0, v4, v0.t
# CHECK-INST: vwmaccu.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xf0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccu.vx v8, a0, v4
# CHECK-INST: vwmaccu.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xf2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmacc.vv v8, v20, v4, v0.t
# CHECK-INST: vwmacc.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xf4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmacc.vv v8, v20, v4
# CHECK-INST: vwmacc.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x24,0x4a,0xf6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmacc.vx v8, a0, v4, v0.t
# CHECK-INST: vwmacc.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xf4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmacc.vx v8, a0, v4
# CHECK-INST: vwmacc.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xf6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccsu.vv v8, v20, v4, v0.t
# CHECK-INST: vwmaccsu.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xfc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccsu.vv v8, v20, v4
# CHECK-INST: vwmaccsu.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x24,0x4a,0xfe]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccsu.vx v8, a0, v4, v0.t
# CHECK-INST: vwmaccsu.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xfc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccsu.vx v8, a0, v4
# CHECK-INST: vwmaccsu.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xfe]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccus.vx v8, a0, v4, v0.t
# CHECK-INST: vwmaccus.vx v8, a0, v4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xf8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmaccus.vx v8, a0, v4
# CHECK-INST: vwmaccus.vx v8, a0, v4
# CHECK-ENCODING: [0x57,0x64,0x45,0xfa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/mask.s b/llvm/test/MC/RISCV/rvv/mask.s
index a6f4bacf5b38c8..1775e356921ffc 100644
--- a/llvm/test/MC/RISCV/rvv/mask.s
+++ b/llvm/test/MC/RISCV/rvv/mask.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,129 +8,129 @@
vmand.mm v8, v4, v20
# CHECK-INST: vmand.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmnand.mm v8, v4, v20
# CHECK-INST: vmnand.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmandn.mm v8, v4, v20
# CHECK-INST: vmandn.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmxor.mm v8, v4, v20
# CHECK-INST: vmxor.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmor.mm v8, v4, v20
# CHECK-INST: vmor.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmnor.mm v8, v4, v20
# CHECK-INST: vmnor.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x7a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmorn.mm v8, v4, v20
# CHECK-INST: vmorn.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x72]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmxnor.mm v8, v4, v20
# CHECK-INST: vmxnor.mm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x7e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vcpop.m a2, v4, v0.t
# CHECK-INST: vcpop.m a2, v4, v0.t
# CHECK-ENCODING: [0x57,0x26,0x48,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vcpop.m a2, v4
# CHECK-INST: vcpop.m a2, v4
# CHECK-ENCODING: [0x57,0x26,0x48,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vfirst.m a2, v4, v0.t
# CHECK-INST: vfirst.m a2, v4, v0.t
# CHECK-ENCODING: [0x57,0xa6,0x48,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vfirst.m a2, v4
# CHECK-INST: vfirst.m a2, v4
# CHECK-ENCODING: [0x57,0xa6,0x48,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbf.m v8, v4, v0.t
# CHECK-INST: vmsbf.m v8, v4, v0.t
# CHECK-ENCODING: [0x57,0xa4,0x40,0x50]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbf.m v8, v4
# CHECK-INST: vmsbf.m v8, v4
# CHECK-ENCODING: [0x57,0xa4,0x40,0x52]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsif.m v8, v4, v0.t
# CHECK-INST: vmsif.m v8, v4, v0.t
# CHECK-ENCODING: [0x57,0xa4,0x41,0x50]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsif.m v8, v4
# CHECK-INST: vmsif.m v8, v4
# CHECK-ENCODING: [0x57,0xa4,0x41,0x52]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsof.m v8, v4, v0.t
# CHECK-INST: vmsof.m v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x41,0x50]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsof.m v8, v4
# CHECK-INST: vmsof.m v8, v4
# CHECK-ENCODING: [0x57,0x24,0x41,0x52]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
viota.m v8, v4, v0.t
# CHECK-INST: viota.m v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x24,0x48,0x50]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
viota.m v8, v4
# CHECK-INST: viota.m v8, v4
# CHECK-ENCODING: [0x57,0x24,0x48,0x52]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vid.v v8, v0.t
# CHECK-INST: vid.v v8, v0.t
# CHECK-ENCODING: [0x57,0xa4,0x08,0x50]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vid.v v8
# CHECK-INST: vid.v v8
# CHECK-ENCODING: [0x57,0xa4,0x08,0x52]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmmv.m v8, v4
# CHECK-INST: vmmv.m v8, v4
# CHECK-ENCODING: [0x57,0x24,0x42,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmclr.m v8
# CHECK-INST: vmclr.m v8
# CHECK-ENCODING: [0x57,0x24,0x84,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmset.m v8
# CHECK-INST: vmset.m v8
# CHECK-ENCODING: [0x57,0x24,0x84,0x7e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmnot.m v8, v4
# CHECK-INST: vmnot.m v8, v4
# CHECK-ENCODING: [0x57,0x24,0x42,0x76]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/minmax.s b/llvm/test/MC/RISCV/rvv/minmax.s
index b50625e9b188cc..bd2c3dab5321b0 100644
--- a/llvm/test/MC/RISCV/rvv/minmax.s
+++ b/llvm/test/MC/RISCV/rvv/minmax.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,79 +8,79 @@
vminu.vv v8, v4, v20, v0.t
# CHECK-INST: vminu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x10]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vminu.vv v8, v4, v20
# CHECK-INST: vminu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x12]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vminu.vx v8, v4, a0, v0.t
# CHECK-INST: vminu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x10]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vminu.vx v8, v4, a0
# CHECK-INST: vminu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x12]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmin.vv v8, v4, v20, v0.t
# CHECK-INST: vmin.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x14]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmin.vv v8, v4, v20
# CHECK-INST: vmin.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x16]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmin.vx v8, v4, a0, v0.t
# CHECK-INST: vmin.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x14]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmin.vx v8, v4, a0
# CHECK-INST: vmin.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x16]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmaxu.vv v8, v4, v20, v0.t
# CHECK-INST: vmaxu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x18]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmaxu.vv v8, v4, v20
# CHECK-INST: vmaxu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x1a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmaxu.vx v8, v4, a0, v0.t
# CHECK-INST: vmaxu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x18]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmaxu.vx v8, v4, a0
# CHECK-INST: vmaxu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x1a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmax.vv v8, v4, v20, v0.t
# CHECK-INST: vmax.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmax.vv v8, v4, v20
# CHECK-INST: vmax.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x1e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmax.vx v8, v4, a0, v0.t
# CHECK-INST: vmax.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmax.vx v8, v4, a0
# CHECK-INST: vmax.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x1e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/mul.s b/llvm/test/MC/RISCV/rvv/mul.s
index 72e246fc24a887..0bdb680fc5a457 100644
--- a/llvm/test/MC/RISCV/rvv/mul.s
+++ b/llvm/test/MC/RISCV/rvv/mul.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,159 +8,159 @@
vmul.vv v8, v4, v20, v0.t
# CHECK-INST: vmul.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x94]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmul.vv v8, v4, v20
# CHECK-INST: vmul.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x96]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmul.vx v8, v4, a0, v0.t
# CHECK-INST: vmul.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x94]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmul.vx v8, v4, a0
# CHECK-INST: vmul.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x96]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulh.vv v8, v4, v20, v0.t
# CHECK-INST: vmulh.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x9c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulh.vv v8, v4, v20
# CHECK-INST: vmulh.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulh.vx v8, v4, a0, v0.t
# CHECK-INST: vmulh.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x9c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulh.vx v8, v4, a0
# CHECK-INST: vmulh.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhu.vv v8, v4, v20, v0.t
# CHECK-INST: vmulhu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x90]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhu.vv v8, v4, v20
# CHECK-INST: vmulhu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x92]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhu.vx v8, v4, a0, v0.t
# CHECK-INST: vmulhu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x90]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhu.vx v8, v4, a0
# CHECK-INST: vmulhu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x92]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhsu.vv v8, v4, v20, v0.t
# CHECK-INST: vmulhsu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x98]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhsu.vv v8, v4, v20
# CHECK-INST: vmulhsu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x9a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhsu.vx v8, v4, a0, v0.t
# CHECK-INST: vmulhsu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x98]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmulhsu.vx v8, v4, a0
# CHECK-INST: vmulhsu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x9a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmul.vv v8, v4, v20, v0.t
# CHECK-INST: vwmul.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmul.vv v8, v4, v20
# CHECK-INST: vwmul.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmul.vx v8, v4, a0, v0.t
# CHECK-INST: vwmul.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmul.vx v8, v4, a0
# CHECK-INST: vwmul.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulu.vv v8, v4, v20, v0.t
# CHECK-INST: vwmulu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulu.vv v8, v4, v20
# CHECK-INST: vwmulu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulu.vx v8, v4, a0, v0.t
# CHECK-INST: vwmulu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulu.vx v8, v4, a0
# CHECK-INST: vwmulu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulsu.vv v8, v4, v20, v0.t
# CHECK-INST: vwmulsu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulsu.vv v8, v4, v20
# CHECK-INST: vwmulsu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulsu.vx v8, v4, a0, v0.t
# CHECK-INST: vwmulsu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwmulsu.vx v8, v4, a0
# CHECK-INST: vwmulsu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsmul.vv v8, v4, v20, v0.t
# CHECK-INST: vsmul.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x9c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsmul.vv v8, v4, v20
# CHECK-INST: vsmul.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsmul.vx v8, v4, a0, v0.t
# CHECK-INST: vsmul.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x9c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsmul.vx v8, v4, a0
# CHECK-INST: vsmul.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/mv.s b/llvm/test/MC/RISCV/rvv/mv.s
index 0506ccb1b0bab4..753b51c4634544 100644
--- a/llvm/test/MC/RISCV/rvv/mv.s
+++ b/llvm/test/MC/RISCV/rvv/mv.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,44 +8,44 @@
vmv.v.v v8, v20
# CHECK-INST: vmv.v.v v8, v20
# CHECK-ENCODING: [0x57,0x04,0x0a,0x5e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv.v.x v8, a0
# CHECK-INST: vmv.v.x v8, a0
# CHECK-ENCODING: [0x57,0x44,0x05,0x5e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv.v.i v8, 15
# CHECK-INST: vmv.v.i v8, 15
# CHECK-ENCODING: [0x57,0xb4,0x07,0x5e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv.x.s a2, v4
# CHECK-INST: vmv.x.s a2, v4
# CHECK-ENCODING: [0x57,0x26,0x40,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv.s.x v8, a0
# CHECK-INST: vmv.s.x v8, a0
# CHECK-ENCODING: [0x57,0x64,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv1r.v v8, v4
# CHECK-INST: vmv1r.v v8, v4
# CHECK-ENCODING: [0x57,0x34,0x40,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv2r.v v8, v4
# CHECK-INST: vmv2r.v v8, v4
# CHECK-ENCODING: [0x57,0xb4,0x40,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv4r.v v8, v4
# CHECK-INST: vmv4r.v v8, v4
# CHECK-ENCODING: [0x57,0xb4,0x41,0x9e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmv8r.v v8, v24
# CHECK-INST: vmv8r.v v8, v24
# CHECK-ENCODING: [0x57,0xb4,0x83,0x9f]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/or.s b/llvm/test/MC/RISCV/rvv/or.s
index f2d54481425242..cb3d7e557a243d 100644
--- a/llvm/test/MC/RISCV/rvv/or.s
+++ b/llvm/test/MC/RISCV/rvv/or.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,29 +8,29 @@
vor.vv v8, v4, v20, v0.t
# CHECK-INST: vor.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vor.vv v8, v4, v20
# CHECK-INST: vor.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vor.vx v8, v4, a0, v0.t
# CHECK-INST: vor.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vor.vx v8, v4, a0
# CHECK-INST: vor.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vor.vi v8, v4, 15, v0.t
# CHECK-INST: vor.vi v8, v4, 15, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vor.vi v8, v4, 15
# CHECK-INST: vor.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/others.s b/llvm/test/MC/RISCV/rvv/others.s
index f886c383c106f8..0d109364c5113f 100644
--- a/llvm/test/MC/RISCV/rvv/others.s
+++ b/llvm/test/MC/RISCV/rvv/others.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: --M no-aliases | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex -M no-aliases - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,119 +8,119 @@
vmerge.vvm v8, v4, v20, v0
# CHECK-INST: vmerge.vvm v8, v4, v20, v0
# CHECK-ENCODING: [0x57,0x04,0x4a,0x5c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmerge.vxm v8, v4, a0, v0
# CHECK-INST: vmerge.vxm v8, v4, a0, v0
# CHECK-ENCODING: [0x57,0x44,0x45,0x5c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmerge.vim v8, v4, 15, v0
# CHECK-INST: vmerge.vim v8, v4, 15, v0
# CHECK-ENCODING: [0x57,0xb4,0x47,0x5c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslideup.vx v8, v4, a0, v0.t
# CHECK-INST: vslideup.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x38]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslideup.vx v8, v4, a0
# CHECK-INST: vslideup.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x3a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslideup.vi v8, v4, 31, v0.t
# CHECK-INST: vslideup.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x38]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslideup.vi v8, v4, 31
# CHECK-INST: vslideup.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x3a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslidedown.vx v8, v4, a0, v0.t
# CHECK-INST: vslidedown.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x3c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslidedown.vx v8, v4, a0
# CHECK-INST: vslidedown.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x3e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslidedown.vi v8, v4, 31, v0.t
# CHECK-INST: vslidedown.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x3c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslidedown.vi v8, v4, 31
# CHECK-INST: vslidedown.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x3e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslide1up.vx v8, v4, a0, v0.t
# CHECK-INST: vslide1up.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x38]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslide1up.vx v8, v4, a0
# CHECK-INST: vslide1up.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x3a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslide1down.vx v8, v4, a0, v0.t
# CHECK-INST: vslide1down.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x3c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vslide1down.vx v8, v4, a0
# CHECK-INST: vslide1down.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x3e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgather.vv v8, v4, v20, v0.t
# CHECK-INST: vrgather.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x30]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgather.vv v8, v4, v20
# CHECK-INST: vrgather.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x32]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgather.vx v8, v4, a0, v0.t
# CHECK-INST: vrgather.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x30]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgather.vx v8, v4, a0
# CHECK-INST: vrgather.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x32]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgather.vi v8, v4, 31, v0.t
# CHECK-INST: vrgather.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x30]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgather.vi v8, v4, 31
# CHECK-INST: vrgather.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x32]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgatherei16.vv v8, v4, v20, v0.t
# CHECK-INST: vrgatherei16.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x38]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrgatherei16.vv v8, v4, v20
# CHECK-INST: vrgatherei16.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x3a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vcompress.vm v8, v4, v20
# CHECK-INST: vcompress.vm v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x5e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/reduction.s b/llvm/test/MC/RISCV/rvv/reduction.s
index 60c1fc21b77771..0c1f72be034576 100644
--- a/llvm/test/MC/RISCV/rvv/reduction.s
+++ b/llvm/test/MC/RISCV/rvv/reduction.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,104 +8,104 @@
vredsum.vs v8, v4, v20, v0.t
# CHECK-INST: vredsum.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredsum.vs v8, v4, v20
# CHECK-INST: vredsum.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredmaxu.vs v8, v4, v20, v0.t
# CHECK-INST: vredmaxu.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x18]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredmaxu.vs v8, v4, v20
# CHECK-INST: vredmaxu.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x1a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredmax.vs v8, v4, v20, v0.t
# CHECK-INST: vredmax.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredmax.vs v8, v4, v20
# CHECK-INST: vredmax.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x1e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredminu.vs v8, v4, v20, v0.t
# CHECK-INST: vredminu.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x10]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredminu.vs v8, v4, v20
# CHECK-INST: vredminu.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x12]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredmin.vs v8, v4, v20, v0.t
# CHECK-INST: vredmin.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x14]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredmin.vs v8, v4, v20
# CHECK-INST: vredmin.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x16]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredand.vs v8, v4, v20, v0.t
# CHECK-INST: vredand.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredand.vs v8, v4, v20
# CHECK-INST: vredand.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredor.vs v8, v4, v20, v0.t
# CHECK-INST: vredor.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredor.vs v8, v4, v20
# CHECK-INST: vredor.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredxor.vs v8, v4, v20, v0.t
# CHECK-INST: vredxor.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredxor.vs v8, v4, v20
# CHECK-INST: vredxor.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwredsumu.vs v8, v4, v20, v0.t
# CHECK-INST: vwredsumu.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwredsumu.vs v8, v4, v20
# CHECK-INST: vwredsumu.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwredsum.vs v8, v4, v20, v0.t
# CHECK-INST: vwredsum.vs v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwredsum.vs v8, v4, v20
# CHECK-INST: vwredsum.vs v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vredsum.vs v0, v4, v20, v0.t
# CHECK-INST: vredsum.vs v0, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x20,0x4a,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/shift.s b/llvm/test/MC/RISCV/rvv/shift.s
index e561749e9c1507..ef57966f8bcf3b 100644
--- a/llvm/test/MC/RISCV/rvv/shift.s
+++ b/llvm/test/MC/RISCV/rvv/shift.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump --no-print-imm-hex -d --mattr=+v - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,214 +8,214 @@
vsll.vv v8, v4, v20, v0.t
# CHECK-INST: vsll.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x94]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsll.vv v8, v4, v20
# CHECK-INST: vsll.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x96]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsll.vx v8, v4, a0, v0.t
# CHECK-INST: vsll.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x94]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsll.vx v8, v4, a0
# CHECK-INST: vsll.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x96]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsll.vi v8, v4, 31, v0.t
# CHECK-INST: vsll.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x94]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsll.vi v8, v4, 31
# CHECK-INST: vsll.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x96]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsrl.vv v8, v4, v20, v0.t
# CHECK-INST: vsrl.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsrl.vv v8, v4, v20
# CHECK-INST: vsrl.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsrl.vx v8, v4, a0, v0.t
# CHECK-INST: vsrl.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsrl.vx v8, v4, a0
# CHECK-INST: vsrl.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsrl.vi v8, v4, 31, v0.t
# CHECK-INST: vsrl.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsrl.vi v8, v4, 31
# CHECK-INST: vsrl.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsra.vv v8, v4, v20, v0.t
# CHECK-INST: vsra.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsra.vv v8, v4, v20
# CHECK-INST: vsra.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsra.vx v8, v4, a0, v0.t
# CHECK-INST: vsra.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsra.vx v8, v4, a0
# CHECK-INST: vsra.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsra.vi v8, v4, 31, v0.t
# CHECK-INST: vsra.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsra.vi v8, v4, 31
# CHECK-INST: vsra.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsrl.wv v8, v4, v20, v0.t
# CHECK-INST: vnsrl.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xb0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsrl.wv v4, v4, v20, v0.t
# CHECK-INST: vnsrl.wv v4, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x02,0x4a,0xb0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsrl.wv v8, v4, v20
# CHECK-INST: vnsrl.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xb2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsrl.wx v8, v4, a0, v0.t
# CHECK-INST: vnsrl.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xb0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsrl.wx v8, v4, a0
# CHECK-INST: vnsrl.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xb2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsrl.wi v8, v4, 31, v0.t
# CHECK-INST: vnsrl.wi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xb0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsrl.wi v8, v4, 31
# CHECK-INST: vnsrl.wi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xb2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsra.wv v8, v4, v20, v0.t
# CHECK-INST: vnsra.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xb4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsra.wv v8, v4, v20
# CHECK-INST: vnsra.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xb6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsra.wx v8, v4, a0, v0.t
# CHECK-INST: vnsra.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xb4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsra.wx v8, v4, a0
# CHECK-INST: vnsra.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xb6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsra.wi v8, v4, 31, v0.t
# CHECK-INST: vnsra.wi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xb4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnsra.wi v8, v4, 31
# CHECK-INST: vnsra.wi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xb6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssrl.vv v8, v4, v20, v0.t
# CHECK-INST: vssrl.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssrl.vv v8, v4, v20
# CHECK-INST: vssrl.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssrl.vx v8, v4, a0, v0.t
# CHECK-INST: vssrl.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssrl.vx v8, v4, a0
# CHECK-INST: vssrl.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssrl.vi v8, v4, 31, v0.t
# CHECK-INST: vssrl.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssrl.vi v8, v4, 31
# CHECK-INST: vssrl.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssra.vv v8, v4, v20, v0.t
# CHECK-INST: vssra.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssra.vv v8, v4, v20
# CHECK-INST: vssra.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssra.vx v8, v4, a0, v0.t
# CHECK-INST: vssra.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssra.vx v8, v4, a0
# CHECK-INST: vssra.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssra.vi v8, v4, 31, v0.t
# CHECK-INST: vssra.vi v8, v4, 31, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssra.vi v8, v4, 31
# CHECK-INST: vssra.vi v8, v4, 31
# CHECK-ENCODING: [0x57,0xb4,0x4f,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/sign-injection.s b/llvm/test/MC/RISCV/rvv/sign-injection.s
index 223048f35dfe53..4134321e58c4db 100644
--- a/llvm/test/MC/RISCV/rvv/sign-injection.s
+++ b/llvm/test/MC/RISCV/rvv/sign-injection.s
@@ -1,8 +1,7 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: --mattr=+f \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: --mattr=+f \
# RUN: | llvm-objdump -d --mattr=+v --mattr=+f - \
@@ -11,59 +10,59 @@
vfsgnj.vv v8, v4, v20, v0.t
# CHECK-INST: vfsgnj.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x20]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnj.vv v8, v4, v20
# CHECK-INST: vfsgnj.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x22]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnj.vf v8, v4, fa0, v0.t
# CHECK-INST: vfsgnj.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x20]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnj.vf v8, v4, fa0
# CHECK-INST: vfsgnj.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x22]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjn.vv v8, v4, v20, v0.t
# CHECK-INST: vfsgnjn.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x24]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjn.vv v8, v4, v20
# CHECK-INST: vfsgnjn.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x26]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjn.vf v8, v4, fa0, v0.t
# CHECK-INST: vfsgnjn.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjn.vf v8, v4, fa0
# CHECK-INST: vfsgnjn.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjx.vv v8, v4, v20, v0.t
# CHECK-INST: vfsgnjx.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0x28]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjx.vv v8, v4, v20
# CHECK-INST: vfsgnjx.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x4a,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjx.vf v8, v4, fa0, v0.t
# CHECK-INST: vfsgnjx.vf v8, v4, fa0, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0x28]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
vfsgnjx.vf v8, v4, fa0
# CHECK-INST: vfsgnjx.vf v8, v4, fa0
# CHECK-ENCODING: [0x57,0x54,0x45,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error-re at -3 {{instruction requires the following: 'V'{{.*}}'Zve32f' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/store.s b/llvm/test/MC/RISCV/rvv/store.s
index 911433e452261b..db08a222171f89 100644
--- a/llvm/test/MC/RISCV/rvv/store.s
+++ b/llvm/test/MC/RISCV/rvv/store.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: --M no-aliases | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v -M no-aliases - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,209 +8,209 @@
vsm.v v24, (a0)
# CHECK-INST: vsm.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse8.v v24, (a0), v0.t
# CHECK-INST: vse8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse8.v v24, (a0)
# CHECK-INST: vse8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse16.v v24, (a0), v0.t
# CHECK-INST: vse16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse16.v v24, (a0)
# CHECK-INST: vse16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse32.v v24, (a0), v0.t
# CHECK-INST: vse32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse32.v v24, (a0)
# CHECK-INST: vse32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse64.v v24, (a0), v0.t
# CHECK-INST: vse64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vse64.v v24, (a0)
# CHECK-INST: vse64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsse8.v v24, (a0), a1, v0.t
# CHECK-INST: vsse8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsse8.v v24, (a0), a1
# CHECK-INST: vsse8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsse16.v v24, (a0), a1, v0.t
# CHECK-INST: vsse16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsse16.v v24, (a0), a1
# CHECK-INST: vsse16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsse32.v v24, (a0), a1, v0.t
# CHECK-INST: vsse32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsse32.v v24, (a0), a1
# CHECK-INST: vsse32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsse64.v v24, (a0), a1, v0.t
# CHECK-INST: vsse64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsse64.v v24, (a0), a1
# CHECK-INST: vsse64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxei8.v v24, (a0), v4
# CHECK-INST: vsuxei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxei16.v v24, (a0), v4
# CHECK-INST: vsuxei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxei32.v v24, (a0), v4
# CHECK-INST: vsuxei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxei64.v v24, (a0), v4
# CHECK-INST: vsuxei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x06]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxei8.v v24, (a0), v4
# CHECK-INST: vsoxei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxei16.v v24, (a0), v4
# CHECK-INST: vsoxei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxei32.v v24, (a0), v4
# CHECK-INST: vsoxei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxei64.v v24, (a0), v4
# CHECK-INST: vsoxei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vs1r.v v24, (a0)
# CHECK-INST: vs1r.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x85,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vs2r.v v24, (a0)
# CHECK-INST: vs2r.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x85,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vs4r.v v24, (a0)
# CHECK-INST: vs4r.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x85,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vs8r.v v24, (a0)
# CHECK-INST: vs8r.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x85,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsm.v v24, 0(a0)
# CHECK-INST: vsm.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x02]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vse8.v v24, 0(a0), v0.t
# CHECK-INST: vse8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsse16.v v24, 0(a0), a1, v0.t
# CHECK-INST: vsse16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxei8.v v24, 0(a0), v4, v0.t
# CHECK-INST: vsuxei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x04]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxei32.v v24, 0(a0), v4, v0.t
# CHECK-INST: vsoxei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/sub.s b/llvm/test/MC/RISCV/rvv/sub.s
index daadf3f00d05b8..b5b0e9cd12b54f 100644
--- a/llvm/test/MC/RISCV/rvv/sub.s
+++ b/llvm/test/MC/RISCV/rvv/sub.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,249 +8,249 @@
vsub.vv v8, v4, v20, v0.t
# CHECK-INST: vsub.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsub.vv v8, v4, v20
# CHECK-INST: vsub.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsub.vx v8, v4, a0, v0.t
# CHECK-INST: vsub.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x08]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsub.vx v8, v4, a0
# CHECK-INST: vsub.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x0a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrsub.vx v8, v4, a0, v0.t
# CHECK-INST: vrsub.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrsub.vx v8, v4, a0
# CHECK-INST: vrsub.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrsub.vi v8, v4, 15, v0.t
# CHECK-INST: vrsub.vi v8, v4, 15, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x0c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vrsub.vi v8, v4, 15
# CHECK-INST: vrsub.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x0e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.vv v8, v4, v20, v0.t
# CHECK-INST: vwsubu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.vv v8, v4, v20
# CHECK-INST: vwsubu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.vx v8, v4, a0, v0.t
# CHECK-INST: vwsubu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.vx v8, v4, a0
# CHECK-INST: vwsubu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.vv v8, v4, v20, v0.t
# CHECK-INST: vwsub.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.vv v8, v4, v20
# CHECK-INST: vwsub.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.vx v8, v4, a0, v0.t
# CHECK-INST: vwsub.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.vx v8, v4, a0
# CHECK-INST: vwsub.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.wv v8, v4, v20, v0.t
# CHECK-INST: vwsubu.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xd8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.wv v8, v4, v20
# CHECK-INST: vwsubu.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xda]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.wx v8, v4, a0, v0.t
# CHECK-INST: vwsubu.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xd8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsubu.wx v8, v4, a0
# CHECK-INST: vwsubu.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xda]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.wv v8, v4, v20, v0.t
# CHECK-INST: vwsub.wv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xdc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.wv v8, v4, v20
# CHECK-INST: vwsub.wv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xde]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.wx v8, v4, a0, v0.t
# CHECK-INST: vwsub.wx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0xdc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vwsub.wx v8, v4, a0
# CHECK-INST: vwsub.wx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0xde]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsbc.vvm v8, v4, v20, v0
# CHECK-INST: vsbc.vvm v8, v4, v20, v0
# CHECK-ENCODING: [0x57,0x04,0x4a,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsbc.vvm v4, v4, v20, v0
# CHECK-INST: vsbc.vvm v4, v4, v20, v0
# CHECK-ENCODING: [0x57,0x02,0x4a,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsbc.vvm v8, v4, v8, v0
# CHECK-INST: vsbc.vvm v8, v4, v8, v0
# CHECK-ENCODING: [0x57,0x04,0x44,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsbc.vxm v8, v4, a0, v0
# CHECK-INST: vsbc.vxm v8, v4, a0, v0
# CHECK-ENCODING: [0x57,0x44,0x45,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbc.vvm v8, v4, v20, v0
# CHECK-INST: vmsbc.vvm v8, v4, v20, v0
# CHECK-ENCODING: [0x57,0x04,0x4a,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbc.vvm v4, v4, v20, v0
# CHECK-INST: vmsbc.vvm v4, v4, v20, v0
# CHECK-ENCODING: [0x57,0x02,0x4a,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbc.vvm v8, v4, v8, v0
# CHECK-INST: vmsbc.vvm v8, v4, v8, v0
# CHECK-ENCODING: [0x57,0x04,0x44,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbc.vxm v8, v4, a0, v0
# CHECK-INST: vmsbc.vxm v8, v4, a0, v0
# CHECK-ENCODING: [0x57,0x44,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbc.vv v8, v4, v20
# CHECK-INST: vmsbc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vmsbc.vx v8, v4, a0
# CHECK-INST: vmsbc.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssubu.vv v8, v4, v20, v0.t
# CHECK-INST: vssubu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssubu.vv v8, v4, v20
# CHECK-INST: vssubu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssubu.vx v8, v4, a0, v0.t
# CHECK-INST: vssubu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssubu.vx v8, v4, a0
# CHECK-INST: vssubu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssub.vv v8, v4, v20, v0.t
# CHECK-INST: vssub.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssub.vv v8, v4, v20
# CHECK-INST: vssub.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssub.vx v8, v4, a0, v0.t
# CHECK-INST: vssub.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssub.vx v8, v4, a0
# CHECK-INST: vssub.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasub.vv v8, v4, v20, v0.t
# CHECK-INST: vasub.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasub.vv v8, v4, v20
# CHECK-INST: vasub.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasub.vx v8, v4, a0, v0.t
# CHECK-INST: vasub.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasub.vx v8, v4, a0
# CHECK-INST: vasub.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasubu.vv v8, v4, v20, v0.t
# CHECK-INST: vasubu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasubu.vv v8, v4, v20
# CHECK-INST: vasubu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasubu.vx v8, v4, a0, v0.t
# CHECK-INST: vasubu.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x64,0x45,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vasubu.vx v8, v4, a0
# CHECK-INST: vasubu.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x64,0x45,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/vsetvl-alt.s b/llvm/test/MC/RISCV/rvv/vsetvl-alt.s
index 53eb60f9cf5ce6..a3e991d36004ed 100644
--- a/llvm/test/MC/RISCV/rvv/vsetvl-alt.s
+++ b/llvm/test/MC/RISCV/rvv/vsetvl-alt.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+zve32x %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve32x %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,19 +8,19 @@
vsetvli a2, a0, e8alt, m1, ta, ma
# CHECK-INST: vsetvli a2, a0, e8alt, m1, ta, ma
# CHECK-ENCODING: [0x57,0x76,0x05,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsetvli a2, a0, e16alt, m1, ta, ma
# CHECK-INST: vsetvli a2, a0, e16alt, m1, ta, ma
# CHECK-ENCODING: [0x57,0x76,0x85,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsetivli a2, 0, e8alt, m1, ta, ma
# CHECK-INST: vsetivli a2, 0, e8alt, m1, ta, ma
# CHECK-ENCODING: [0x57,0x76,0x00,0xdc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsetivli a2, 0, e16alt, m1, ta, ma
# CHECK-INST: vsetivli a2, 0, e16alt, m1, ta, ma
# CHECK-ENCODING: [0x57,0x76,0x80,0xdc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/xor.s b/llvm/test/MC/RISCV/rvv/xor.s
index cb332aba5e32d9..84867421aadc77 100644
--- a/llvm/test/MC/RISCV/rvv/xor.s
+++ b/llvm/test/MC/RISCV/rvv/xor.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,39 +8,39 @@
vxor.vv v8, v4, v20, v0.t
# CHECK-INST: vxor.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x04,0x4a,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vxor.vv v8, v4, v20
# CHECK-INST: vxor.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x4a,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vxor.vx v8, v4, a0, v0.t
# CHECK-INST: vxor.vx v8, v4, a0, v0.t
# CHECK-ENCODING: [0x57,0x44,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vxor.vx v8, v4, a0
# CHECK-INST: vxor.vx v8, v4, a0
# CHECK-ENCODING: [0x57,0x44,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vxor.vi v8, v4, 15, v0.t
# CHECK-INST: vxor.vi v8, v4, 15, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x47,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vxor.vi v8, v4, 15
# CHECK-INST: vxor.vi v8, v4, 15
# CHECK-ENCODING: [0x57,0xb4,0x47,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnot.v v8, v4, v0.t
# CHECK-INST: vnot.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vnot.v v8, v4
# CHECK-INST: vnot.v v8, v4
# CHECK-ENCODING: [0x57,0xb4,0x4f,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/xsfmm-invalid.s b/llvm/test/MC/RISCV/rvv/xsfmm-invalid.s
index d4b2d542375533..56fddb29dcbe91 100644
--- a/llvm/test/MC/RISCV/rvv/xsfmm-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/xsfmm-invalid.s
@@ -1,30 +1,26 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+xsfmmbase, \
-# RUN: --mattr=+xsfmm32a8i,+xsfmm32a32f,+xsfmm32a8f,+xsfmm64a64f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK
-# RUN: not llvm-mc -triple=riscv64 --mattr=+xsfmmbase, \
-# RUN: --mattr=+xsfmm32a8i,+xsfmm32a32f,+xsfmm32a8f,+xsfmm64a64f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK
+# RUN: llvm-mc --verify -triple=riscv32 --mattr=+xsfmmbase, --mattr=+xsfmm32a8i,+xsfmm32a32f,+xsfmm32a8f,+xsfmm64a64f %s
+# RUN: llvm-mc --verify -triple=riscv64 --mattr=+xsfmmbase, --mattr=+xsfmm32a8i,+xsfmm32a32f,+xsfmm32a8f,+xsfmm64a64f %s
-sf.vsettnt a0, a1, e128, w1 # CHECK: :[[@LINE]]:20: error: operand must be e[8|16|16alt|32|64],w[1|2|4]
+sf.vsettnt a0, a1, e128, w1 # expected-error:20 {{operand must be e[8|16|16alt|32|64],w[1|2|4]}}
-sf.vsettnt a0, a1, e8alt, w1 # CHECK: :[[@LINE]]:20: error: operand must be e[8|16|16alt|32|64],w[1|2|4]
+sf.vsettnt a0, a1, e8alt, w1 # expected-error:20 {{operand must be e[8|16|16alt|32|64],w[1|2|4]}}
-sf.vsettnt a0, a1, e16alt, w1, a2 # CHECK: :[[@LINE]]:20: error: operand must be e[8|16|16alt|32|64],w[1|2|4]
+sf.vsettnt a0, a1, e16alt, w1, a2 # expected-error:20 {{operand must be e[8|16|16alt|32|64],w[1|2|4]}}
-sf.mm.f.f mt1, v8, v9 # CHECK: :[[@LINE]]:11: error: invalid operand for instruction
+sf.mm.f.f mt1, v8, v9 # expected-error:11 {{invalid operand for instruction}}
-sf.mm.e5m2.e5m2 mt2, v8, v9 # CHECK: :[[@LINE]]:17: error: invalid operand for instruction
+sf.mm.e5m2.e5m2 mt2, v8, v9 # expected-error:17 {{invalid operand for instruction}}
-sf.mm.e5m2.e4m3 mt6, v8, v9 # CHECK: :[[@LINE]]:17: error: invalid operand for instruction
+sf.mm.e5m2.e4m3 mt6, v8, v9 # expected-error:17 {{invalid operand for instruction}}
-sf.mm.e4m3.e5m2 mt10, v8, v9 # CHECK: :[[@LINE]]:17: error: invalid operand for instruction
+sf.mm.e4m3.e5m2 mt10, v8, v9 # expected-error:17 {{invalid operand for instruction}}
-sf.mm.e4m3.e4m3 mt14, v8, v9 # CHECK: :[[@LINE]]:17: error: invalid operand for instruction
+sf.mm.e4m3.e4m3 mt14, v8, v9 # expected-error:17 {{invalid operand for instruction}}
-sf.mm.u.u mt1, v8, v9 # CHECK: :[[@LINE]]:11: error: invalid operand for instruction
+sf.mm.u.u mt1, v8, v9 # expected-error:11 {{invalid operand for instruction}}
-sf.mm.s.u mt2, v8, v9 # CHECK: :[[@LINE]]:11: error: invalid operand for instruction
+sf.mm.s.u mt2, v8, v9 # expected-error:11 {{invalid operand for instruction}}
-sf.mm.u.s mt3, v8, v9 # CHECK: :[[@LINE]]:11: error: invalid operand for instruction
+sf.mm.u.s mt3, v8, v9 # expected-error:11 {{invalid operand for instruction}}
-sf.mm.s.s mt1, v8, v9 # CHECK: :[[@LINE]]:11: error: invalid operand for instruction
+sf.mm.s.s mt1, v8, v9 # expected-error:11 {{invalid operand for instruction}}
diff --git a/llvm/test/MC/RISCV/rvv/xsfmm.s b/llvm/test/MC/RISCV/rvv/xsfmm.s
index 5594d749b9ec94..beb9e22ddd77ca 100644
--- a/llvm/test/MC/RISCV/rvv/xsfmm.s
+++ b/llvm/test/MC/RISCV/rvv/xsfmm.s
@@ -4,10 +4,8 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+xsfmmbase, \
# RUN: --mattr=+xsfmm32a32f,+xsfmm32a8i,+xsfmm32a8f,+xsfmm64a64f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+xsfmmbase, \
# RUN: --mattr=+xsfmm32a32f,+xsfmm32a8i,+xsfmm32a8f,+xsfmm64a64f %s \
# RUN: | llvm-objdump -d --mattr=+xsfmmbase, \
@@ -21,145 +19,145 @@
# CHECK-INST: sf.vsettnt a0, a1, e8, w1
# CHECK-ENCODING: [0x57,0xf5,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vsettnt a0, a1, e8, w1
# CHECK-INST: sf.vsettnt a0, a1, e16alt, w1
# CHECK-ENCODING: [0x57,0xf5,0x85,0x30]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vsettnt a0, a1, e16alt, w1
# CHECK-INST: sf.vsettnt a0, a1, e8, w1
# CHECK-ENCODING: [0x57,0xf5,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)
+# expected-error at +1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsetvli a0, a1, 0x200
# CHECK-INST: sf.vsettnt a0, a1, e16alt, w1
# CHECK-ENCODING: [0x57,0xf5,0x85,0x30]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)
+# expected-error at +1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsetvli a0, a1, 0x308
# CHECK-INST: sf.vsettn a0, a1
# CHECK-ENCODING: [0x57,0xf5,0x05,0x84]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vsettn a0, a1
# CHECK-INST: sf.vsettm a0, a1
# CHECK-ENCODING: [0x57,0xf5,0x15,0x84]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vsettm a0, a1
# CHECK-INST: sf.vsettk a0, a1
# CHECK-ENCODING: [0x57,0xf5,0x25,0x84]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vsettk a0, a1
# CHECK-INST: sf.vlte8 a0, (a1)
# CHECK-ENCODING: [0x07,0xf0,0xa5,0x12]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vlte8 a0, (a1)
# CHECK-INST: sf.vlte16 a0, (a1)
# CHECK-ENCODING: [0x07,0xf0,0xa5,0x32]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vlte16 a0, (a1)
# CHECK-INST: sf.vlte32 a0, (a1)
# CHECK-ENCODING: [0x07,0xf0,0xa5,0x52]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vlte32 a0, (a1)
# CHECK-INST: sf.vlte64 a0, (a1)
# CHECK-ENCODING: [0x07,0xf0,0xa5,0x72]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vlte64 a0, (a1)
# CHECK-INST: sf.vste8 a0, (a1)
# CHECK-ENCODING: [0x27,0xf0,0xa5,0x12]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vste8 a0, (a1)
# CHECK-INST: sf.vste16 a0, (a1)
# CHECK-ENCODING: [0x27,0xf0,0xa5,0x32]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vste16 a0, (a1)
# CHECK-INST: sf.vste32 a0, (a1)
# CHECK-ENCODING: [0x27,0xf0,0xa5,0x52]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vste32 a0, (a1)
# CHECK-INST: sf.vste64 a0, (a1)
# CHECK-ENCODING: [0x27,0xf0,0xa5,0x72]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vste64 a0, (a1)
# CHECK-INST: sf.vtmv.v.t v8, a0
# CHECK-ENCODING: [0x57,0x64,0xf5,0x43]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vtmv.v.t v8, a0
# CHECK-INST: sf.vtmv.t.v a0, v8
# CHECK-ENCODING: [0x57,0x60,0x85,0x5e]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vtmv.t.v a0, v8
# CHECK-INST: sf.mm.f.f mt2, v8, v9
# CHECK-ENCODING: [0x77,0x92,0x84,0xf2]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a16f' (TEW=32-bit accumulation, operands - float: 16b, widen=2 (IEEE, BF)), or 'XSfmm32a32f' (TEW=32-bit accumulation, operands - float: 32b), or 'XSfmm64a64f' (TEW=64-bit accumulation, operands - float: fp64){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a16f' (TEW=32-bit accumulation, operands - float: 16b, widen=2 (IEEE, BF)), or 'XSfmm32a32f' (TEW=32-bit accumulation, operands - float: 32b), or 'XSfmm64a64f' (TEW=64-bit accumulation, operands - float: fp64)}}
sf.mm.f.f mt2, v8, v9
# CHECK-INST: sf.mm.e5m2.e5m2 mt0, v8, v9
# CHECK-ENCODING: [0x77,0x90,0x84,0xfa]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8)}}
sf.mm.e5m2.e5m2 mt0, v8, v9
# CHECK-INST: sf.mm.e5m2.e4m3 mt4, v8, v9
# CHECK-ENCODING: [0xf7,0x94,0x84,0xfa]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8)}}
sf.mm.e5m2.e4m3 mt4, v8, v9
# CHECK-INST: sf.mm.e4m3.e5m2 mt8, v8, v9
# CHECK-ENCODING: [0x77,0x98,0x84,0xfe]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8)}}
sf.mm.e4m3.e5m2 mt8, v8, v9
# CHECK-INST: sf.mm.e4m3.e4m3 mt12, v8, v9
# CHECK-ENCODING: [0xf7,0x9c,0x84,0xfe]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8f' (TEW=32-bit accumulation, operands - float: fp8)}}
sf.mm.e4m3.e4m3 mt12, v8, v9
# CHECK-INST: sf.mm.u.u mt0, v8, v9
# CHECK-ENCODING: [0x77,0x80,0x84,0xf2]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b)}}
sf.mm.u.u mt0, v8, v9
# CHECK-INST: sf.mm.s.u mt4, v8, v9
# CHECK-ENCODING: [0x77,0x84,0x84,0xf6]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b)}}
sf.mm.s.u mt4, v8, v9
# CHECK-INST: sf.mm.u.s mt8, v8, v9
# CHECK-ENCODING: [0xf7,0x88,0x84,0xf2]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b)}}
sf.mm.u.s mt8, v8, v9
# CHECK-INST: sf.mm.s.s mt12, v8, v9
# CHECK-ENCODING: [0xf7,0x8c,0x84,0xf6]
-# CHECK-ERROR: instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmm32a8i' (TEW=32-bit accumulation, operands - int: 8b)}}
sf.mm.s.s mt12, v8, v9
# CHECK-INST: sf.vtzero.t mt15
# CHECK-ENCODING: [0x57,0x6f,0xe0,0x43]
-# CHECK-ERROR: instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero){{$}}
+# expected-error at +1 {{instruction requires the following: 'XSfmmbase' (All non arithmetic instructions for all TEWs and sf.vtzero)}}
sf.vtzero.t mt15
# CHECK-INST: vsetvl a2, a0, a1
# CHECK-ENCODING: [0x57,0x76,0xb5,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)
+# expected-error at +1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsetvl a2, a0, a1
# CHECK-INST: vsetvli a0, a1, e8, m1, tu, mu
# CHECK-ENCODING: [0x57,0xf5,0x05,0x00]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)
+# expected-error at +1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsetvli a0, a1, e8, m1, tu, mu
diff --git a/llvm/test/MC/RISCV/rvv/xsfvcp.s b/llvm/test/MC/RISCV/rvv/xsfvcp.s
index 4396dba600b5b8..19a9b1c2a60b41 100644
--- a/llvm/test/MC/RISCV/rvv/xsfvcp.s
+++ b/llvm/test/MC/RISCV/rvv/xsfvcp.s
@@ -2,10 +2,8 @@
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v,+xsfvcp %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+v,+xsfvcp %s \
# RUN: | llvm-objdump -d --mattr=+v,+xsfvcp --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -16,139 +14,139 @@
sf.vc.x 0x3, 0xf, 0x1f, a1
# CHECK-INST: sf.vc.x 3, 15, 31, a1
# CHECK-ENCODING: [0xdb,0xcf,0xf5,0x0e]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.i 0x3, 0xf, 0x1f, 15
# CHECK-INST: sf.vc.i 3, 15, 31, 15
# CHECK-ENCODING: [0xdb,0xbf,0xf7,0x0e]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.vv 0x3, 0x1f, v2, v1
# CHECK-INST: sf.vc.vv 3, 31, v2, v1
# CHECK-ENCODING: [0xdb,0x8f,0x20,0x2e]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.xv 0x3, 0x1f, v2, a1
# CHECK-INST: sf.vc.xv 3, 31, v2, a1
# CHECK-ENCODING: [0xdb,0xcf,0x25,0x2e]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.iv 0x3, 0x1f, v2, 15
# CHECK-INST: sf.vc.iv 3, 31, v2, 15
# CHECK-ENCODING: [0xdb,0xbf,0x27,0x2e]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.fv 0x1, 0x1f, v2, fa1
# CHECK-INST: sf.vc.fv 1, 31, v2, fa1
# CHECK-ENCODING: [0xdb,0xdf,0x25,0x2e]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.vvv 0x3, v0, v2, v1
# CHECK-INST: sf.vc.vvv 3, v0, v2, v1
# CHECK-ENCODING: [0x5b,0x80,0x20,0xae]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.xvv 0x3, v0, v2, a1
# CHECK-INST: sf.vc.xvv 3, v0, v2, a1
# CHECK-ENCODING: [0x5b,0xc0,0x25,0xae]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.ivv 0x3, v0, v2, 15
# CHECK-INST: sf.vc.ivv 3, v0, v2, 15
# CHECK-ENCODING: [0x5b,0xb0,0x27,0xae]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.fvv 0x1, v0, v2, fa1
# CHECK-INST: sf.vc.fvv 1, v0, v2, fa1
# CHECK-ENCODING: [0x5b,0xd0,0x25,0xae]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.vvw 0x3, v0, v2, v1
# CHECK-INST: sf.vc.vvw 3, v0, v2, v1
# CHECK-ENCODING: [0x5b,0x80,0x20,0xfe]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.xvw 0x3, v0, v2, a1
# CHECK-INST: sf.vc.xvw 3, v0, v2, a1
# CHECK-ENCODING: [0x5b,0xc0,0x25,0xfe]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.ivw 0x3, v0, v2, 15
# CHECK-INST: sf.vc.ivw 3, v0, v2, 15
# CHECK-ENCODING: [0x5b,0xb0,0x27,0xfe]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.fvw 0x1, v0, v2, fa1
# CHECK-INST: sf.vc.fvw 1, v0, v2, fa1
# CHECK-ENCODING: [0x5b,0xd0,0x25,0xfe]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.x 0x3, 0xf, v0, a1
# CHECK-INST: sf.vc.v.x 3, 15, v0, a1
# CHECK-ENCODING: [0x5b,0xc0,0xf5,0x0c]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.i 0x3, 0xf, v0, 15
# CHECK-INST: sf.vc.v.i 3, 15, v0, 15
# CHECK-ENCODING: [0x5b,0xb0,0xf7,0x0c]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.vv 0x3, v0, v2, v1
# CHECK-INST: sf.vc.v.vv 3, v0, v2, v1
# CHECK-ENCODING: [0x5b,0x80,0x20,0x2c]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.xv 0x3, v0, v2, a1
# CHECK-INST: sf.vc.v.xv 3, v0, v2, a1
# CHECK-ENCODING: [0x5b,0xc0,0x25,0x2c]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.iv 0x3, v0, v2, 15
# CHECK-INST: sf.vc.v.iv 3, v0, v2, 15
# CHECK-ENCODING: [0x5b,0xb0,0x27,0x2c]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.fv 0x1, v0, v2, fa1
# CHECK-INST: sf.vc.v.fv 1, v0, v2, fa1
# CHECK-ENCODING: [0x5b,0xd0,0x25,0x2c]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.vvv 0x3, v0, v2, v1
# CHECK-INST: sf.vc.v.vvv 3, v0, v2, v1
# CHECK-ENCODING: [0x5b,0x80,0x20,0xac]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.xvv 0x3, v0, v2, a1
# CHECK-INST: sf.vc.v.xvv 3, v0, v2, a1
# CHECK-ENCODING: [0x5b,0xc0,0x25,0xac]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.ivv 0x3, v0, v2, 15
# CHECK-INST: sf.vc.v.ivv 3, v0, v2, 15
# CHECK-ENCODING: [0x5b,0xb0,0x27,0xac]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.fvv 0x1, v0, v2, fa1
# CHECK-INST: sf.vc.v.fvv 1, v0, v2, fa1
# CHECK-ENCODING: [0x5b,0xd0,0x25,0xac]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.vvw 0x3, v0, v2, v1
# CHECK-INST: sf.vc.v.vvw 3, v0, v2, v1
# CHECK-ENCODING: [0x5b,0x80,0x20,0xfc]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.xvw 0x3, v0, v2, a1
# CHECK-INST: sf.vc.v.xvw 3, v0, v2, a1
# CHECK-ENCODING: [0x5b,0xc0,0x25,0xfc]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.ivw 0x3, v0, v2, 15
# CHECK-INST: sf.vc.v.ivw 3, v0, v2, 15
# CHECK-ENCODING: [0x5b,0xb0,0x27,0xfc]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
sf.vc.v.fvw 0x1, v0, v2, fa1
# CHECK-INST: sf.vc.v.fvw 1, v0, v2, fa1
# CHECK-ENCODING: [0x5b,0xd0,0x25,0xfc]
-# CHECK-ERROR: instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'XSfvcp' (SiFive Custom Vector Coprocessor Interface Instructions)}}
diff --git a/llvm/test/MC/RISCV/rvv/xsfvfnrclip.s b/llvm/test/MC/RISCV/rvv/xsfvfnrclip.s
index 6a2e633a928900..6cb67c610da9ec 100644
--- a/llvm/test/MC/RISCV/rvv/xsfvfnrclip.s
+++ b/llvm/test/MC/RISCV/rvv/xsfvfnrclip.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v,+xsfvfnrclipxfqf %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v,+xsfvfnrclipxfqf %s \
# RUN: | llvm-objdump -d --mattr=+v,+xsfvfnrclipxfqf - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,19 +8,19 @@
sf.vfnrclip.xu.f.qf v4, v8, fa2
# CHECK-INST: sf.vfnrclip.xu.f.qf v4, v8, fa2
# CHECK-ENCODING: [0x5b,0x52,0x86,0x8a]
-# CHECK-ERROR: instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)
+# expected-error at -3 {{instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)}}
sf.vfnrclip.xu.f.qf v4, v8, fa2, v0.t
# CHECK-INST: sf.vfnrclip.xu.f.qf v4, v8, fa2
# CHECK-ENCODING: [0x5b,0x52,0x86,0x88]
-# CHECK-ERROR: instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)
+# expected-error at -3 {{instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)}}
sf.vfnrclip.x.f.qf v4, v8, fa2
# CHECK-INST: sf.vfnrclip.x.f.qf v4, v8, fa2
# CHECK-ENCODING: [0x5b,0x52,0x86,0x8e]
-# CHECK-ERROR: instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)
+# expected-error at -3 {{instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)}}
sf.vfnrclip.x.f.qf v4, v8, fa2, v0.t
# CHECK-INST: sf.vfnrclip.x.f.qf v4, v8, fa2
# CHECK-ENCODING: [0x5b,0x52,0x86,0x8c]
-# CHECK-ERROR: instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)
+# expected-error at -3 {{instruction requires the following: 'XSfvfnrclipxfqf' (SiFive FP32-to-int8 Ranged Clip Instructions)}}
diff --git a/llvm/test/MC/RISCV/rvv/xsfvfwmacc.s b/llvm/test/MC/RISCV/rvv/xsfvfwmacc.s
index 6fad0ef050042c..3e688cc53d93c9 100644
--- a/llvm/test/MC/RISCV/rvv/xsfvfwmacc.s
+++ b/llvm/test/MC/RISCV/rvv/xsfvfwmacc.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v,+xsfvfwmaccqqq %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v,+xsfvfwmaccqqq %s \
# RUN: | llvm-objdump -d --mattr=+v,+xsfvfwmaccqqq - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,9 +8,9 @@
sf.vfwmacc.4x4x4 v8, v4, v20
# CHECK-INST: sf.vfwmacc.4x4x4 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x14,0x42,0xf3]
-# CHECK-ERROR: instruction requires the following: 'XSfvfwmaccqqq' (SiFive Matrix Multiply Accumulate Instruction (4-by-4))
+# expected-error at -3 {{instruction requires the following: 'XSfvfwmaccqqq' (SiFive Matrix Multiply Accumulate Instruction (4-by-4))}}
sf.vfwmacc.4x4x4 v0, v4, v20
# CHECK-INST: sf.vfwmacc.4x4x4 v0, v4, v20
# CHECK-ENCODING: [0x5b,0x10,0x42,0xf3]
-# CHECK-ERROR: instruction requires the following: 'XSfvfwmaccqqq' (SiFive Matrix Multiply Accumulate Instruction (4-by-4))
+# expected-error at -3 {{instruction requires the following: 'XSfvfwmaccqqq' (SiFive Matrix Multiply Accumulate Instruction (4-by-4))}}
diff --git a/llvm/test/MC/RISCV/rvv/xsfvqmacc.s b/llvm/test/MC/RISCV/rvv/xsfvqmacc.s
index 106ba8a226ac59..58a6690dac8897 100644
--- a/llvm/test/MC/RISCV/rvv/xsfvqmacc.s
+++ b/llvm/test/MC/RISCV/rvv/xsfvqmacc.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v,+xsfvqmaccqoq,+xsfvqmaccdod %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v,+xsfvqmaccqoq,+xsfvqmaccdod %s \
# RUN: | llvm-objdump -d --mattr=+v,+xsfvqmaccqoq,+xsfvqmaccdod - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,44 +8,44 @@
sf.vqmaccu.2x8x2 v8, v4, v20
# CHECK-INST: sf.vqmaccu.2x8x2 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xb3]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))}}
sf.vqmacc.2x8x2 v8, v4, v20
# CHECK-INST: sf.vqmacc.2x8x2 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xb7]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))}}
sf.vqmaccus.2x8x2 v8, v4, v20
# CHECK-INST: sf.vqmaccus.2x8x2 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xbb]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))}}
sf.vqmaccsu.2x8x2 v8, v4, v20
# CHECK-INST: sf.vqmaccsu.2x8x2 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xbf]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccdod' (SiFive Int8 Matrix Multiplication Instructions (2-by-8 and 8-by-2))}}
sf.vqmaccu.4x8x4 v8, v4, v20
# CHECK-INST: sf.vqmaccu.4x8x4 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xf3]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))}}
sf.vqmacc.4x8x4 v8, v4, v20
# CHECK-INST: sf.vqmacc.4x8x4 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xf7]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))}}
sf.vqmaccus.4x8x4 v8, v4, v20
# CHECK-INST: sf.vqmaccus.4x8x4 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xfb]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))}}
sf.vqmaccsu.4x8x4 v8, v4, v20
# CHECK-INST: sf.vqmaccsu.4x8x4 v8, v4, v20
# CHECK-ENCODING: [0x5b,0x24,0x42,0xff]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))}}
sf.vqmaccu.4x8x4 v0, v4, v20
# CHECK-INST: sf.vqmaccu.4x8x4 v0, v4, v20
# CHECK-ENCODING: [0x5b,0x20,0x42,0xf3]
-# CHECK-ERROR: instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))
+# expected-error at -3 {{instruction requires the following: 'XSfvqmaccqoq' (SiFive Int8 Matrix Multiplication Instructions (4-by-8 and 8-by-4))}}
diff --git a/llvm/test/MC/RISCV/rvv/zvabd.s b/llvm/test/MC/RISCV/rvv/zvabd.s
index 1afaaa7c49113b..c5256147050851 100644
--- a/llvm/test/MC/RISCV/rvv/zvabd.s
+++ b/llvm/test/MC/RISCV/rvv/zvabd.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+v --mattr=+experimental-zvabd %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+v --mattr=+experimental-zvabd %s \
# RUN: | llvm-objdump -d --mattr=+v --mattr=+experimental-zvabd --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,89 +8,89 @@
vabs.v v9, v8
# CHECK-INST: vabs.v v9, v8
# CHECK-ENCODING: [0xd7,0x64,0x80,0x56]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabs.v v9, v8, v0.t
# CHECK-INST: vabs.v v9, v8, v0.t
# CHECK-ENCODING: [0xd7,0x64,0x80,0x54]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabd.vv v10, v9, v8
# CHECK-INST: vabd.vv v10, v9, v8
# CHECK-ENCODING: [0x57,0x25,0x94,0x56]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabd.vv v10, v9, v8, v0.t
# CHECK-INST: vabd.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x25,0x94,0x54]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabd.vx v10, v9, a0
# CHECK-INST: vabd.vx v10, v9, a0
# CHECK-ENCODING: [0x57,0x65,0x95,0x56]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabd.vx v10, v9, a0, v0.t
# CHECK-INST: vabd.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x65,0x95,0x54]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabdu.vv v10, v9, v8
# CHECK-INST: vabdu.vv v10, v9, v8
# CHECK-ENCODING: [0x57,0x25,0x94,0x5a]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabdu.vv v10, v9, v8, v0.t
# CHECK-INST: vabdu.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x25,0x94,0x58]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabdu.vx v10, v9, a0
# CHECK-INST: vabdu.vx v10, v9, a0
# CHECK-ENCODING: [0x57,0x65,0x95,0x5a]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vabdu.vx v10, v9, a0, v0.t
# CHECK-INST: vabdu.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x65,0x95,0x58]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabda.vv v10, v9, v8
# CHECK-INST: vwabda.vv v10, v9, v8
# CHECK-ENCODING: [0x57,0x05,0x94,0xf6]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabda.vv v10, v9, v8, v0.t
# CHECK-INST: vwabda.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x05,0x94,0xf4]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabda.vx v10, v9, a0
# CHECK-INST: vwabda.vx v10, v9, a0
# CHECK-ENCODING: [0x57,0x45,0x95,0xf6]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabda.vx v10, v9, a0, v0.t
# CHECK-INST: vwabda.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x45,0x95,0xf4]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabdau.vv v10, v9, v8
# CHECK-INST: vwabdau.vv v10, v9, v8
# CHECK-ENCODING: [0x57,0x05,0x94,0xfa]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabdau.vv v10, v9, v8, v0.t
# CHECK-INST: vwabdau.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x05,0x94,0xf8]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabdau.vx v10, v9, a0
# CHECK-INST: vwabdau.vx v10, v9, a0
# CHECK-ENCODING: [0x57,0x45,0x95,0xfa]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
vwabdau.vx v10, v9, a0, v0.t
# CHECK-INST: vwabdau.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x45,0x95,0xf8]
-# CHECK-ERROR: instruction requires the following: 'Zvabd' (Vector Absolute Difference){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvabd' (Vector Absolute Difference)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvbb.s b/llvm/test/MC/RISCV/rvv/zvbb.s
index 87bf114fce1756..b37d587270edd3 100644
--- a/llvm/test/MC/RISCV/rvv/zvbb.s
+++ b/llvm/test/MC/RISCV/rvv/zvbb.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+zvbb %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+zvbb %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --mattr=+zvbb --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,34 +8,34 @@
vbrev.v v10, v9, v0.t
# CHECK-INST: vbrev.v v10, v9, v0.t
# CHECK-ENCODING: [0x57,0x25,0x95,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions)}}
vclz.v v10, v9, v0.t
# CHECK-INST: vclz.v v10, v9, v0.t
# CHECK-ENCODING: [0x57,0x25,0x96,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions)}}
vcpop.v v10, v9, v0.t
# CHECK-INST: vcpop.v v10, v9, v0.t
# CHECK-ENCODING: [0x57,0x25,0x97,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions)}}
vctz.v v10, v9, v0.t
# CHECK-INST: vctz.v v10, v9, v0.t
# CHECK-ENCODING: [0x57,0xa5,0x96,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions)}}
vwsll.vv v10, v9, v8, v0.t
# CHECK-INST: vwsll.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x05,0x94,0xd4]
-# CHECK-ERROR: instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions)}}
vwsll.vx v10, v9, a0, v0.t
# CHECK-INST: vwsll.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x45,0x95,0xd4]
-# CHECK-ERROR: instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions)}}
vwsll.vi v10, v9, 29, v0.t
# CHECK-INST: vwsll.vi v10, v9, 29, v0.t
# CHECK-ENCODING: [0x57,0xb5,0x9e,0xd4]
-# CHECK-ERROR: instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbb' (Vector basic bit-manipulation instructions)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvbc.s b/llvm/test/MC/RISCV/rvv/zvbc.s
index a64f85690f8890..09604acc8654a3 100644
--- a/llvm/test/MC/RISCV/rvv/zvbc.s
+++ b/llvm/test/MC/RISCV/rvv/zvbc.s
@@ -1,14 +1,12 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve64x --mattr=+zvbc %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve64x --mattr=+zvbc %s \
# RUN: | llvm-objdump -d --mattr=+zve64x --mattr=+zvbc - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+experimental-zvbc32e %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+experimental-zvbc32e %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --mattr=+experimental-zvbc32e - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -16,19 +14,19 @@
vclmul.vv v10, v9, v8
# CHECK-INST: vclmul.vv v10, v9, v8
# CHECK-ENCODING: [0x57,0x25,0x94,0x32]
-# CHECK-ERROR: instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication)}}
vclmul.vx v10, v9, a0
# CHECK-INST: vclmul.vx v10, v9, a0
# CHECK-ENCODING: [0x57,0x65,0x95,0x32]
-# CHECK-ERROR: instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication)}}
vclmulh.vv v10, v9, v8
# CHECK-INST: vclmulh.vv v10, v9, v8
# CHECK-ENCODING: [0x57,0x25,0x94,0x36]
-# CHECK-ERROR: instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication)}}
vclmulh.vx v10, v9, a0
# CHECK-INST: vclmulh.vx v10, v9, a0
# CHECK-ENCODING: [0x57,0x65,0x95,0x36]
-# CHECK-ERROR: instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvbc' or 'Zvbc32e' (Vector Carryless Multiplication)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvdot4a8i.s b/llvm/test/MC/RISCV/rvv/zvdot4a8i.s
index fe217bb6d72f69..65046c707821b8 100644
--- a/llvm/test/MC/RISCV/rvv/zvdot4a8i.s
+++ b/llvm/test/MC/RISCV/rvv/zvdot4a8i.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-zvdot4a8i %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+experimental-zvdot4a8i %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvdot4a8i - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,69 +8,69 @@
vdot4a.vv v8, v4, v20, v0.t
# CHECK-INST: vdot4a.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xb0]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4a.vv v8, v4, v20
# CHECK-INST: vdot4a.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xb2]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4au.vv v8, v4, v20, v0.t
# CHECK-INST: vdot4au.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xa0]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4au.vv v8, v4, v20
# CHECK-INST: vdot4au.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4asu.vv v8, v4, v20, v0.t
# CHECK-INST: vdot4asu.vv v8, v4, v20, v0.t
# CHECK-ENCODING: [0x57,0x24,0x4a,0xa8]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4asu.vv v8, v4, v20
# CHECK-INST: vdot4asu.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x24,0x4a,0xaa]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4a.vx v8, v4, s4, v0.t
# CHECK-INST: vdot4a.vx v8, v4, s4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x4a,0xb0]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4a.vx v8, v4, s4
# CHECK-INST: vdot4a.vx v8, v4, s4
# CHECK-ENCODING: [0x57,0x64,0x4a,0xb2]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4au.vx v8, v4, s4, v0.t
# CHECK-INST: vdot4au.vx v8, v4, s4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x4a,0xa0]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4au.vx v8, v4, s4
# CHECK-INST: vdot4au.vx v8, v4, s4
# CHECK-ENCODING: [0x57,0x64,0x4a,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4asu.vx v8, v4, s4, v0.t
# CHECK-INST: vdot4asu.vx v8, v4, s4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x4a,0xa8]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4asu.vx v8, v4, s4
# CHECK-INST: vdot4asu.vx v8, v4, s4
# CHECK-ENCODING: [0x57,0x64,0x4a,0xaa]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4aus.vx v8, v4, s4, v0.t
# CHECK-INST: vdot4aus.vx v8, v4, s4, v0.t
# CHECK-ENCODING: [0x57,0x64,0x4a,0xb8]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
vdot4aus.vx v8, v4, s4
# CHECK-INST: vdot4aus.vx v8, v4, s4
# CHECK-ENCODING: [0x57,0x64,0x4a,0xba]
-# CHECK-ERROR: instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvfbdota32f-invalid.s b/llvm/test/MC/RISCV/rvv/zvfbdota32f-invalid.s
index 84c94c782ad546..b4e38cf9f352ab 100644
--- a/llvm/test/MC/RISCV/rvv/zvfbdota32f-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/zvfbdota32f-invalid.s
@@ -1,21 +1,20 @@
-# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-zvfbdota32f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+experimental-zvfbdota32f %s
# Invalid vsetvli
-# CHECK-ERROR: operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]
+# expected-error at +1 {{operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]}}
vsetvli a0, zero, e888, m1, ta, ma
# Invalid ci
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vfbdota.vv v8, v16, v12, 4
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vfbdota.vv v8, v16, v12, 64
# Invalid vs2
-# CHECK-ERROR: invalid operand for instruction{{$}}
+# expected-error at +1 {{invalid operand for instruction}}
vfbdota.vv v8, v17, v12, 8
# Invalid vs2 and ci
-# CHECK-ERROR: :[[@LINE+1]]:16: error: invalid operand for instruction{{$}}
+# expected-error at +1:16 {{invalid operand for instruction}}
vfbdota.vv v8, v17, v12, 4
diff --git a/llvm/test/MC/RISCV/rvv/zvfbdota32f.s b/llvm/test/MC/RISCV/rvv/zvfbdota32f.s
index 5dde3d96d3a2d6..72cc974e609838 100644
--- a/llvm/test/MC/RISCV/rvv/zvfbdota32f.s
+++ b/llvm/test/MC/RISCV/rvv/zvfbdota32f.s
@@ -1,17 +1,16 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding -mattr=+experimental-zvfbdota32f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding -mattr=+v %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding -mattr=+v %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj -mattr=+experimental-zvfbdota32f %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvfbdota32f --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# CHECK-INST: vfbdota.vv v8, v16, v12, 8
# CHECK-ENCODING: [0x77,0x14,0x16,0xaf]
-# CHECK-ERROR: instruction requires the following: 'Zvfbdota32f' (FP32 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbdota32f' (FP32 batched dot-product extension)}}
vfbdota.vv v8, v16, v12, 8
# CHECK-INST: vfbdota.vv v8, v16, v12, 16, v0.t
# CHECK-ENCODING: [0x77,0x14,0x26,0xad]
-# CHECK-ERROR: instruction requires the following: 'Zvfbdota32f' (FP32 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbdota32f' (FP32 batched dot-product extension)}}
vfbdota.vv v8, v16, v12, 16, v0.t
diff --git a/llvm/test/MC/RISCV/rvv/zvfbfmin.s b/llvm/test/MC/RISCV/rvv/zvfbfmin.s
index 0efd2564e64830..39d011574295cb 100644
--- a/llvm/test/MC/RISCV/rvv/zvfbfmin.s
+++ b/llvm/test/MC/RISCV/rvv/zvfbfmin.s
@@ -1,34 +1,32 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding -mattr=+zvfbfmin %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding -mattr=+v,+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding -mattr=+v,+f %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj -mattr=+zvfbfmin %s \
# RUN: | llvm-objdump -d --mattr=+zvfbfmin - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# RUN: llvm-mc -triple=riscv64 -show-encoding -mattr=+zvfbfmin %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding -mattr=+v,+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding -mattr=+v,+f %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj -mattr=+zvfbfmin %s \
# RUN: | llvm-objdump -d --mattr=+zvfbfmin - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# CHECK-INST: vfncvtbf16.f.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x4e,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts)}}
vfncvtbf16.f.f.w v8, v4, v0.t
# CHECK-INST: vfncvtbf16.f.f.w v8, v4
# CHECK-ENCODING: [0x57,0x94,0x4e,0x4a]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts)}}
vfncvtbf16.f.f.w v8, v4
# CHECK-INST: vfwcvtbf16.f.f.v v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x46,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts)}}
vfwcvtbf16.f.f.v v8, v4, v0.t
# CHECK-INST: vfwcvtbf16.f.f.v v8, v4
# CHECK-ENCODING: [0x57,0x94,0x46,0x4a]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfmin' (Vector BF16 Converts) or 'Zvfofp8min' (Vector OFP8 Converts)}}
vfwcvtbf16.f.f.v v8, v4
diff --git a/llvm/test/MC/RISCV/rvv/zvfbfwma-invalid.s b/llvm/test/MC/RISCV/rvv/zvfbfwma-invalid.s
index 7b8dd3e31570af..ad4705615aad4f 100644
--- a/llvm/test/MC/RISCV/rvv/zvfbfwma-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/zvfbfwma-invalid.s
@@ -1,10 +1,8 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zvfbfwma,+d < %s 2>&1 | \
-# RUN: FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zvfbfwma,+d < %s 2>&1 | \
-# RUN: FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zvfbfwma,+d < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zvfbfwma,+d < %s
# Attempting to use fcvt instructions from zfhmin
-fcvt.s.h fa0, ft0 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
-fcvt.h.s ft2, fa2 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
-fcvt.d.h fa0, ft0 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
-fcvt.h.d ft2, fa2 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
+fcvt.s.h fa0, ft0 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+fcvt.h.s ft2, fa2 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+fcvt.d.h fa0, ft0 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+fcvt.h.d ft2, fa2 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvfbfwma.s b/llvm/test/MC/RISCV/rvv/zvfbfwma.s
index ecd8fabfb5f8a7..2f34f41567e0c0 100644
--- a/llvm/test/MC/RISCV/rvv/zvfbfwma.s
+++ b/llvm/test/MC/RISCV/rvv/zvfbfwma.s
@@ -1,34 +1,32 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding -mattr=+zvfbfwma %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding -mattr=+v,+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding -mattr=+v,+f %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj -mattr=+zvfbfwma %s \
# RUN: | llvm-objdump -d --mattr=+zvfbfwma --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# RUN: llvm-mc -triple=riscv64 -show-encoding -mattr=+zvfbfwma %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding -mattr=+v,+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding -mattr=+v,+f %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj -mattr=+zvfbfwma %s \
# RUN: | llvm-objdump -d --mattr=+zvfbfwma --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# CHECK-INST: vfwmaccbf16.vv v8, v20, v4, v0.t
# CHECK-ENCODING: [0x57,0x14,0x4a,0xec]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add)}}
vfwmaccbf16.vv v8, v20, v4, v0.t
# CHECK-INST: vfwmaccbf16.vv v8, v20, v4
# CHECK-ENCODING: [0x57,0x14,0x4a,0xee]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add)}}
vfwmaccbf16.vv v8, v20, v4
# CHECK-INST: vfwmaccbf16.vf v8, fa0, v4, v0.t
# CHECK-ENCODING: [0x57,0x54,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add)}}
vfwmaccbf16.vf v8, fa0, v4, v0.t
# CHECK-INST: vfwmaccbf16.vf v8, fa0, v4
# CHECK-ENCODING: [0x57,0x54,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfbfwma' (Vector BF16 widening mul-add)}}
vfwmaccbf16.vf v8, fa0, v4
diff --git a/llvm/test/MC/RISCV/rvv/zvfofp8min.s b/llvm/test/MC/RISCV/rvv/zvfofp8min.s
index 57139ddadebc33..ffb599d5371dba 100644
--- a/llvm/test/MC/RISCV/rvv/zvfofp8min.s
+++ b/llvm/test/MC/RISCV/rvv/zvfofp8min.s
@@ -1,29 +1,27 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding -mattr=+experimental-zvfofp8min %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding -mattr=+v,+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding -mattr=+v,+f %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj -mattr=+experimental-zvfofp8min %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvfofp8min - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# RUN: llvm-mc -triple=riscv64 -show-encoding -mattr=+experimental-zvfofp8min %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding -mattr=+v,+f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding -mattr=+v,+f %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj -mattr=+experimental-zvfofp8min %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvfofp8min - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
# CHECK-INST: vfncvtbf16.sat.f.f.w v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x4f,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvfofp8min' (Vector OFP8 Converts){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfofp8min' (Vector OFP8 Converts)}}
vfncvtbf16.sat.f.f.w v8, v4, v0.t
# CHECK-INST: vfncvt.f.f.q v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x4c,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvfofp8min' (Vector OFP8 Converts){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfofp8min' (Vector OFP8 Converts)}}
vfncvt.f.f.q v8, v4, v0.t
# CHECK-INST: vfncvt.sat.f.f.q v8, v4, v0.t
# CHECK-ENCODING: [0x57,0x94,0x4d,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvfofp8min' (Vector OFP8 Converts){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfofp8min' (Vector OFP8 Converts)}}
vfncvt.sat.f.f.q v8, v4, v0.t
diff --git a/llvm/test/MC/RISCV/rvv/zvfqwbdota8f-invalid.s b/llvm/test/MC/RISCV/rvv/zvfqwbdota8f-invalid.s
index 91006575948ffc..8c5582bfb2d335 100644
--- a/llvm/test/MC/RISCV/rvv/zvfqwbdota8f-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/zvfqwbdota8f-invalid.s
@@ -1,21 +1,20 @@
-# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-zvfqwbdota8f %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+experimental-zvfqwbdota8f %s
# Invalid vsetvli
-# CHECK-ERROR: operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]{{$}}
+# expected-error at +1 {{operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]}}
vsetvli a0, zero, e888, m1, ta, ma
# Invalid ci
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vfqwbdota.vv v8, v16, v12, 4
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vfqwbdota.vv v8, v16, v12, 64
# Invalid vs2
-# CHECK-ERROR: invalid operand for instruction{{$}}
+# expected-error at +1 {{invalid operand for instruction}}
vfqwbdota.vv v8, v17, v12, 8
# Invalid vs2 and ci
-# CHECK-ERROR: :[[@LINE+1]]:18: error: invalid operand for instruction{{$}}
+# expected-error at +1:18 {{invalid operand for instruction}}
vfqwbdota.vv v8, v17, v12, 4
diff --git a/llvm/test/MC/RISCV/rvv/zvfqwbdota8f.s b/llvm/test/MC/RISCV/rvv/zvfqwbdota8f.s
index b379f82e6d0879..3ee9d96eddb551 100644
--- a/llvm/test/MC/RISCV/rvv/zvfqwbdota8f.s
+++ b/llvm/test/MC/RISCV/rvv/zvfqwbdota8f.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding -mattr=+experimental-zvfqwbdota8f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding -mattr=+v %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding -mattr=+v %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj -mattr=+experimental-zvfqwbdota8f %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvfqwbdota8f --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -12,20 +11,20 @@ vsetvli zero, zero, e8alt, m1, ta, ma
# CHECK-INST: vfqwbdota.vv v8, v16, v12, 8
# CHECK-ENCODING: [0x77,0x14,0x16,0xbb]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension)}}
vfqwbdota.vv v8, v16, v12, 8
# CHECK-INST: vfqwbdota.vv v8, v16, v12, 16, v0.t
# CHECK-ENCODING: [0x77,0x14,0x26,0xb9]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension)}}
vfqwbdota.vv v8, v16, v12, 16, v0.t
# CHECK-INST: vfqwbdota.alt.vv v8, v16, v12, 8
# CHECK-ENCODING: [0x77,0x14,0x16,0xbf]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension)}}
vfqwbdota.alt.vv v8, v16, v12, 8
# CHECK-INST: vfqwbdota.alt.vv v8, v16, v12, 16, v0.t
# CHECK-ENCODING: [0x77,0x14,0x26,0xbd]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfqwbdota8f' (OCP FP8 batched dot-product extension)}}
vfqwbdota.alt.vv v8, v16, v12, 16, v0.t
diff --git a/llvm/test/MC/RISCV/rvv/zvfqwdota8f.s b/llvm/test/MC/RISCV/rvv/zvfqwdota8f.s
index 31140a9c4fb3a4..60672b6cda9c1d 100644
--- a/llvm/test/MC/RISCV/rvv/zvfqwdota8f.s
+++ b/llvm/test/MC/RISCV/rvv/zvfqwdota8f.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+v --mattr=+experimental-zvfqwdota8f %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+v --mattr=+experimental-zvfqwdota8f %s \
# RUN: | llvm-objdump -d --mattr=+v --mattr=+experimental-zvfqwdota8f --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,25 +8,25 @@
vsetvli a2, a0, e8alt, m1, ta, ma
# CHECK-INST: vsetvli a2, a0, e8alt, m1, ta, ma
# CHECK-ENCODING: [0x57,0x76,0x05,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vfqwdota.vv v10, v9, v8
# CHECK-INST: vfqwdota.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x15,0x94,0x9a]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)}}
vfqwdota.vv v10, v9, v8, v0.t
# CHECK-INST: vfqwdota.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x77,0x15,0x94,0x98]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)}}
vfqwdota.alt.vv v10, v9, v8
# CHECK-INST: vfqwdota.alt.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x15,0x94,0x9e]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)}}
vfqwdota.alt.vv v10, v9, v8, v0.t
# CHECK-INST: vfqwdota.alt.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x77,0x15,0x94,0x9c]
-# CHECK-ERROR: instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvfqwdota8f' (OCP FP8 Dot-Product)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvfwbdota16bf-invalid.s b/llvm/test/MC/RISCV/rvv/zvfwbdota16bf-invalid.s
index 979e588f83dc6c..080575d3b4f3bb 100644
--- a/llvm/test/MC/RISCV/rvv/zvfwbdota16bf-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/zvfwbdota16bf-invalid.s
@@ -1,21 +1,20 @@
-# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-zvfwbdota16bf %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+experimental-zvfwbdota16bf %s
# Invalid vsetvli
-# CHECK-ERROR: operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]{{$}}
+# expected-error at +1 {{operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]}}
vsetvli a0, zero, e888, m1, ta, ma
# Invalid ci
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vfwbdota.vv v8, v16, v12, 4
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vfwbdota.vv v8, v16, v12, 64
# Invalid vs2
-# CHECK-ERROR: invalid operand for instruction{{$}}
+# expected-error at +1 {{invalid operand for instruction}}
vfwbdota.vv v8, v17, v12, 8
# Invalid vs2 and ci
-# CHECK-ERROR: :[[@LINE+1]]:17: error: invalid operand for instruction{{$}}
+# expected-error at +1:17 {{invalid operand for instruction}}
vfwbdota.vv v8, v17, v12, 4
diff --git a/llvm/test/MC/RISCV/rvv/zvfwbdota16bf.s b/llvm/test/MC/RISCV/rvv/zvfwbdota16bf.s
index 66f8ac311a086d..a5baadf8e372e9 100644
--- a/llvm/test/MC/RISCV/rvv/zvfwbdota16bf.s
+++ b/llvm/test/MC/RISCV/rvv/zvfwbdota16bf.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding -mattr=+experimental-zvfwbdota16bf %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding -mattr=+v %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding -mattr=+v %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj -mattr=+experimental-zvfwbdota16bf %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvfwbdota16bf --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -12,10 +11,10 @@ vsetvli zero, zero, e16alt, m1, ta, ma
# CHECK-INST: vfwbdota.vv v8, v16, v12, 8
# CHECK-ENCODING: [0x77,0x14,0x16,0xb3]
-# CHECK-ERROR: instruction requires the following: 'Zvfwbdota16bf' (BF16 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfwbdota16bf' (BF16 batched dot-product extension)}}
vfwbdota.vv v8, v16, v12, 8
# CHECK-INST: vfwbdota.vv v8, v16, v12, 16, v0.t
# CHECK-ENCODING: [0x77,0x14,0x26,0xb1]
-# CHECK-ERROR: instruction requires the following: 'Zvfwbdota16bf' (BF16 batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvfwbdota16bf' (BF16 batched dot-product extension)}}
vfwbdota.vv v8, v16, v12, 16, v0.t
diff --git a/llvm/test/MC/RISCV/rvv/zvfwdota16bf.s b/llvm/test/MC/RISCV/rvv/zvfwdota16bf.s
index e1ff3c3d6d0ac1..ed7f731213ddd6 100644
--- a/llvm/test/MC/RISCV/rvv/zvfwdota16bf.s
+++ b/llvm/test/MC/RISCV/rvv/zvfwdota16bf.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+v --mattr=+experimental-zvfwdota16bf %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+v --mattr=+experimental-zvfwdota16bf %s \
# RUN: | llvm-objdump -d --mattr=+v --mattr=+experimental-zvfwdota16bf --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,14 +8,14 @@
vsetvli a2, a0, e16alt, m1, ta, ma
# CHECK-INST: vsetvli a2, a0, e16alt, m1, ta, ma
# CHECK-ENCODING: [0x57,0x76,0x85,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vfwdota.vv v10, v9, v8
# CHECK-INST: vfwdota.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x15,0x94,0x92]
-# CHECK-ERROR: instruction requires the following: 'Zvfwdota16bf' (BF16 Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvfwdota16bf' (BF16 Dot-Product)}}
vfwdota.vv v10, v9, v8, v0.t
# CHECK-INST: vfwdota.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x77,0x15,0x94,0x90]
-# CHECK-ERROR: instruction requires the following: 'Zvfwdota16bf' (BF16 Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvfwdota16bf' (BF16 Dot-Product)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvkb.s b/llvm/test/MC/RISCV/rvv/zvkb.s
index d65e4553106f40..f97e426e8a588c 100644
--- a/llvm/test/MC/RISCV/rvv/zvkb.s
+++ b/llvm/test/MC/RISCV/rvv/zvkb.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+zvkb %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+zvkb %s \
# RUN: | llvm-objdump --no-print-imm-hex -d --mattr=+zve32x --mattr=+zvkb - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,44 +8,44 @@
vandn.vv v10, v9, v8, v0.t
# CHECK-INST: vandn.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x05,0x94,0x04]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vandn.vx v10, v9, a0, v0.t
# CHECK-INST: vandn.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x45,0x95,0x04]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vbrev8.v v10, v9, v0.t
# CHECK-INST: vbrev8.v v10, v9, v0.t
# CHECK-ENCODING: [0x57,0x25,0x94,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vrev8.v v10, v9, v0.t
# CHECK-INST: vrev8.v v10, v9, v0.t
# CHECK-ENCODING: [0x57,0xa5,0x94,0x48]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vrol.vv v10, v9, v8, v0.t
# CHECK-INST: vrol.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x05,0x94,0x54]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vrol.vx v10, v9, a0, v0.t
# CHECK-INST: vrol.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x45,0x95,0x54]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vror.vv v10, v9, v8, v0.t
# CHECK-INST: vror.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x57,0x05,0x94,0x50]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vror.vx v10, v9, a0, v0.t
# CHECK-INST: vror.vx v10, v9, a0, v0.t
# CHECK-ENCODING: [0x57,0x45,0x95,0x50]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
vror.vi v10, v9, 33, v0.t
# CHECK-INST: vror.vi v10, v9, 33, v0.t
# CHECK-ENCODING: [0x57,0xb5,0x90,0x54]
-# CHECK-ERROR: instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkb' (Vector Bit-manipulation used in Cryptography)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvkg.s b/llvm/test/MC/RISCV/rvv/zvkg.s
index bd3d897ced10cd..7f70eca7b56e00 100644
--- a/llvm/test/MC/RISCV/rvv/zvkg.s
+++ b/llvm/test/MC/RISCV/rvv/zvkg.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+zvkg %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+zvkg %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --mattr=+zvkg - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,9 +8,9 @@
vghsh.vv v10, v9, v8
# CHECK-INST: vghsh.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x25,0x94,0xb2]
-# CHECK-ERROR: instruction requires the following: 'Zvkg' (Vector GCM instructions for Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkg' (Vector GCM instructions for Cryptography)}}
vgmul.vv v10, v9
# CHECK-INST: vgmul.vv v10, v9
# CHECK-ENCODING: [0x77,0xa5,0x98,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvkg' (Vector GCM instructions for Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkg' (Vector GCM instructions for Cryptography)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvkgs.s b/llvm/test/MC/RISCV/rvv/zvkgs.s
index 04377c2b097254..63bc4e97ba0ee0 100644
--- a/llvm/test/MC/RISCV/rvv/zvkgs.s
+++ b/llvm/test/MC/RISCV/rvv/zvkgs.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+experimental-zvkgs %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+experimental-zvkgs %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --mattr=+experimental-zvkgs - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,9 +8,9 @@
vghsh.vs v10, v9, v8
# CHECK-INST: vghsh.vs v10, v9, v8
# CHECK-ENCODING: [0x77,0x25,0x94,0x8e]
-# CHECK-ERROR: instruction requires the following: 'Zvkgs' (Vector-Scalar GCM instructions for Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkgs' (Vector-Scalar GCM instructions for Cryptography)}}
vgmul.vs v10, v9
# CHECK-INST: vgmul.vs v10, v9
# CHECK-ENCODING: [0x77,0xa5,0x98,0xa6]
-# CHECK-ERROR: instruction requires the following: 'Zvkgs' (Vector-Scalar GCM instructions for Cryptography){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkgs' (Vector-Scalar GCM instructions for Cryptography)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvkned.s b/llvm/test/MC/RISCV/rvv/zvkned.s
index 921f336a8e708f..01bb2882b910c0 100644
--- a/llvm/test/MC/RISCV/rvv/zvkned.s
+++ b/llvm/test/MC/RISCV/rvv/zvkned.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+zvkned %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+zvkned %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --mattr=+zvkned --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,74 +8,74 @@
vaesdf.vv v10, v9
# CHECK-INST: vaesdf.vv v10, v9
# CHECK-ENCODING: [0x77,0xa5,0x90,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesdf.vs v10, v9
# CHECK-INST: vaesdf.vs v10, v9
# CHECK-ENCODING: [0x77,0xa5,0x90,0xa6]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesef.vv v10, v9
# CHECK-INST: vaesef.vv v10, v9
# CHECK-ENCODING: [0x77,0xa5,0x91,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesef.vs v10, v9
# CHECK-INST: vaesef.vs v10, v9
# CHECK-ENCODING: [0x77,0xa5,0x91,0xa6]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesdm.vv v10, v9
# CHECK-INST: vaesdm.vv v10, v9
# CHECK-ENCODING: [0x77,0x25,0x90,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesdm.vs v10, v9
# CHECK-INST: vaesdm.vs v10, v9
# CHECK-ENCODING: [0x77,0x25,0x90,0xa6]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesem.vv v10, v9
# CHECK-INST: vaesem.vv v10, v9
# CHECK-ENCODING: [0x77,0x25,0x91,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesem.vs v10, v9
# CHECK-INST: vaesem.vs v10, v9
# CHECK-ENCODING: [0x77,0x25,0x91,0xa6]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaeskf1.vi v10, v9, 1
# CHECK-INST: vaeskf1.vi v10, v9, 1
# CHECK-ENCODING: [0x77,0xa5,0x90,0x8a]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaeskf1.vi v10, v9, 31
# CHECK-INST: vaeskf1.vi v10, v9, 31
# CHECK-ENCODING: [0x77,0xa5,0x9f,0x8a]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaeskf1.vi v0, v9, 1
# CHECK-INST: vaeskf1.vi v0, v9, 1
# CHECK-ENCODING: [0x77,0xa0,0x90,0x8a]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaeskf2.vi v10, v9, 2
# CHECK-INST: vaeskf2.vi v10, v9, 2
# CHECK-ENCODING: [0x77,0x25,0x91,0xaa]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaeskf2.vi v10, v9, 31
# CHECK-INST: vaeskf2.vi v10, v9, 31
# CHECK-ENCODING: [0x77,0xa5,0x9f,0xaa]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaeskf2.vi v0, v9, 2
# CHECK-INST: vaeskf2.vi v0, v9, 2
# CHECK-ENCODING: [0x77,0x20,0x91,0xaa]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
vaesz.vs v10, v9
# CHECK-INST: vaesz.vs v10, v9
# CHECK-ENCODING: [0x77,0xa5,0x93,0xa6]
-# CHECK-ERROR: instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvkned' (Vector AES Encryption & Decryption (Single Round))}}
diff --git a/llvm/test/MC/RISCV/rvv/zvknh.s b/llvm/test/MC/RISCV/rvv/zvknh.s
index 4a593e0094675c..5022a526756336 100644
--- a/llvm/test/MC/RISCV/rvv/zvknh.s
+++ b/llvm/test/MC/RISCV/rvv/zvknh.s
@@ -8,20 +8,19 @@
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+zve64x --mattr=+zvknhb %s \
# RUN: | llvm-objdump -d --mattr=+zve64x --mattr=+zvknhb - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
vsha2ms.vv v10, v9, v8
# CHECK-INST: vsha2ms.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x25,0x94,0xb6]
-# CHECK-ERROR: instruction requires the following: 'Zvknha' (Vector SHA-2 (SHA-256 only)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvknha' (Vector SHA-2 (SHA-256 only))}}
vsha2ch.vv v10, v9, v8
# CHECK-INST: vsha2ch.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x25,0x94,0xba]
-# CHECK-ERROR: instruction requires the following: 'Zvknha' (Vector SHA-2 (SHA-256 only)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvknha' (Vector SHA-2 (SHA-256 only))}}
vsha2cl.vv v10, v9, v8
# CHECK-INST: vsha2cl.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x25,0x94,0xbe]
-# CHECK-ERROR: instruction requires the following: 'Zvknha' (Vector SHA-2 (SHA-256 only)){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvknha' (Vector SHA-2 (SHA-256 only))}}
diff --git a/llvm/test/MC/RISCV/rvv/zvksed.s b/llvm/test/MC/RISCV/rvv/zvksed.s
index 8d32a9b752b3a3..a6640ce8140152 100644
--- a/llvm/test/MC/RISCV/rvv/zvksed.s
+++ b/llvm/test/MC/RISCV/rvv/zvksed.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+zvksed %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+zvksed %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --mattr=+zvksed --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,19 +8,19 @@
vsm4k.vi v10, v9, 7
# CHECK-INST: vsm4k.vi v10, v9, 7
# CHECK-ENCODING: [0x77,0xa5,0x93,0x86]
-# CHECK-ERROR: instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions)}}
vsm4k.vi v10, v9, 31
# CHECK-INST: vsm4k.vi v10, v9, 31
# CHECK-ENCODING: [0x77,0xa5,0x9f,0x86]
-# CHECK-ERROR: instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions)}}
vsm4r.vv v10, v9
# CHECK-INST: vsm4r.vv v10, v9
# CHECK-ENCODING: [0x77,0x25,0x98,0xa2]
-# CHECK-ERROR: instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions)}}
vsm4r.vs v10, v9
# CHECK-INST: vsm4r.vs v10, v9
# CHECK-ENCODING: [0x77,0x25,0x98,0xa6]
-# CHECK-ERROR: instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvksed' (SM4 Block Cipher Instructions)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvksh.s b/llvm/test/MC/RISCV/rvv/zvksh.s
index 36af81e5582e03..69cc45b8881e31 100644
--- a/llvm/test/MC/RISCV/rvv/zvksh.s
+++ b/llvm/test/MC/RISCV/rvv/zvksh.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+zve32x --mattr=+zvksh %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+zve32x --mattr=+zvksh %s \
# RUN: | llvm-objdump -d --mattr=+zve32x --mattr=+zvksh --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,15 +8,15 @@
vsm3c.vi v10, v9, 7
# CHECK-INST: vsm3c.vi v10, v9, 7
# CHECK-ENCODING: [0x77,0xa5,0x93,0xae]
-# CHECK-ERROR: instruction requires the following: 'Zvksh' (SM3 Hash Function Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvksh' (SM3 Hash Function Instructions)}}
vsm3me.vv v10, v9, v8
# CHECK-INST: vsm3me.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x25,0x94,0x82]
-# CHECK-ERROR: instruction requires the following: 'Zvksh' (SM3 Hash Function Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvksh' (SM3 Hash Function Instructions)}}
# vs1 is allowed to overlap, but not vs2.
vsm3me.vv v10, v9, v10
# CHECK-INST: vsm3me.vv v10, v9, v10
# CHECK-ENCODING: [0x77,0x25,0x95,0x82]
-# CHECK-ERROR: instruction requires the following: 'Zvksh' (SM3 Hash Function Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvksh' (SM3 Hash Function Instructions)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvlsseg.s b/llvm/test/MC/RISCV/rvv/zvlsseg.s
index cacdbf9c002966..93c8a5d2cdf315 100644
--- a/llvm/test/MC/RISCV/rvv/zvlsseg.s
+++ b/llvm/test/MC/RISCV/rvv/zvlsseg.s
@@ -1,8 +1,7 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+v %s \
# RUN: --M no-aliases \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+v %s \
# RUN: | llvm-objdump -d --mattr=+v -M no-aliases - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -10,2564 +9,2564 @@
vlseg2e8.v v8, (a0), v0.t
# CHECK-INST: vlseg2e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e8.v v8, (a0)
# CHECK-INST: vlseg2e8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e16.v v8, (a0), v0.t
# CHECK-INST: vlseg2e16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e16.v v8, (a0)
# CHECK-INST: vlseg2e16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e32.v v8, (a0), v0.t
# CHECK-INST: vlseg2e32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e32.v v8, (a0)
# CHECK-INST: vlseg2e32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e64.v v8, (a0), v0.t
# CHECK-INST: vlseg2e64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg2e64.v v8, (a0)
# CHECK-INST: vlseg2e64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg2e8ff.v v8, (a0), v0.t
# CHECK-INST: vlseg2e8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x21]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e8ff.v v8, (a0)
# CHECK-INST: vlseg2e8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x23]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e16ff.v v8, (a0), v0.t
# CHECK-INST: vlseg2e16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x21]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e16ff.v v8, (a0)
# CHECK-INST: vlseg2e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x23]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e32ff.v v8, (a0), v0.t
# CHECK-INST: vlseg2e32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x21]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e32ff.v v8, (a0)
# CHECK-INST: vlseg2e32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x23]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e64ff.v v8, (a0), v0.t
# CHECK-INST: vlseg2e64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x21]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg2e64ff.v v8, (a0)
# CHECK-INST: vlseg2e64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x23]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg2e8.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg2e8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg2e8.v v8, (a0), a1
# CHECK-INST: vlsseg2e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg2e16.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg2e16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg2e16.v v8, (a0), a1
# CHECK-INST: vlsseg2e16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg2e32.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg2e32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg2e32.v v8, (a0), a1
# CHECK-INST: vlsseg2e32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg2e64.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg2e64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg2e64.v v8, (a0), a1
# CHECK-INST: vlsseg2e64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg2ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei8.v v8, (a0), v4
# CHECK-INST: vluxseg2ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg2ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei16.v v8, (a0), v4
# CHECK-INST: vluxseg2ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg2ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei32.v v8, (a0), v4
# CHECK-INST: vluxseg2ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg2ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg2ei64.v v8, (a0), v4
# CHECK-INST: vluxseg2ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg2ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei8.v v8, (a0), v4
# CHECK-INST: vloxseg2ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg2ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei16.v v8, (a0), v4
# CHECK-INST: vloxseg2ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg2ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei32.v v8, (a0), v4
# CHECK-INST: vloxseg2ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg2ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg2ei64.v v8, (a0), v4
# CHECK-INST: vloxseg2ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg3e8.v v8, (a0), v0.t
# CHECK-INST: vlseg3e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e8.v v8, (a0)
# CHECK-INST: vlseg3e8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e16.v v8, (a0), v0.t
# CHECK-INST: vlseg3e16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e16.v v8, (a0)
# CHECK-INST: vlseg3e16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e32.v v8, (a0), v0.t
# CHECK-INST: vlseg3e32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e32.v v8, (a0)
# CHECK-INST: vlseg3e32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e64.v v8, (a0), v0.t
# CHECK-INST: vlseg3e64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg3e64.v v8, (a0)
# CHECK-INST: vlseg3e64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg3e8ff.v v8, (a0), v0.t
# CHECK-INST: vlseg3e8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x41]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e8ff.v v8, (a0)
# CHECK-INST: vlseg3e8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x43]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e16ff.v v8, (a0), v0.t
# CHECK-INST: vlseg3e16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x41]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e16ff.v v8, (a0)
# CHECK-INST: vlseg3e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x43]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e32ff.v v8, (a0), v0.t
# CHECK-INST: vlseg3e32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x41]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e32ff.v v8, (a0)
# CHECK-INST: vlseg3e32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x43]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg3e64ff.v v8, (a0), v0.t
# CHECK-INST: vlseg3e64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x41]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg3e64ff.v v8, (a0)
# CHECK-INST: vlseg3e64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x43]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg3e8.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg3e8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg3e8.v v8, (a0), a1
# CHECK-INST: vlsseg3e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg3e16.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg3e16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg3e16.v v8, (a0), a1
# CHECK-INST: vlsseg3e16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg3e32.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg3e32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg3e32.v v8, (a0), a1
# CHECK-INST: vlsseg3e32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg3e64.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg3e64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg3e64.v v8, (a0), a1
# CHECK-INST: vlsseg3e64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg3ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei8.v v8, (a0), v4
# CHECK-INST: vluxseg3ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg3ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei16.v v8, (a0), v4
# CHECK-INST: vluxseg3ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg3ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei32.v v8, (a0), v4
# CHECK-INST: vluxseg3ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg3ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei64.v v8, (a0), v4
# CHECK-INST: vluxseg3ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg3ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei8.v v8, (a0), v4
# CHECK-INST: vloxseg3ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg3ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei16.v v8, (a0), v4
# CHECK-INST: vloxseg3ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg3ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei32.v v8, (a0), v4
# CHECK-INST: vloxseg3ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg3ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg3ei64.v v8, (a0), v4
# CHECK-INST: vloxseg3ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg4e8.v v8, (a0), v0.t
# CHECK-INST: vlseg4e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e8.v v8, (a0)
# CHECK-INST: vlseg4e8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e16.v v8, (a0), v0.t
# CHECK-INST: vlseg4e16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e16.v v8, (a0)
# CHECK-INST: vlseg4e16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e32.v v8, (a0), v0.t
# CHECK-INST: vlseg4e32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e32.v v8, (a0)
# CHECK-INST: vlseg4e32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e64.v v8, (a0), v0.t
# CHECK-INST: vlseg4e64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg4e64.v v8, (a0)
# CHECK-INST: vlseg4e64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg4e8ff.v v8, (a0), v0.t
# CHECK-INST: vlseg4e8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x61]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e8ff.v v8, (a0)
# CHECK-INST: vlseg4e8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x63]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e16ff.v v8, (a0), v0.t
# CHECK-INST: vlseg4e16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x61]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e16ff.v v8, (a0)
# CHECK-INST: vlseg4e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x63]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e32ff.v v8, (a0), v0.t
# CHECK-INST: vlseg4e32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x61]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e32ff.v v8, (a0)
# CHECK-INST: vlseg4e32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x63]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg4e64ff.v v8, (a0), v0.t
# CHECK-INST: vlseg4e64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x61]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg4e64ff.v v8, (a0)
# CHECK-INST: vlseg4e64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x63]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg4e8.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg4e8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg4e8.v v8, (a0), a1
# CHECK-INST: vlsseg4e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg4e16.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg4e16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg4e16.v v8, (a0), a1
# CHECK-INST: vlsseg4e16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg4e32.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg4e32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg4e32.v v8, (a0), a1
# CHECK-INST: vlsseg4e32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg4e64.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg4e64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg4e64.v v8, (a0), a1
# CHECK-INST: vlsseg4e64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg4ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei8.v v8, (a0), v4
# CHECK-INST: vluxseg4ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg4ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei16.v v8, (a0), v4
# CHECK-INST: vluxseg4ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg4ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei32.v v8, (a0), v4
# CHECK-INST: vluxseg4ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg4ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg4ei64.v v8, (a0), v4
# CHECK-INST: vluxseg4ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg4ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei8.v v8, (a0), v4
# CHECK-INST: vloxseg4ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg4ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei16.v v8, (a0), v4
# CHECK-INST: vloxseg4ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg4ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei32.v v8, (a0), v4
# CHECK-INST: vloxseg4ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg4ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei64.v v8, (a0), v4
# CHECK-INST: vloxseg4ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg5e8.v v8, (a0), v0.t
# CHECK-INST: vlseg5e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e8.v v8, (a0)
# CHECK-INST: vlseg5e8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e16.v v8, (a0), v0.t
# CHECK-INST: vlseg5e16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e16.v v8, (a0)
# CHECK-INST: vlseg5e16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e32.v v8, (a0), v0.t
# CHECK-INST: vlseg5e32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e32.v v8, (a0)
# CHECK-INST: vlseg5e32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e64.v v8, (a0), v0.t
# CHECK-INST: vlseg5e64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg5e64.v v8, (a0)
# CHECK-INST: vlseg5e64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg5e8ff.v v8, (a0), v0.t
# CHECK-INST: vlseg5e8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x81]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e8ff.v v8, (a0)
# CHECK-INST: vlseg5e8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0x83]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e16ff.v v8, (a0), v0.t
# CHECK-INST: vlseg5e16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0x81]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e16ff.v v8, (a0)
# CHECK-INST: vlseg5e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x83]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e32ff.v v8, (a0), v0.t
# CHECK-INST: vlseg5e32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0x81]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e32ff.v v8, (a0)
# CHECK-INST: vlseg5e32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0x83]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg5e64ff.v v8, (a0), v0.t
# CHECK-INST: vlseg5e64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0x81]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg5e64ff.v v8, (a0)
# CHECK-INST: vlseg5e64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0x83]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg5e8.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg5e8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg5e8.v v8, (a0), a1
# CHECK-INST: vlsseg5e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg5e16.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg5e16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg5e16.v v8, (a0), a1
# CHECK-INST: vlsseg5e16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg5e32.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg5e32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg5e32.v v8, (a0), a1
# CHECK-INST: vlsseg5e32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg5e64.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg5e64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg5e64.v v8, (a0), a1
# CHECK-INST: vlsseg5e64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg5ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei8.v v8, (a0), v4
# CHECK-INST: vluxseg5ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg5ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei16.v v8, (a0), v4
# CHECK-INST: vluxseg5ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg5ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei32.v v8, (a0), v4
# CHECK-INST: vluxseg5ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg5ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg5ei64.v v8, (a0), v4
# CHECK-INST: vluxseg5ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg5ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei8.v v8, (a0), v4
# CHECK-INST: vloxseg5ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg5ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei16.v v8, (a0), v4
# CHECK-INST: vloxseg5ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg5ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei32.v v8, (a0), v4
# CHECK-INST: vloxseg5ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg5ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg5ei64.v v8, (a0), v4
# CHECK-INST: vloxseg5ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg6e8.v v8, (a0), v0.t
# CHECK-INST: vlseg6e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e8.v v8, (a0)
# CHECK-INST: vlseg6e8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e16.v v8, (a0), v0.t
# CHECK-INST: vlseg6e16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e16.v v8, (a0)
# CHECK-INST: vlseg6e16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e32.v v8, (a0), v0.t
# CHECK-INST: vlseg6e32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e32.v v8, (a0)
# CHECK-INST: vlseg6e32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e64.v v8, (a0), v0.t
# CHECK-INST: vlseg6e64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg6e64.v v8, (a0)
# CHECK-INST: vlseg6e64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg6e8ff.v v8, (a0), v0.t
# CHECK-INST: vlseg6e8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0xa1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e8ff.v v8, (a0)
# CHECK-INST: vlseg6e8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0xa3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e16ff.v v8, (a0), v0.t
# CHECK-INST: vlseg6e16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0xa1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e16ff.v v8, (a0)
# CHECK-INST: vlseg6e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0xa3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e32ff.v v8, (a0), v0.t
# CHECK-INST: vlseg6e32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0xa1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e32ff.v v8, (a0)
# CHECK-INST: vlseg6e32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0xa3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg6e64ff.v v8, (a0), v0.t
# CHECK-INST: vlseg6e64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xa1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg6e64ff.v v8, (a0)
# CHECK-INST: vlseg6e64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0xa3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg6e8.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg6e8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg6e8.v v8, (a0), a1
# CHECK-INST: vlsseg6e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg6e16.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg6e16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg6e16.v v8, (a0), a1
# CHECK-INST: vlsseg6e16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg6e32.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg6e32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg6e32.v v8, (a0), a1
# CHECK-INST: vlsseg6e32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg6e64.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg6e64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg6e64.v v8, (a0), a1
# CHECK-INST: vlsseg6e64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg6ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei8.v v8, (a0), v4
# CHECK-INST: vluxseg6ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg6ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei16.v v8, (a0), v4
# CHECK-INST: vluxseg6ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg6ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei32.v v8, (a0), v4
# CHECK-INST: vluxseg6ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg6ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg6ei64.v v8, (a0), v4
# CHECK-INST: vluxseg6ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg6ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei8.v v8, (a0), v4
# CHECK-INST: vloxseg6ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg6ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei16.v v8, (a0), v4
# CHECK-INST: vloxseg6ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg6ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei32.v v8, (a0), v4
# CHECK-INST: vloxseg6ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg6ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg6ei64.v v8, (a0), v4
# CHECK-INST: vloxseg6ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg7e8.v v8, (a0), v0.t
# CHECK-INST: vlseg7e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e8.v v8, (a0)
# CHECK-INST: vlseg7e8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e16.v v8, (a0), v0.t
# CHECK-INST: vlseg7e16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e16.v v8, (a0)
# CHECK-INST: vlseg7e16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e32.v v8, (a0), v0.t
# CHECK-INST: vlseg7e32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e32.v v8, (a0)
# CHECK-INST: vlseg7e32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e64.v v8, (a0), v0.t
# CHECK-INST: vlseg7e64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg7e64.v v8, (a0)
# CHECK-INST: vlseg7e64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg7e8ff.v v8, (a0), v0.t
# CHECK-INST: vlseg7e8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0xc1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e8ff.v v8, (a0)
# CHECK-INST: vlseg7e8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0xc3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e16ff.v v8, (a0), v0.t
# CHECK-INST: vlseg7e16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0xc1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e16ff.v v8, (a0)
# CHECK-INST: vlseg7e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0xc3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e32ff.v v8, (a0), v0.t
# CHECK-INST: vlseg7e32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0xc1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e32ff.v v8, (a0)
# CHECK-INST: vlseg7e32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0xc3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg7e64ff.v v8, (a0), v0.t
# CHECK-INST: vlseg7e64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xc1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg7e64ff.v v8, (a0)
# CHECK-INST: vlseg7e64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0xc3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg7e8.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg7e8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg7e8.v v8, (a0), a1
# CHECK-INST: vlsseg7e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg7e16.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg7e16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg7e16.v v8, (a0), a1
# CHECK-INST: vlsseg7e16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg7e32.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg7e32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg7e32.v v8, (a0), a1
# CHECK-INST: vlsseg7e32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg7e64.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg7e64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg7e64.v v8, (a0), a1
# CHECK-INST: vlsseg7e64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg7ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei8.v v8, (a0), v4
# CHECK-INST: vluxseg7ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg7ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei16.v v8, (a0), v4
# CHECK-INST: vluxseg7ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg7ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei32.v v8, (a0), v4
# CHECK-INST: vluxseg7ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg7ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg7ei64.v v8, (a0), v4
# CHECK-INST: vluxseg7ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg7ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei8.v v8, (a0), v4
# CHECK-INST: vloxseg7ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg7ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei16.v v8, (a0), v4
# CHECK-INST: vloxseg7ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg7ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei32.v v8, (a0), v4
# CHECK-INST: vloxseg7ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg7ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg7ei64.v v8, (a0), v4
# CHECK-INST: vloxseg7ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg8e8.v v8, (a0), v0.t
# CHECK-INST: vlseg8e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e8.v v8, (a0)
# CHECK-INST: vlseg8e8.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e16.v v8, (a0), v0.t
# CHECK-INST: vlseg8e16.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e16.v v8, (a0)
# CHECK-INST: vlseg8e16.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e32.v v8, (a0), v0.t
# CHECK-INST: vlseg8e32.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e32.v v8, (a0)
# CHECK-INST: vlseg8e32.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e64.v v8, (a0), v0.t
# CHECK-INST: vlseg8e64.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg8e64.v v8, (a0)
# CHECK-INST: vlseg8e64.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg8e8ff.v v8, (a0), v0.t
# CHECK-INST: vlseg8e8ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0xe1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e8ff.v v8, (a0)
# CHECK-INST: vlseg8e8ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x04,0x05,0xe3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e16ff.v v8, (a0), v0.t
# CHECK-INST: vlseg8e16ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x54,0x05,0xe1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e16ff.v v8, (a0)
# CHECK-INST: vlseg8e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0xe3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e32ff.v v8, (a0), v0.t
# CHECK-INST: vlseg8e32ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x64,0x05,0xe1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e32ff.v v8, (a0)
# CHECK-INST: vlseg8e32ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x64,0x05,0xe3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg8e64ff.v v8, (a0), v0.t
# CHECK-INST: vlseg8e64ff.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xe1]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg8e64ff.v v8, (a0)
# CHECK-INST: vlseg8e64ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x74,0x05,0xe3]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg8e8.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg8e8.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x04,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg8e8.v v8, (a0), a1
# CHECK-INST: vlsseg8e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg8e16.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg8e16.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x54,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg8e16.v v8, (a0), a1
# CHECK-INST: vlsseg8e16.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x54,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg8e32.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg8e32.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x64,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg8e32.v v8, (a0), a1
# CHECK-INST: vlsseg8e32.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x64,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg8e64.v v8, (a0), a1, v0.t
# CHECK-INST: vlsseg8e64.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlsseg8e64.v v8, (a0), a1
# CHECK-INST: vlsseg8e64.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg8ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei8.v v8, (a0), v4
# CHECK-INST: vluxseg8ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg8ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei16.v v8, (a0), v4
# CHECK-INST: vluxseg8ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg8ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei32.v v8, (a0), v4
# CHECK-INST: vluxseg8ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vluxseg8ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vluxseg8ei64.v v8, (a0), v4
# CHECK-INST: vluxseg8ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei8.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg8ei8.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x04,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei8.v v8, (a0), v4
# CHECK-INST: vloxseg8ei8.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x04,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei16.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg8ei16.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x54,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei16.v v8, (a0), v4
# CHECK-INST: vloxseg8ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei32.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg8ei32.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x64,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei32.v v8, (a0), v4
# CHECK-INST: vloxseg8ei32.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x64,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei64.v v8, (a0), v4, v0.t
# CHECK-INST: vloxseg8ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vloxseg8ei64.v v8, (a0), v4
# CHECK-INST: vloxseg8ei64.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x74,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg2e8.v v24, (a0), v0.t
# CHECK-INST: vsseg2e8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg2e8.v v24, (a0)
# CHECK-INST: vsseg2e8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg2e16.v v24, (a0), v0.t
# CHECK-INST: vsseg2e16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg2e16.v v24, (a0)
# CHECK-INST: vsseg2e16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg2e32.v v24, (a0), v0.t
# CHECK-INST: vsseg2e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg2e32.v v24, (a0)
# CHECK-INST: vsseg2e32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg2e64.v v24, (a0), v0.t
# CHECK-INST: vsseg2e64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg2e64.v v24, (a0)
# CHECK-INST: vsseg2e64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0x22]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg2e8.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg2e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg2e8.v v24, (a0), a1
# CHECK-INST: vssseg2e8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg2e16.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg2e16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg2e16.v v24, (a0), a1
# CHECK-INST: vssseg2e16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg2e32.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg2e32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg2e32.v v24, (a0), a1
# CHECK-INST: vssseg2e32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg2e64.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg2e64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg2e64.v v24, (a0), a1
# CHECK-INST: vssseg2e64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg2ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei8.v v24, (a0), v4
# CHECK-INST: vsuxseg2ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg2ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei16.v v24, (a0), v4
# CHECK-INST: vsuxseg2ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg2ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei32.v v24, (a0), v4
# CHECK-INST: vsuxseg2ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg2ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x24]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg2ei64.v v24, (a0), v4
# CHECK-INST: vsuxseg2ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x26]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg2ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei8.v v24, (a0), v4
# CHECK-INST: vsoxseg2ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg2ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei16.v v24, (a0), v4
# CHECK-INST: vsoxseg2ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg2ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei32.v v24, (a0), v4
# CHECK-INST: vsoxseg2ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg2ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x2c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg2ei64.v v24, (a0), v4
# CHECK-INST: vsoxseg2ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x2e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg3e8.v v24, (a0), v0.t
# CHECK-INST: vsseg3e8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg3e8.v v24, (a0)
# CHECK-INST: vsseg3e8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg3e16.v v24, (a0), v0.t
# CHECK-INST: vsseg3e16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg3e16.v v24, (a0)
# CHECK-INST: vsseg3e16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg3e32.v v24, (a0), v0.t
# CHECK-INST: vsseg3e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg3e32.v v24, (a0)
# CHECK-INST: vsseg3e32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg3e64.v v24, (a0), v0.t
# CHECK-INST: vsseg3e64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0x40]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg3e64.v v24, (a0)
# CHECK-INST: vsseg3e64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0x42]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg3e8.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg3e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg3e8.v v24, (a0), a1
# CHECK-INST: vssseg3e8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg3e16.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg3e16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg3e16.v v24, (a0), a1
# CHECK-INST: vssseg3e16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg3e32.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg3e32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg3e32.v v24, (a0), a1
# CHECK-INST: vssseg3e32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg3e64.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg3e64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x48]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg3e64.v v24, (a0), a1
# CHECK-INST: vssseg3e64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x4a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg3ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei8.v v24, (a0), v4
# CHECK-INST: vsuxseg3ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg3ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei16.v v24, (a0), v4
# CHECK-INST: vsuxseg3ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg3ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei32.v v24, (a0), v4
# CHECK-INST: vsuxseg3ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg3ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x44]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg3ei64.v v24, (a0), v4
# CHECK-INST: vsuxseg3ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg3ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei8.v v24, (a0), v4
# CHECK-INST: vsoxseg3ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg3ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei16.v v24, (a0), v4
# CHECK-INST: vsoxseg3ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg3ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei32.v v24, (a0), v4
# CHECK-INST: vsoxseg3ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg3ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x4c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg3ei64.v v24, (a0), v4
# CHECK-INST: vsoxseg3ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x4e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg4e8.v v24, (a0), v0.t
# CHECK-INST: vsseg4e8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg4e8.v v24, (a0)
# CHECK-INST: vsseg4e8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg4e16.v v24, (a0), v0.t
# CHECK-INST: vsseg4e16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg4e16.v v24, (a0)
# CHECK-INST: vsseg4e16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg4e32.v v24, (a0), v0.t
# CHECK-INST: vsseg4e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg4e32.v v24, (a0)
# CHECK-INST: vsseg4e32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg4e64.v v24, (a0), v0.t
# CHECK-INST: vsseg4e64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0x60]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg4e64.v v24, (a0)
# CHECK-INST: vsseg4e64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0x62]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg4e8.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg4e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg4e8.v v24, (a0), a1
# CHECK-INST: vssseg4e8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg4e16.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg4e16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg4e16.v v24, (a0), a1
# CHECK-INST: vssseg4e16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg4e32.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg4e32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg4e32.v v24, (a0), a1
# CHECK-INST: vssseg4e32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg4e64.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg4e64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x68]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg4e64.v v24, (a0), a1
# CHECK-INST: vssseg4e64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x6a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg4ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei8.v v24, (a0), v4
# CHECK-INST: vsuxseg4ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg4ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei16.v v24, (a0), v4
# CHECK-INST: vsuxseg4ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg4ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei32.v v24, (a0), v4
# CHECK-INST: vsuxseg4ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg4ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x64]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg4ei64.v v24, (a0), v4
# CHECK-INST: vsuxseg4ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x66]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg4ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei8.v v24, (a0), v4
# CHECK-INST: vsoxseg4ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg4ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei16.v v24, (a0), v4
# CHECK-INST: vsoxseg4ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg4ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei32.v v24, (a0), v4
# CHECK-INST: vsoxseg4ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg4ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg4ei64.v v24, (a0), v4
# CHECK-INST: vsoxseg4ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x6e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg5e8.v v24, (a0), v0.t
# CHECK-INST: vsseg5e8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg5e8.v v24, (a0)
# CHECK-INST: vsseg5e8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg5e16.v v24, (a0), v0.t
# CHECK-INST: vsseg5e16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg5e16.v v24, (a0)
# CHECK-INST: vsseg5e16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg5e32.v v24, (a0), v0.t
# CHECK-INST: vsseg5e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg5e32.v v24, (a0)
# CHECK-INST: vsseg5e32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg5e64.v v24, (a0), v0.t
# CHECK-INST: vsseg5e64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg5e64.v v24, (a0)
# CHECK-INST: vsseg5e64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0x82]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg5e8.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg5e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg5e8.v v24, (a0), a1
# CHECK-INST: vssseg5e8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg5e16.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg5e16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg5e16.v v24, (a0), a1
# CHECK-INST: vssseg5e16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg5e32.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg5e32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg5e32.v v24, (a0), a1
# CHECK-INST: vssseg5e32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg5e64.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg5e64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x88]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg5e64.v v24, (a0), a1
# CHECK-INST: vssseg5e64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0x8a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg5ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei8.v v24, (a0), v4
# CHECK-INST: vsuxseg5ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg5ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei16.v v24, (a0), v4
# CHECK-INST: vsuxseg5ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg5ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei32.v v24, (a0), v4
# CHECK-INST: vsuxseg5ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg5ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x84]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg5ei64.v v24, (a0), v4
# CHECK-INST: vsuxseg5ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x86]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg5ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei8.v v24, (a0), v4
# CHECK-INST: vsoxseg5ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg5ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei16.v v24, (a0), v4
# CHECK-INST: vsoxseg5ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg5ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei32.v v24, (a0), v4
# CHECK-INST: vsoxseg5ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg5ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0x8c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg5ei64.v v24, (a0), v4
# CHECK-INST: vsoxseg5ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0x8e]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg6e8.v v24, (a0), v0.t
# CHECK-INST: vsseg6e8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg6e8.v v24, (a0)
# CHECK-INST: vsseg6e8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg6e16.v v24, (a0), v0.t
# CHECK-INST: vsseg6e16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg6e16.v v24, (a0)
# CHECK-INST: vsseg6e16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg6e32.v v24, (a0), v0.t
# CHECK-INST: vsseg6e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg6e32.v v24, (a0)
# CHECK-INST: vsseg6e32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg6e64.v v24, (a0), v0.t
# CHECK-INST: vsseg6e64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0xa0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg6e64.v v24, (a0)
# CHECK-INST: vsseg6e64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0xa2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg6e8.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg6e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg6e8.v v24, (a0), a1
# CHECK-INST: vssseg6e8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg6e16.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg6e16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg6e16.v v24, (a0), a1
# CHECK-INST: vssseg6e16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg6e32.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg6e32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg6e32.v v24, (a0), a1
# CHECK-INST: vssseg6e32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg6e64.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg6e64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0xa8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg6e64.v v24, (a0), a1
# CHECK-INST: vssseg6e64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0xaa]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg6ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei8.v v24, (a0), v4
# CHECK-INST: vsuxseg6ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg6ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei16.v v24, (a0), v4
# CHECK-INST: vsuxseg6ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg6ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei32.v v24, (a0), v4
# CHECK-INST: vsuxseg6ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg6ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei64.v v24, (a0), v4
# CHECK-INST: vsuxseg6ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0xa6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg6ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei8.v v24, (a0), v4
# CHECK-INST: vsoxseg6ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg6ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei16.v v24, (a0), v4
# CHECK-INST: vsoxseg6ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg6ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei32.v v24, (a0), v4
# CHECK-INST: vsoxseg6ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg6ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0xac]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg6ei64.v v24, (a0), v4
# CHECK-INST: vsoxseg6ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0xae]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg7e8.v v24, (a0), v0.t
# CHECK-INST: vsseg7e8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg7e8.v v24, (a0)
# CHECK-INST: vsseg7e8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg7e16.v v24, (a0), v0.t
# CHECK-INST: vsseg7e16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg7e16.v v24, (a0)
# CHECK-INST: vsseg7e16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg7e32.v v24, (a0), v0.t
# CHECK-INST: vsseg7e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg7e32.v v24, (a0)
# CHECK-INST: vsseg7e32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg7e64.v v24, (a0), v0.t
# CHECK-INST: vsseg7e64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0xc0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg7e64.v v24, (a0)
# CHECK-INST: vsseg7e64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0xc2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg7e8.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg7e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg7e8.v v24, (a0), a1
# CHECK-INST: vssseg7e8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg7e16.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg7e16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg7e16.v v24, (a0), a1
# CHECK-INST: vssseg7e16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg7e32.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg7e32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg7e32.v v24, (a0), a1
# CHECK-INST: vssseg7e32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg7e64.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg7e64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0xc8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg7e64.v v24, (a0), a1
# CHECK-INST: vssseg7e64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0xca]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg7ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei8.v v24, (a0), v4
# CHECK-INST: vsuxseg7ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg7ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei16.v v24, (a0), v4
# CHECK-INST: vsuxseg7ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg7ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei32.v v24, (a0), v4
# CHECK-INST: vsuxseg7ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg7ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0xc4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg7ei64.v v24, (a0), v4
# CHECK-INST: vsuxseg7ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0xc6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg7ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei8.v v24, (a0), v4
# CHECK-INST: vsoxseg7ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg7ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei16.v v24, (a0), v4
# CHECK-INST: vsoxseg7ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg7ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei32.v v24, (a0), v4
# CHECK-INST: vsoxseg7ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg7ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0xcc]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei64.v v24, (a0), v4
# CHECK-INST: vsoxseg7ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg8e8.v v24, (a0), v0.t
# CHECK-INST: vsseg8e8.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x0c,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg8e8.v v24, (a0)
# CHECK-INST: vsseg8e8.v v24, (a0)
# CHECK-ENCODING: [0x27,0x0c,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg8e16.v v24, (a0), v0.t
# CHECK-INST: vsseg8e16.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x5c,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg8e16.v v24, (a0)
# CHECK-INST: vsseg8e16.v v24, (a0)
# CHECK-ENCODING: [0x27,0x5c,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg8e32.v v24, (a0), v0.t
# CHECK-INST: vsseg8e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg8e32.v v24, (a0)
# CHECK-INST: vsseg8e32.v v24, (a0)
# CHECK-ENCODING: [0x27,0x6c,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsseg8e64.v v24, (a0), v0.t
# CHECK-INST: vsseg8e64.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x7c,0x05,0xe0]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg8e64.v v24, (a0)
# CHECK-INST: vsseg8e64.v v24, (a0)
# CHECK-ENCODING: [0x27,0x7c,0x05,0xe2]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg8e8.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg8e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg8e8.v v24, (a0), a1
# CHECK-INST: vssseg8e8.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x0c,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg8e16.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg8e16.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x5c,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg8e16.v v24, (a0), a1
# CHECK-INST: vssseg8e16.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x5c,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg8e32.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg8e32.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x6c,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg8e32.v v24, (a0), a1
# CHECK-INST: vssseg8e32.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x6c,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg8e64.v v24, (a0), a1, v0.t
# CHECK-INST: vssseg8e64.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x7c,0xb5,0xe8]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vssseg8e64.v v24, (a0), a1
# CHECK-INST: vssseg8e64.v v24, (a0), a1
# CHECK-ENCODING: [0x27,0x7c,0xb5,0xea]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg8ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei8.v v24, (a0), v4
# CHECK-INST: vsuxseg8ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg8ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei16.v v24, (a0), v4
# CHECK-INST: vsuxseg8ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg8ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei32.v v24, (a0), v4
# CHECK-INST: vsuxseg8ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsuxseg8ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0xe4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsuxseg8ei64.v v24, (a0), v4
# CHECK-INST: vsuxseg8ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0xe6]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei8.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg8ei8.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x0c,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei8.v v24, (a0), v4
# CHECK-INST: vsoxseg8ei8.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x0c,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei16.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg8ei16.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x5c,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei16.v v24, (a0), v4
# CHECK-INST: vsoxseg8ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei32.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg8ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei32.v v24, (a0), v4
# CHECK-INST: vsoxseg8ei32.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x6c,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei64.v v24, (a0), v4, v0.t
# CHECK-INST: vsoxseg8ei64.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x7c,0x45,0xec]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsoxseg8ei64.v v24, (a0), v4
# CHECK-INST: vsoxseg8ei64.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x7c,0x45,0xee]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vlseg2e8.v v8, 0(a0), v0.t
# CHECK-INST: vlseg2e8.v v8, (a0), v0.t
# CHECK-ENCODING: [0x07,0x04,0x05,0x20]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlseg2e16ff.v v8, 0(a0)
# CHECK-INST: vlseg2e16ff.v v8, (a0)
# CHECK-ENCODING: [0x07,0x54,0x05,0x23]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vlsseg2e8.v v8, 0(a0), a1
# CHECK-INST: vlsseg2e8.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x04,0xb5,0x2a]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vluxseg3ei16.v v8, 0(a0), v4
# CHECK-INST: vluxseg3ei16.v v8, (a0), v4
# CHECK-ENCODING: [0x07,0x54,0x45,0x46]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vloxseg4ei64.v v8, 0(a0), v4, v0.t
# CHECK-INST: vloxseg4ei64.v v8, (a0), v4, v0.t
# CHECK-ENCODING: [0x07,0x74,0x45,0x6c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors) or 'Zve64x' (Vector Extensions for Embedded Processors)}}
vsseg5e32.v v24, 0(a0), v0.t
# CHECK-INST: vsseg5e32.v v24, (a0), v0.t
# CHECK-ENCODING: [0x27,0x6c,0x05,0x80]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vssseg2e8.v v24, 0(a0), a1, v0.t
# CHECK-INST: vssseg2e8.v v24, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x0c,0xb5,0x28]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsoxseg7ei16.v v24, 0(a0), v4
# CHECK-INST: vsoxseg7ei16.v v24, (a0), v4
# CHECK-ENCODING: [0x27,0x5c,0x45,0xce]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vsuxseg6ei32.v v24, 0(a0), v4, v0.t
# CHECK-INST: vsuxseg6ei32.v v24, (a0), v4, v0.t
# CHECK-ENCODING: [0x27,0x6c,0x45,0xa4]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvqwbdota-invalid.s b/llvm/test/MC/RISCV/rvv/zvqwbdota-invalid.s
index 7a983e96edd8f0..060a862b0e3a58 100644
--- a/llvm/test/MC/RISCV/rvv/zvqwbdota-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/zvqwbdota-invalid.s
@@ -1,21 +1,20 @@
-# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-zvqwbdota8i %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+experimental-zvqwbdota8i %s
# Invalid vsetvli
-# CHECK-ERROR: operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]{{$}}
+# expected-error at +1 {{operand must be e[8|8alt|16|16alt|32|64],m[1|2|4|8|f2|f4|f8],[ta|tu],[ma|mu]}}
vsetvli a0, zero, e888, m1, ta, ma
# Invalid ci
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vqwbdotau.vv v8, v16, v12, 4
-# CHECK-ERROR: immediate must be a multiple of 8 in the range [0, 56]{{$}}
+# expected-error at +1 {{immediate must be a multiple of 8 in the range [0, 56]}}
vqwbdotau.vv v8, v16, v12, 64
# Invalid vs2
-# CHECK-ERROR: invalid operand for instruction{{$}}
+# expected-error at +1 {{invalid operand for instruction}}
vqwbdotau.vv v8, v17, v12, 8
# Invalid vs2 and ci
-# CHECK-ERROR: :[[@LINE+1]]:18: error: invalid operand for instruction{{$}}
+# expected-error at +1:18 {{invalid operand for instruction}}
vqwbdotau.vv v8, v17, v12, 4
diff --git a/llvm/test/MC/RISCV/rvv/zvqwbdota.s b/llvm/test/MC/RISCV/rvv/zvqwbdota.s
index 7a1449a35f556e..df3ed7c9a47d58 100644
--- a/llvm/test/MC/RISCV/rvv/zvqwbdota.s
+++ b/llvm/test/MC/RISCV/rvv/zvqwbdota.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding -mattr=+experimental-zvqwbdota8i %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding -mattr=+v %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding -mattr=+v %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj -mattr=+experimental-zvqwbdota8i %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvqwbdota8i --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -19,20 +18,20 @@ vsetvli zero, zero, e16alt, m1, ta, ma
# CHECK-INST: vqwbdotau.vv v8, v16, v12, 8
# CHECK-ENCODING: [0x77,0x04,0x16,0xbb]
-# CHECK-ERROR: instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension)}}
vqwbdotau.vv v8, v16, v12, 8
# CHECK-INST: vqwbdotau.vv v8, v16, v12, 16, v0.t
# CHECK-ENCODING: [0x77,0x04,0x26,0xb9]
-# CHECK-ERROR: instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension)}}
vqwbdotau.vv v8, v16, v12, 16, v0.t
# CHECK-INST: vqwbdotas.vv v8, v16, v12, 8
# CHECK-ENCODING: [0x77,0x04,0x16,0xbf]
-# CHECK-ERROR: instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension)}}
vqwbdotas.vv v8, v16, v12, 8
# CHECK-INST: vqwbdotas.vv v8, v16, v12, 16, v0.t
# CHECK-ENCODING: [0x77,0x04,0x26,0xbd]
-# CHECK-ERROR: instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zvqwbdota8i' or 'Zvqwbdota16i' (8-bit or 16-bit integer batched dot-product extension)}}
vqwbdotas.vv v8, v16, v12, 16, v0.t
diff --git a/llvm/test/MC/RISCV/rvv/zvqwdotai8i16.s b/llvm/test/MC/RISCV/rvv/zvqwdotai8i16.s
index 2cebc3702af346..b9396753d9e5f1 100644
--- a/llvm/test/MC/RISCV/rvv/zvqwdotai8i16.s
+++ b/llvm/test/MC/RISCV/rvv/zvqwdotai8i16.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+v --mattr=+experimental-zvqwdota8i %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+v --mattr=+experimental-zvqwdota8i %s \
# RUN: | llvm-objdump -d --mattr=+v --mattr=+experimental-zvqwdota8i --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,14 +8,14 @@
vsetvli a2, a0, e8alt, m1, ta, ma
# CHECK-INST: vsetvli a2, a0, e8alt, m1, ta, ma
# CHECK-ENCODING: [0x57,0x76,0x05,0x1c]
-# CHECK-ERROR: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at -3 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32x' (Vector Extensions for Embedded Processors)}}
vqwdotau.vv v10, v9, v8
# CHECK-INST: vqwdotau.vv v10, v9, v8
# CHECK-ENCODING: [0x77,0x05,0x94,0x9a]
-# CHECK-ERROR: instruction requires the following: 'Zvqwdota8i' (8-bit Integer Dot-Product) or 'Zvqwdota16i' (16-bit Integer Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvqwdota8i' (8-bit Integer Dot-Product) or 'Zvqwdota16i' (16-bit Integer Dot-Product)}}
vqwdotau.vv v10, v9, v8, v0.t
# CHECK-INST: vqwdotau.vv v10, v9, v8, v0.t
# CHECK-ENCODING: [0x77,0x05,0x94,0x98]
-# CHECK-ERROR: instruction requires the following: 'Zvqwdota8i' (8-bit Integer Dot-Product) or 'Zvqwdota16i' (16-bit Integer Dot-Product)
+# expected-error at -3 {{instruction requires the following: 'Zvqwdota8i' (8-bit Integer Dot-Product) or 'Zvqwdota16i' (16-bit Integer Dot-Product)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvvfmm.s b/llvm/test/MC/RISCV/rvv/zvvfmm.s
index 4c6a60d5b3fff8..981d949bb2bd9a 100644
--- a/llvm/test/MC/RISCV/rvv/zvvfmm.s
+++ b/llvm/test/MC/RISCV/rvv/zvvfmm.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-zvvfmm %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+experimental-zvvfmm %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvvfmm - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,49 +8,49 @@
vfmmacc.vv v8, v4, v20
# CHECK-INST: vfmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x42,0x53]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vfwmmacc.vv v8, v4, v20
# CHECK-INST: vfwmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x42,0x57]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vfwmmacc.vv v8, v4, v20, v0.scale
# CHECK-INST: vfwmmacc.vv v8, v4, v20, v0.scale
# CHECK-ENCODING: [0x57,0x14,0x42,0x55]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vfqmmacc.vv v8, v4, v20
# CHECK-INST: vfqmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x42,0x5b]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vfqmmacc.vv v8, v4, v20, v0.scale
# CHECK-INST: vfqmmacc.vv v8, v4, v20, v0.scale
# CHECK-ENCODING: [0x57,0x14,0x42,0x59]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vf8wmmacc.vv v8, v4, v20
# CHECK-INST: vf8wmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x14,0x42,0x5f]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vf8wmmacc.vv v8, v4, v20, v0.scale
# CHECK-INST: vf8wmmacc.vv v8, v4, v20, v0.scale
# CHECK-ENCODING: [0x57,0x14,0x42,0x5d]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vfwimmacc.vv v8, v4, v20, v0.scale
# CHECK-INST: vfwimmacc.vv v8, v4, v20, v0.scale
# CHECK-ENCODING: [0x57,0x04,0x42,0xe5]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vfqimmacc.vv v8, v4, v20, v0.scale
# CHECK-INST: vfqimmacc.vv v8, v4, v20, v0.scale
# CHECK-ENCODING: [0x57,0x04,0x42,0xe9]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
vf8wimmacc.vv v8, v4, v20, v0.scale
# CHECK-INST: vf8wimmacc.vv v8, v4, v20, v0.scale
# CHECK-ENCODING: [0x57,0x04,0x42,0xed]
-# CHECK-ERROR: instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvvmm.s b/llvm/test/MC/RISCV/rvv/zvvmm.s
index fad5139fca1564..9ff194dcf67d65 100644
--- a/llvm/test/MC/RISCV/rvv/zvvmm.s
+++ b/llvm/test/MC/RISCV/rvv/zvvmm.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-zvvmm %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+experimental-zvvmm %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvvmm - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,19 +8,19 @@
vmmacc.vv v8, v4, v20
# CHECK-INST: vmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x42,0xe3]
-# CHECK-ERROR: instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate)}}
vwmmacc.vv v8, v4, v20
# CHECK-INST: vwmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x42,0xe7]
-# CHECK-ERROR: instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate)}}
vqmmacc.vv v8, v4, v20
# CHECK-INST: vqmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x42,0xeb]
-# CHECK-ERROR: instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate)}}
v8wmmacc.vv v8, v4, v20
# CHECK-INST: v8wmmacc.vv v8, v4, v20
# CHECK-ENCODING: [0x57,0x04,0x42,0xef]
-# CHECK-ERROR: instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmm' (Integer Matrix Multiply-Accumulate)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvvmtls-invalid.s b/llvm/test/MC/RISCV/rvv/zvvmtls-invalid.s
index 6eec3d4f36719b..143ba2d5a3ed19 100644
--- a/llvm/test/MC/RISCV/rvv/zvvmtls-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/zvvmtls-invalid.s
@@ -1,32 +1,31 @@
-# RUN: not llvm-mc -triple=riscv64 --mattr=+experimental-zvvmtls %s 2>&1 \
-# RUN: | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv64 --mattr=+experimental-zvvmtls %s
vmtl.v v8, (a0), a1, L0
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmtl.v v8, (a0), a1, L3
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmtl.v v8, (a0), a1, L128
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmtl.v v8, (a0), a1, L4, v1.t
-# CHECK: error: operand must be v0.t
+# expected-error at -1 {{operand must be v0.t}}
vmtl.v v8, (a0), a1, v0.t, L4
-# CHECK: error: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
vmts.v v12, (a0), a1, L0
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmts.v v12, (a0), a1, L3
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmts.v v12, (a0), a1, L128
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmts.v v12, (a0), a1, L4, v1.t
-# CHECK: error: operand must be v0.t
+# expected-error at -1 {{operand must be v0.t}}
vmts.v v12, (a0), a1, v0.t, L4
-# CHECK: error: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/rvv/zvvmtls.s b/llvm/test/MC/RISCV/rvv/zvvmtls.s
index 54a91f6a4d25e9..77a05fa32b1de8 100644
--- a/llvm/test/MC/RISCV/rvv/zvvmtls.s
+++ b/llvm/test/MC/RISCV/rvv/zvvmtls.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-zvvmtls %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+experimental-zvvmtls %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvvmtls - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,59 +8,59 @@
vmtl.v v8, (a0), a1
# CHECK-INST: vmtl.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0x12]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmtl.v v8, (a0), a1, L4
# CHECK-INST: vmtl.v v8, (a0), a1, L4
# CHECK-ENCODING: [0x07,0x74,0xb5,0x72]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmtl.v v8, (a0), a1, l2
# CHECK-INST: vmtl.v v8, (a0), a1, L2
# CHECK-ENCODING: [0x07,0x74,0xb5,0x52]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmtl.v v8, (a0), a1, v0.t
# CHECK-INST: vmtl.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x10]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmtl.v v8, (a0), a1, L4, v0.t
# CHECK-INST: vmtl.v v8, (a0), a1, L4, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x70]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmtl.v v8, (a0), zero, L64, v0.t
# CHECK-INST: vmtl.v v8, (a0), zero, L64, v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmts.v v12, (a0), a1
# CHECK-INST: vmts.v v12, (a0), a1
# CHECK-ENCODING: [0x27,0x76,0xb5,0x12]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmts.v v12, (a0), a1, L4
# CHECK-INST: vmts.v v12, (a0), a1, L4
# CHECK-ENCODING: [0x27,0x76,0xb5,0x72]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmts.v v12, (a0), a1, v0.t
# CHECK-INST: vmts.v v12, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x76,0xb5,0x10]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmts.v v12, (a0), a1, L4, v0.t
# CHECK-INST: vmts.v v12, (a0), a1, L4, v0.t
# CHECK-ENCODING: [0x27,0x76,0xb5,0x70]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmts.v v12, (a0), a1, l2, v0.t
# CHECK-INST: vmts.v v12, (a0), a1, L2, v0.t
# CHECK-ENCODING: [0x27,0x76,0xb5,0x50]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
vmts.v v12, (a0), zero, L64, v0.t
# CHECK-INST: vmts.v v12, (a0), zero, L64, v0.t
# CHECK-ENCODING: [0x27,0x76,0x05,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmtls' (Matrix Tile Load/Store)}}
diff --git a/llvm/test/MC/RISCV/rvv/zvvmttls-invalid.s b/llvm/test/MC/RISCV/rvv/zvvmttls-invalid.s
index 566093326f5113..37257f363fb4b4 100644
--- a/llvm/test/MC/RISCV/rvv/zvvmttls-invalid.s
+++ b/llvm/test/MC/RISCV/rvv/zvvmttls-invalid.s
@@ -1,32 +1,31 @@
-# RUN: not llvm-mc -triple=riscv64 --mattr=+experimental-zvvmttls %s 2>&1 \
-# RUN: | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv64 --mattr=+experimental-zvvmttls %s
vmttl.v v8, (a0), a1, L0
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmttl.v v8, (a0), a1, L3
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmttl.v v8, (a0), a1, L128
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmttl.v v8, (a0), a1, L4, v1.t
-# CHECK: error: operand must be v0.t
+# expected-error at -1 {{operand must be v0.t}}
vmttl.v v8, (a0), a1, v0.t, L4
-# CHECK: error: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
vmtts.v v12, (a0), a1, L0
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmtts.v v12, (a0), a1, L3
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmtts.v v12, (a0), a1, L128
-# CHECK: error: operand must be L1, L2, L4, L8, L16, L32, or L64
+# expected-error at -1 {{operand must be L1, L2, L4, L8, L16, L32, or L64}}
vmtts.v v12, (a0), a1, L4, v1.t
-# CHECK: error: operand must be v0.t
+# expected-error at -1 {{operand must be v0.t}}
vmtts.v v12, (a0), a1, v0.t, L4
-# CHECK: error: unexpected extra operand for instruction
+# expected-error at -1 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/rvv/zvvmttls.s b/llvm/test/MC/RISCV/rvv/zvvmttls.s
index 68a47844ee56f5..db2ea6c574c378 100644
--- a/llvm/test/MC/RISCV/rvv/zvvmttls.s
+++ b/llvm/test/MC/RISCV/rvv/zvvmttls.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-zvvmttls %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+experimental-zvvmttls %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zvvmttls - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,59 +8,59 @@
vmttl.v v8, (a0), a1
# CHECK-INST: vmttl.v v8, (a0), a1
# CHECK-ENCODING: [0x07,0x74,0xb5,0x16]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmttl.v v8, (a0), a1, L4
# CHECK-INST: vmttl.v v8, (a0), a1, L4
# CHECK-ENCODING: [0x07,0x74,0xb5,0x76]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmttl.v v8, (a0), a1, l2
# CHECK-INST: vmttl.v v8, (a0), a1, L2
# CHECK-ENCODING: [0x07,0x74,0xb5,0x56]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmttl.v v8, (a0), a1, v0.t
# CHECK-INST: vmttl.v v8, (a0), a1, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x14]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmttl.v v8, (a0), a1, L4, v0.t
# CHECK-INST: vmttl.v v8, (a0), a1, L4, v0.t
# CHECK-ENCODING: [0x07,0x74,0xb5,0x74]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmttl.v v8, (a0), zero, L64, v0.t
# CHECK-INST: vmttl.v v8, (a0), zero, L64, v0.t
# CHECK-ENCODING: [0x07,0x74,0x05,0xf4]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmtts.v v12, (a0), a1
# CHECK-INST: vmtts.v v12, (a0), a1
# CHECK-ENCODING: [0x27,0x76,0xb5,0x16]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmtts.v v12, (a0), a1, L4
# CHECK-INST: vmtts.v v12, (a0), a1, L4
# CHECK-ENCODING: [0x27,0x76,0xb5,0x76]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmtts.v v12, (a0), a1, v0.t
# CHECK-INST: vmtts.v v12, (a0), a1, v0.t
# CHECK-ENCODING: [0x27,0x76,0xb5,0x14]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmtts.v v12, (a0), a1, L4, v0.t
# CHECK-INST: vmtts.v v12, (a0), a1, L4, v0.t
# CHECK-ENCODING: [0x27,0x76,0xb5,0x74]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmtts.v v12, (a0), a1, l2, v0.t
# CHECK-INST: vmtts.v v12, (a0), a1, L2, v0.t
# CHECK-ENCODING: [0x27,0x76,0xb5,0x54]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
vmtts.v v12, (a0), zero, L64, v0.t
# CHECK-INST: vmtts.v v12, (a0), zero, L64, v0.t
# CHECK-ENCODING: [0x27,0x76,0x05,0xf4]
-# CHECK-ERROR: instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zvvmttls' (Transposing Matrix Tile Load/Store)}}
diff --git a/llvm/test/MC/RISCV/rvy-invalid-attributes.s b/llvm/test/MC/RISCV/rvy-invalid-attributes.s
index f5c3fc51c0dcbd..ff05907df87944 100644
--- a/llvm/test/MC/RISCV/rvy-invalid-attributes.s
+++ b/llvm/test/MC/RISCV/rvy-invalid-attributes.s
@@ -5,7 +5,7 @@
# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-y,+c,+zcmp /dev/null 2>&1 | FileCheck %s --check-prefix=RV64Y-C-ZCMP
# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-y,+zca,+zcmp /dev/null 2>&1 | FileCheck %s --check-prefix=RV64Y-ZCA-ZCMP
-# RUN: not llvm-mc -triple=riscv64 < %s 2>&1 | FileCheck %s --check-prefix=ATTR --implicit-check-not="error:"
+# RUN: llvm-mc --verify -triple=riscv64 < %s
# RV64Y-ZCE: LLVM ERROR: 'zcmt' is incompatible with rv64y base
# RV32Y-ZCF: LLVM ERROR: 'zcf' is incompatible with rv32y base
@@ -15,36 +15,36 @@
# RV64Y-ZCA-ZCMP: LLVM ERROR: 'zcmp' is incompatible with rv64y base
.attribute arch, "rv64y0p910_zce"
-# ATTR: error: invalid arch name 'rv64y0p910_zce', 'zcmt' is incompatible with rv64y base
+# expected-error at -1 {{invalid arch name 'rv64y0p910_zce', 'zcmt' is incompatible with rv64y base}}
.attribute arch, "rv32y0p910_zcf"
-# ATTR: error: invalid arch name 'rv32y0p910_zcf', 'zcf' is incompatible with rv32y base
+# expected-error at -1 {{invalid arch name 'rv32y0p910_zcf', 'zcf' is incompatible with rv32y base}}
.attribute arch, "rv32y0p910_zclsd"
-# ATTR: error: invalid arch name 'rv32y0p910_zclsd', 'zclsd' is incompatible with rv32y base
+# expected-error at -1 {{invalid arch name 'rv32y0p910_zclsd', 'zclsd' is incompatible with rv32y base}}
.attribute arch, "rv64y0p910_zcd"
-# ATTR: error: invalid arch name 'rv64y0p910_zcd', 'zcd' is incompatible with rv64y base
+# expected-error at -1 {{invalid arch name 'rv64y0p910_zcd', 'zcd' is incompatible with rv64y base}}
.attribute arch, "rv64y0p910_c_zcmp"
-# ATTR: error: invalid arch name 'rv64y0p910_c_zcmp', 'zcmp' is incompatible with rv64y base
+# expected-error at -1 {{invalid arch name 'rv64y0p910_c_zcmp', 'zcmp' is incompatible with rv64y base}}
.attribute arch, "rv64y0p910_zca_zcmp"
-# ATTR: error: invalid arch name 'rv64y0p910_zca_zcmp', 'zcmp' is incompatible with rv64y base
+# expected-error at -1 {{invalid arch name 'rv64y0p910_zca_zcmp', 'zcmp' is incompatible with rv64y base}}
## Check that resetToArch does not enable 'zcd' on rv64y or 'zcf' on rv64i.
.attribute arch, "rv64y0p910_c_d"
c.fld fa0, 0(a0)
-# ATTR: :[[#@LINE-1]]:1: error: instruction requires the following: 'C' (Compressed Instructions) and 'D' (Double-Precision Floating-Point) or 'Zcd' (Compressed Double-Precision Floating-Point Instructions){{$}}
+# expected-error at -1:1 {{instruction requires the following: 'C' (Compressed Instructions) and 'D' (Double-Precision Floating-Point) or 'Zcd' (Compressed Double-Precision Floating-Point Instructions)}}
.option arch, +m
.option arch, rv64y0p910_c_d
c.fld fa0, 0(a0)
-# ATTR: :[[#@LINE-1]]:1: error: instruction requires the following: 'C' (Compressed Instructions) and 'D' (Double-Precision Floating-Point) or 'Zcd' (Compressed Double-Precision Floating-Point Instructions){{$}}
+# expected-error at -1:1 {{instruction requires the following: 'C' (Compressed Instructions) and 'D' (Double-Precision Floating-Point) or 'Zcd' (Compressed Double-Precision Floating-Point Instructions)}}
.option arch, +m
.attribute arch, "rv32i"
.attribute arch, "rv64icf"
c.flw fa0, 0(a0)
-# ATTR: :[[#@LINE-1]]:1: error: instruction requires the following: 'C' (Compressed Instructions) and 'F' (Single-Precision Floating-Point) or 'Zcf' (Compressed Single-Precision Floating-Point Instructions), RV32I Base Instruction Set{{$}}
+# expected-error at -1:1 {{instruction requires the following: 'C' (Compressed Instructions) and 'F' (Single-Precision Floating-Point) or 'Zcf' (Compressed Single-Precision Floating-Point Instructions), RV32I Base Instruction Set}}
.option arch, +m
diff --git a/llvm/test/MC/RISCV/rvy/rvy-basic-invalid.s b/llvm/test/MC/RISCV/rvy/rvy-basic-invalid.s
index d4088f3646d4ae..ebc25bc07dee12 100644
--- a/llvm/test/MC/RISCV/rvy/rvy-basic-invalid.s
+++ b/llvm/test/MC/RISCV/rvy/rvy-basic-invalid.s
@@ -1,36 +1,34 @@
-// RUN: not llvm-mc --triple riscv32 --mattr=+experimental-y <%s 2>&1 \
-// RUN: | FileCheck %s --check-prefix=CHECK --implicit-check-not=error:
-// RUN: not llvm-mc --triple riscv64 --mattr=+experimental-y <%s 2>&1 \
-// RUN: | FileCheck %s --check-prefix=CHECK --implicit-check-not=error:
+// RUN: llvm-mc --verify --triple riscv32 --mattr=+experimental-y < %s
+// RUN: llvm-mc --verify --triple riscv64 --mattr=+experimental-y < %s
yaddi a0, a0, -2049
-// CHECK: :[[#@LINE-1]]:15: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+// expected-error at -1:15 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
yaddi a0, a0, 2048
-// CHECK: :[[#@LINE-1]]:15: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+// expected-error at -1:15 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
/// yadd with x0 is illegal (since that is the encoding for YMV).
/// Since X0 is invalid, we fall back to checking the immediate alias and get that error instead
/// TODO: It would be nice to report operand must be a a register other than X0 instead.
yadd a0, a1, zero
-// CHECK: :[[#@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-// CHECK: :[[#@LINE-2]]:14: note: register must be a GPR excluding zero (x0)
-// CHECK: :[[#@LINE-3]]:14: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+// expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+// expected-note at -2:14 {{register must be a GPR excluding zero (x0)}}
+// expected-note at -3:14 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
yadd a0, a1, x0
-// CHECK: :[[#@LINE-1]]:1: error: invalid instruction, any one of the following would fix this:
-// CHECK: :[[#@LINE-2]]:14: note: register must be a GPR excluding zero (x0)
-// CHECK: :[[#@LINE-3]]:14: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+// expected-error at -1:1 {{invalid instruction, any one of the following would fix this:}}
+// expected-note at -2:14 {{register must be a GPR excluding zero (x0)}}
+// expected-note at -3:14 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
ybndswi a0, a0, 0
-// CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]
+// expected-error at -1:17 {{immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]}}
ybndswi a0, a0, 257
-// CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]
+// expected-error at -1:17 {{immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]}}
ybndswi a0, a0, 259
-// CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]
+// expected-error at -1:17 {{immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]}}
ybndswi a0, a0, 508
-// CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]
+// expected-error at -1:17 {{immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]}}
ybndswi a0, a0, 520
-// CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]
+// expected-error at -1:17 {{immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]}}
ybndswi a0, a0, 8192
-// CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]
+// expected-error at -1:17 {{immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]}}
ybndswi a0, a0, 4112
-// CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]
+// expected-error at -1:17 {{immediate must be an integer in the range [1, 255], a multiple of 8 in the range [256, 504], or a multiple of 16 in the range [512, 4096]}}
diff --git a/llvm/test/MC/RISCV/rvzabha-invalid.s b/llvm/test/MC/RISCV/rvzabha-invalid.s
index dda987c146d468..83a1a6b68736de 100644
--- a/llvm/test/MC/RISCV/rvzabha-invalid.s
+++ b/llvm/test/MC/RISCV/rvzabha-invalid.s
@@ -1,16 +1,16 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+a,+zabha < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+a,+zabha < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+a,+zabha < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+a,+zabha < %s
# Final operand must have parentheses
-amoswap.b a1, a2, a3 # CHECK: :[[@LINE]]:19: error: expected '(' or optional integer offset
-amomin.b a1, a2, 1 # CHECK: :[[@LINE]]:20: error: expected '(' after optional integer offset
-amomin.b a1, a2, 1(a3) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
+amoswap.b a1, a2, a3 # expected-error:19 {{expected '(' or optional integer offset}}
+amomin.b a1, a2, 1 # expected-error:20 {{expected '(' after optional integer offset}}
+amomin.b a1, a2, 1(a3) # expected-error:18 {{optional integer offset must be 0}}
# Only .aq, .rl, and .aqrl suffixes are valid
-amoxor.b.rlqa a2, a3, (a4) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
-amoor.b.aq.rl a4, a5, (a6) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
-amoor.b. a4, a5, (a6) # CHECK: :[[@LINE]]:1: error: unrecognized instruction mnemonic
+amoxor.b.rlqa a2, a3, (a4) # expected-error:1 {{unrecognized instruction mnemonic}}
+amoor.b.aq.rl a4, a5, (a6) # expected-error:1 {{unrecognized instruction mnemonic}}
+amoor.b. a4, a5, (a6) # expected-error:1 {{unrecognized instruction mnemonic}}
# Non-zero offsets not supported for the third operand (rs1).
-amocas.b a1, a3, 1(a5) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
-amocas.h a0, a2, 2(a5) # CHECK: :[[@LINE]]:18: error: optional integer offset must be 0
+amocas.b a1, a3, 1(a5) # expected-error:18 {{optional integer offset must be 0}}
+amocas.h a0, a2, 2(a5) # expected-error:18 {{optional integer offset must be 0}}
diff --git a/llvm/test/MC/RISCV/rvzalasr-valid.s b/llvm/test/MC/RISCV/rvzalasr-valid.s
index 90ec86c19ad5ef..130cd8860fdb7c 100644
--- a/llvm/test/MC/RISCV/rvzalasr-valid.s
+++ b/llvm/test/MC/RISCV/rvzalasr-valid.s
@@ -9,70 +9,66 @@
# RUN: | llvm-objdump --mattr=+zalasr -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck --check-prefixes=CHECK-NO-EXT %s
-# RUN: not llvm-mc -triple riscv64 \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck --check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -M no-aliases -show-encoding < %s
# CHECK-ASM-AND-OBJ: lb.aq t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x03,0x05,0x34]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
lb.aq t1, 0(a0)
# CHECK-ASM-AND-OBJ: lh.aq t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x13,0x05,0x34]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
lh.aq t1, 0(a0)
# CHECK-ASM-AND-OBJ: lw.aq t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x23,0x05,0x34]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
lw.aq t1, (a0)
# CHECK-ASM-AND-OBJ: lb.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x03,0x05,0x36]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
lb.aqrl t1, 0(a0)
# CHECK-ASM-AND-OBJ: lh.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x13,0x05,0x36]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
lh.aqrl t1, (a0)
# CHECK-ASM-AND-OBJ: lw.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x23,0x05,0x36]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
lw.aqrl t1, (a0)
# CHECK-ASM-AND-OBJ: sb.rl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x00,0x65,0x3a]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sb.rl t1, (a0)
# CHECK-ASM-AND-OBJ: sh.rl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x10,0x65,0x3a]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sh.rl t1, 0(a0)
# CHECK-ASM-AND-OBJ: sw.rl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x20,0x65,0x3a]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sw.rl t1, (a0)
# CHECK-ASM-AND-OBJ: sb.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x00,0x65,0x3e]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sb.aqrl t1, (a0)
# CHECK-ASM-AND-OBJ: sh.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x10,0x65,0x3e]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sh.aqrl t1, 0(a0)
# CHECK-ASM-AND-OBJ: sw.aqrl t1, (a0)
# CHECK-ASM: encoding: [0x2f,0x20,0x65,0x3e]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zalasr' (Load-Acquire and Store-Release Instructions)}}
sw.aqrl t1, 0(a0)
diff --git a/llvm/test/MC/RISCV/rvzcb-invalid.s b/llvm/test/MC/RISCV/rvzcb-invalid.s
index f53ab257353036..bc55bd633a15ae 100644
--- a/llvm/test/MC/RISCV/rvzcb-invalid.s
+++ b/llvm/test/MC/RISCV/rvzcb-invalid.s
@@ -1,19 +1,17 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=zcb -M no-aliases -show-encoding %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
-# RUN: not llvm-mc -triple=riscv64 -mattr=zcb -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=zcb -M no-aliases -show-encoding %s
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=zcb -M no-aliases -show-encoding < %s
-# CHECK-ERROR: error: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
c.lbu a5, 10(a4)
-# CHECK-ERROR: error: immediate must be one of [0, 2]
+# expected-error at +1 {{immediate must be one of [0, 2]}}
c.lhu a5, 10(a4)
-# CHECK-ERROR: error: immediate must be one of [0, 2]
+# expected-error at +1 {{immediate must be one of [0, 2]}}
c.lh a5, 10(a4)
-# CHECK-ERROR: error: immediate must be an integer in the range [0, 3]
+# expected-error at +1 {{immediate must be an integer in the range [0, 3]}}
c.sb a5, 10(a4)
-# CHECK-ERROR: error: immediate must be one of [0, 2]
+# expected-error at +1 {{immediate must be one of [0, 2]}}
c.sh a5, 10(a4)
diff --git a/llvm/test/MC/RISCV/rvzcmt-invalid.s b/llvm/test/MC/RISCV/rvzcmt-invalid.s
index 0cd9f0b8a3d1d4..e318cb34d041f2 100644
--- a/llvm/test/MC/RISCV/rvzcmt-invalid.s
+++ b/llvm/test/MC/RISCV/rvzcmt-invalid.s
@@ -1,13 +1,11 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+zcmt -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
-# RUN: not llvm-mc -triple=riscv64 -mattr=+zcmt -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+zcmt -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+zcmt -M no-aliases -show-encoding < %s
-# CHECK-ERROR: error: immediate must be an integer in the range [0, 31]
+# expected-error at +1 {{immediate must be an integer in the range [0, 31]}}
cm.jt 64
-# CHECK-ERROR: error: immediate must be an integer in the range [32, 255]
+# expected-error at +1 {{immediate must be an integer in the range [32, 255]}}
cm.jalt 256
-# CHECK-ERROR: error: immediate must be an integer in the range [32, 255]
+# expected-error at +1 {{immediate must be an integer in the range [32, 255]}}
cm.jalt 31
diff --git a/llvm/test/MC/RISCV/rvzcmt-valid.s b/llvm/test/MC/RISCV/rvzcmt-valid.s
index a87e7902f6eed3..22b1d3009b221f 100644
--- a/llvm/test/MC/RISCV/rvzcmt-valid.s
+++ b/llvm/test/MC/RISCV/rvzcmt-valid.s
@@ -15,19 +15,15 @@
# RUN: -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefixes=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
-# RUN: not llvm-mc -triple riscv64 \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -M no-aliases -show-encoding < %s
# CHECK-ASM-AND-OBJ: cm.jt 1
# CHECK-ASM: encoding: [0x06,0xa0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zcmt' (table jump instructions for code-size reduction){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zcmt' (table jump instructions for code-size reduction)}}
cm.jt 1
# CHECK-ASM-AND-OBJ: cm.jalt 32
# CHECK-ASM: encoding: [0x82,0xa0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zcmt' (table jump instructions for code-size reduction){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zcmt' (table jump instructions for code-size reduction)}}
cm.jalt 32
diff --git a/llvm/test/MC/RISCV/rvzfbfmin-invalid.s b/llvm/test/MC/RISCV/rvzfbfmin-invalid.s
index cb4b532b557ce2..292b42244d5975 100644
--- a/llvm/test/MC/RISCV/rvzfbfmin-invalid.s
+++ b/llvm/test/MC/RISCV/rvzfbfmin-invalid.s
@@ -1,28 +1,26 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfbfmin,+d < %s 2>&1 | \
-# RUN: FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfbfmin,+d < %s 2>&1 | \
-# RUN: FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfbfmin,+d < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zfbfmin,+d < %s
# Out of range immediates
## simm12
-flh ft1, -2049(a0) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-fsh ft2, 2048(a1) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+flh ft1, -2049(a0) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+fsh ft2, 2048(a1) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Memory operand not formatted correctly
-flh ft1, a0, -200 # CHECK: :[[@LINE]]:14: error: register must be a GPR
+flh ft1, a0, -200 # expected-error:14 {{register must be a GPR}}
# Invalid register names
-flh ft15, 100(a0) # CHECK: :[[@LINE]]:5: error: register must be a FPR
-flh ft1, 100(a10) # CHECK: :[[@LINE]]:14: error: expected register
+flh ft15, 100(a0) # expected-error:5 {{register must be a FPR}}
+flh ft1, 100(a10) # expected-error:14 {{expected register}}
# Integer registers where FP regs are expected
-fmv.x.h fs7, a2 # CHECK: :[[@LINE]]:9: error: register must be a GPR
+fmv.x.h fs7, a2 # expected-error:9 {{register must be a GPR}}
# FP registers where integer regs are expected
-fmv.h.x a8, ft2 # CHECK: :[[@LINE]]:9: error: register must be a FPR
+fmv.h.x a8, ft2 # expected-error:9 {{register must be a FPR}}
# Attempting to use fcvt instructions from zfhmin
-fcvt.s.h fa0, ft0 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
-fcvt.h.s ft2, fa2 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
-fcvt.d.h fa0, ft0 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
-fcvt.h.d ft2, fa2 # CHECK: [[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)
+fcvt.s.h fa0, ft0 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+fcvt.h.s ft2, fa2 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+fcvt.d.h fa0, ft0 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
+fcvt.h.d ft2, fa2 # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point) or 'Zfhmin' (Half-Precision Floating-Point Minimal)}}
diff --git a/llvm/test/MC/RISCV/rvzfhmin-invalid.s b/llvm/test/MC/RISCV/rvzfhmin-invalid.s
index f619b526b8d286..f943ef81ae8b59 100644
--- a/llvm/test/MC/RISCV/rvzfhmin-invalid.s
+++ b/llvm/test/MC/RISCV/rvzfhmin-invalid.s
@@ -1,28 +1,26 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfhmin < %s 2>&1 | \
-# RUN: FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfhmin < %s 2>&1 | \
-# RUN: FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfhmin < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zfhmin < %s
# Out of range immediates
## simm12
-flh ft1, -2049(a0) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-fsh ft2, 2048(a1) # CHECK: :[[@LINE]]:10: error: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
+flh ft1, -2049(a0) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+fsh ft2, 2048(a1) # expected-error:10 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
# Memory operand not formatted correctly
-flh ft1, a0, -200 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-fsh ft2, a1, 100 # CHECK: :[[@LINE]]:14: error: register must be a GPR excluding zero (x0)
-flh ft1, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
-fsh ft2, a_symbol, x0 # CHECK: :[[@LINE]]:20: error: register must be a GPR excluding zero (x0)
+flh ft1, a0, -200 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+fsh ft2, a1, 100 # expected-error:14 {{register must be a GPR excluding zero (x0)}}
+flh ft1, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
+fsh ft2, a_symbol, x0 # expected-error:20 {{register must be a GPR excluding zero (x0)}}
# Invalid register names
-flh ft15, 100(a0) # CHECK: :[[@LINE]]:5: error: register must be a FPR
-flh ft1, 100(a10) # CHECK: :[[@LINE]]:14: error: expected register
+flh ft15, 100(a0) # expected-error:5 {{register must be a FPR}}
+flh ft1, 100(a10) # expected-error:14 {{expected register}}
# Integer registers where FP regs are expected
-fmv.x.h fs7, a2 # CHECK: :[[@LINE]]:9: error: register must be a GPR
+fmv.x.h fs7, a2 # expected-error:9 {{register must be a GPR}}
# FP registers where integer regs are expected
-fmv.h.x a8, ft2 # CHECK: :[[@LINE]]:9: error: register must be a FPR
+fmv.h.x a8, ft2 # expected-error:9 {{register must be a FPR}}
# Zfh instructions
-fmadd.h f10, f11, f12, f13, dyn # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+fmadd.h f10, f11, f12, f13, dyn # expected-error:1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
diff --git a/llvm/test/MC/RISCV/rvzicbom-invalid.s b/llvm/test/MC/RISCV/rvzicbom-invalid.s
index d4e19b9d740540..98121b30563ba1 100644
--- a/llvm/test/MC/RISCV/rvzicbom-invalid.s
+++ b/llvm/test/MC/RISCV/rvzicbom-invalid.s
@@ -1,24 +1,24 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zicbom < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zicbom < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zicbom < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zicbom < %s
# Must have a single register argument.
-cbo.clean # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-cbo.flush # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-cbo.inval # CHECK: :[[@LINE]]:1: error: too few operands for instruction
+cbo.clean # expected-error:1 {{too few operands for instruction}}
+cbo.flush # expected-error:1 {{too few operands for instruction}}
+cbo.inval # expected-error:1 {{too few operands for instruction}}
-cbo.clean 1 # CHECK: :[[@LINE]]:13: error: expected '(' after optional integer offset
-cbo.flush 2 # CHECK: :[[@LINE]]:13: error: expected '(' after optional integer offset
-cbo.inval 3 # CHECK: :[[@LINE]]:13: error: expected '(' after optional integer offset
+cbo.clean 1 # expected-error:13 {{expected '(' after optional integer offset}}
+cbo.flush 2 # expected-error:13 {{expected '(' after optional integer offset}}
+cbo.inval 3 # expected-error:13 {{expected '(' after optional integer offset}}
-cbo.clean t0, t1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
-cbo.flush t0, t1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
-cbo.inval t0, t1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+cbo.clean t0, t1 # expected-error:11 {{expected '(' or optional integer offset}}
+cbo.flush t0, t1 # expected-error:11 {{expected '(' or optional integer offset}}
+cbo.inval t0, t1 # expected-error:11 {{expected '(' or optional integer offset}}
# Non-zero offsets are not supported.
-cbo.clean 1(t0) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
-cbo.flush 2(t0) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
-cbo.inval 3(t0) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+cbo.clean 1(t0) # expected-error:11 {{optional integer offset must be 0}}
+cbo.flush 2(t0) # expected-error:11 {{optional integer offset must be 0}}
+cbo.inval 3(t0) # expected-error:11 {{optional integer offset must be 0}}
# Instructions from other zicbo* extensions aren't available without enabling
# the appropriate -mattr flag.
-cbo.zero (t0) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicboz' (Cache-Block Zero Instructions){{$}}
+cbo.zero (t0) # expected-error:1 {{instruction requires the following: 'Zicboz' (Cache-Block Zero Instructions)}}
diff --git a/llvm/test/MC/RISCV/rvzicbop-invalid.s b/llvm/test/MC/RISCV/rvzicbop-invalid.s
index 0354a6741df23a..84a344ca0138e5 100644
--- a/llvm/test/MC/RISCV/rvzicbop-invalid.s
+++ b/llvm/test/MC/RISCV/rvzicbop-invalid.s
@@ -1,29 +1,29 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zicbop < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zicbop < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zicbop < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zicbop < %s
# Memory operand not formatted correctly.
-prefetch.i a0, 32 # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
-prefetch.r 32, a0 # CHECK: :[[@LINE]]:16: error: expected '('
-prefetch.w a0(32) # CHECK: :[[@LINE]]:14: error: unexpected token
+prefetch.i a0, 32 # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
+prefetch.r 32, a0 # expected-error:16 {{expected '('}}
+prefetch.w a0(32) # expected-error:14 {{unexpected token}}
# Out of range offset.
-prefetch.i -2080(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
-prefetch.r 2048(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
-prefetch.w 2050(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
+prefetch.i -2080(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
+prefetch.r 2048(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
+prefetch.w 2050(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
# Offsets that aren't multiples of 32.
-prefetch.i 31(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
-prefetch.r -31(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
-prefetch.w 2047(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
+prefetch.i 31(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
+prefetch.r -31(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
+prefetch.w 2047(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
# Symbols should not be accepted.
-prefetch.i foo(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
-prefetch.r %lo(foo)(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
-prefetch.w %pcrel_lo(foo)(a0) # CHECK: :[[@LINE]]:12: error: immediate must be a multiple of 32 bytes in the range [-2048, 2016]
+prefetch.i foo(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
+prefetch.r %lo(foo)(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
+prefetch.w %pcrel_lo(foo)(a0) # expected-error:12 {{immediate must be a multiple of 32 bytes in the range [-2048, 2016]}}
# Instructions from other zicbo* extensions aren't available without enabling
# the appropriate -mattr flag.
-cbo.clean (t0) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicbom' (Cache-Block Management Instructions){{$}}
-cbo.flush (t1) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicbom' (Cache-Block Management Instructions){{$}}
-cbo.inval (t2) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicbom' (Cache-Block Management Instructions){{$}}
-cbo.zero (t0) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicboz' (Cache-Block Zero Instructions){{$}}
+cbo.clean (t0) # expected-error:1 {{instruction requires the following: 'Zicbom' (Cache-Block Management Instructions)}}
+cbo.flush (t1) # expected-error:1 {{instruction requires the following: 'Zicbom' (Cache-Block Management Instructions)}}
+cbo.inval (t2) # expected-error:1 {{instruction requires the following: 'Zicbom' (Cache-Block Management Instructions)}}
+cbo.zero (t0) # expected-error:1 {{instruction requires the following: 'Zicboz' (Cache-Block Zero Instructions)}}
diff --git a/llvm/test/MC/RISCV/rvzicboz-invalid.s b/llvm/test/MC/RISCV/rvzicboz-invalid.s
index bcc4a31a7b374e..26dd062887857e 100644
--- a/llvm/test/MC/RISCV/rvzicboz-invalid.s
+++ b/llvm/test/MC/RISCV/rvzicboz-invalid.s
@@ -1,16 +1,16 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zicboz < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zicboz < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zicboz < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zicboz < %s
# Must have a single register argument.
-cbo.zero # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-cbo.zero 1 # CHECK: :[[@LINE]]:12: error: expected '(' after optional integer offset
-cbo.zero t0, t1 # CHECK: :[[@LINE]]:10: error: expected '(' or optional integer offset
+cbo.zero # expected-error:1 {{too few operands for instruction}}
+cbo.zero 1 # expected-error:12 {{expected '(' after optional integer offset}}
+cbo.zero t0, t1 # expected-error:10 {{expected '(' or optional integer offset}}
# Non-zero offsets are not supported.
-cbo.zero 1(t0) # CHECK: :[[@LINE]]:10: error: optional integer offset must be 0
+cbo.zero 1(t0) # expected-error:10 {{optional integer offset must be 0}}
# Instructions from other zicbo* extensions aren't available without enabling
# the appropriate -mattr flag.
-cbo.clean (t0) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicbom' (Cache-Block Management Instructions){{$}}
-cbo.flush (t1) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicbom' (Cache-Block Management Instructions){{$}}
-cbo.inval (t2) # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'Zicbom' (Cache-Block Management Instructions){{$}}
+cbo.clean (t0) # expected-error:1 {{instruction requires the following: 'Zicbom' (Cache-Block Management Instructions)}}
+cbo.flush (t1) # expected-error:1 {{instruction requires the following: 'Zicbom' (Cache-Block Management Instructions)}}
+cbo.inval (t2) # expected-error:1 {{instruction requires the following: 'Zicbom' (Cache-Block Management Instructions)}}
diff --git a/llvm/test/MC/RISCV/rvzicond-invalid.s b/llvm/test/MC/RISCV/rvzicond-invalid.s
index 870b7f504a6d2d..3f02185ecd3ace 100644
--- a/llvm/test/MC/RISCV/rvzicond-invalid.s
+++ b/llvm/test/MC/RISCV/rvzicond-invalid.s
@@ -1,18 +1,18 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zicond < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zicond < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zicond < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zicond < %s
# Use of operand modifier on register name
-czero.eqz t1, %lo(t2), t3 # CHECK: :[[@LINE]]:15: error: register must be a GPR
+czero.eqz t1, %lo(t2), t3 # expected-error:15 {{register must be a GPR}}
# Invalid register name
-czero.nez a4, a3, foo # CHECK: :[[@LINE]]:19: error: register must be a GPR
+czero.nez a4, a3, foo # expected-error:19 {{register must be a GPR}}
# Invalid operand type
-czero.eqz t1, 2, t3 # CHECK: :[[@LINE]]:15: error: register must be a GPR
+czero.eqz t1, 2, t3 # expected-error:15 {{register must be a GPR}}
# Too many operands
-czero.eqz t1, t2, t3, t4 # CHECK: :[[@LINE]]:23: error: unexpected extra operand for instruction
-czero.nez t1, t2, t3, 4 # CHECK: :[[@LINE]]:23: error: unexpected extra operand for instruction
+czero.eqz t1, t2, t3, t4 # expected-error:23 {{unexpected extra operand for instruction}}
+czero.nez t1, t2, t3, 4 # expected-error:23 {{unexpected extra operand for instruction}}
# Too few operands
-czero.eqz t1, t2 # CHECK: :[[@LINE]]:17: error: too few operands for instruction
+czero.eqz t1, t2 # expected-error:17 {{too few operands for instruction}}
diff --git a/llvm/test/MC/RISCV/rvzihintntl-invalid.s b/llvm/test/MC/RISCV/rvzihintntl-invalid.s
index 722428c17362ee..ae250435b349c7 100644
--- a/llvm/test/MC/RISCV/rvzihintntl-invalid.s
+++ b/llvm/test/MC/RISCV/rvzihintntl-invalid.s
@@ -1,18 +1,18 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zihintntl < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zihintntl < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zihintntl < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zihintntl < %s
#
# ntl.* hints are always available even without Zihintntl
# (riscv-non-isa/riscv-elf-psabi-doc#474).
#
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
-ntl.p1 1 # CHECK: :[[@LINE]]:8: error: unexpected extra operand for instruction
-ntl.pall 2 # CHECK: :[[@LINE]]:10: error: unexpected extra operand for instruction
-ntl.s1 3 # CHECK: :[[@LINE]]:8: error: unexpected extra operand for instruction
-ntl.all 4 # CHECK: :[[@LINE]]:9: error: unexpected extra operand for instruction
+ntl.p1 1 # expected-error:8 {{unexpected extra operand for instruction}}
+ntl.pall 2 # expected-error:10 {{unexpected extra operand for instruction}}
+ntl.s1 3 # expected-error:8 {{unexpected extra operand for instruction}}
+ntl.all 4 # expected-error:9 {{unexpected extra operand for instruction}}
-ntl.p1 t0, t1 # CHECK: :[[@LINE]]:8: error: unexpected extra operand for instruction
-ntl.pall t0, t1 # CHECK: :[[@LINE]]:10: error: unexpected extra operand for instruction
-ntl.s1 t0, t1 # CHECK: :[[@LINE]]:8: error: unexpected extra operand for instruction
-ntl.all t0, t1 # CHECK: :[[@LINE]]:9: error: unexpected extra operand for instruction
+ntl.p1 t0, t1 # expected-error:8 {{unexpected extra operand for instruction}}
+ntl.pall t0, t1 # expected-error:10 {{unexpected extra operand for instruction}}
+ntl.s1 t0, t1 # expected-error:8 {{unexpected extra operand for instruction}}
+ntl.all t0, t1 # expected-error:9 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/rvzihintntlc-invalid.s b/llvm/test/MC/RISCV/rvzihintntlc-invalid.s
index fc6b4350eb83f9..d027d4e36dfecc 100644
--- a/llvm/test/MC/RISCV/rvzihintntlc-invalid.s
+++ b/llvm/test/MC/RISCV/rvzihintntlc-invalid.s
@@ -1,13 +1,13 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zihintntl,+c < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zihintntl,+c < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zihintntl,+c < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zihintntl,+c < %s
-c.ntl.p1 1 # CHECK: :[[@LINE]]:10: error: unexpected extra operand for instruction
-c.ntl.pall 2 # CHECK: :[[@LINE]]:12: error: unexpected extra operand for instruction
-c.ntl.s1 3 # CHECK: :[[@LINE]]:10: error: unexpected extra operand for instruction
-c.ntl.all 4 # CHECK: :[[@LINE]]:11: error: unexpected extra operand for instruction
+c.ntl.p1 1 # expected-error:10 {{unexpected extra operand for instruction}}
+c.ntl.pall 2 # expected-error:12 {{unexpected extra operand for instruction}}
+c.ntl.s1 3 # expected-error:10 {{unexpected extra operand for instruction}}
+c.ntl.all 4 # expected-error:11 {{unexpected extra operand for instruction}}
-c.ntl.p1 t0, t1 # CHECK: :[[@LINE]]:10: error: unexpected extra operand for instruction
-c.ntl.pall t0, t1 # CHECK: :[[@LINE]]:12: error: unexpected extra operand for instruction
-c.ntl.s1 t0, t1 # CHECK: :[[@LINE]]:10: error: unexpected extra operand for instruction
-c.ntl.all t0, t1 # CHECK: :[[@LINE]]:11: error: unexpected extra operand for instruction
+c.ntl.p1 t0, t1 # expected-error:10 {{unexpected extra operand for instruction}}
+c.ntl.pall t0, t1 # expected-error:12 {{unexpected extra operand for instruction}}
+c.ntl.s1 t0, t1 # expected-error:10 {{unexpected extra operand for instruction}}
+c.ntl.all t0, t1 # expected-error:11 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/smctr-ssctr-valid.s b/llvm/test/MC/RISCV/smctr-ssctr-valid.s
index 072231a9b546e9..e6cf05fb8a598b 100644
--- a/llvm/test/MC/RISCV/smctr-ssctr-valid.s
+++ b/llvm/test/MC/RISCV/smctr-ssctr-valid.s
@@ -19,12 +19,10 @@
# RUN: | llvm-objdump --mattr=+ssctr -M no-aliases -d - \
# RUN: | FileCheck -check-prefix=CHECK-INST %s
-# RUN: not llvm-mc -triple riscv32 -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
-# RUN: not llvm-mc -triple riscv64 -defsym=RV64=1 -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -defsym=RV64=1 -M no-aliases -show-encoding < %s
# CHECK-INST: sctrclr
# CHECK: encoding: [0x73,0x00,0x40,0x10]
-# CHECK-NO-EXT: error: instruction requires the following: 'Smctr' (Control Transfer Records Machine Level) or 'Ssctr' (Control Transfer Records Supervisor Level){{$}}
+# expected-error at +1 {{instruction requires the following: 'Smctr' (Control Transfer Records Machine Level) or 'Ssctr' (Control Transfer Records Supervisor Level)}}
sctrclr
diff --git a/llvm/test/MC/RISCV/smrnmi-invalid.s b/llvm/test/MC/RISCV/smrnmi-invalid.s
index 489dd6464d2e0f..16453030ce123a 100644
--- a/llvm/test/MC/RISCV/smrnmi-invalid.s
+++ b/llvm/test/MC/RISCV/smrnmi-invalid.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+smrnmi < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+smrnmi < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+smrnmi < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+smrnmi < %s
-mnret 0x10 # CHECK: :[[@LINE]]:7: error: unexpected extra operand for instruction
+mnret 0x10 # expected-error:7 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/spmp-csr-names.s b/llvm/test/MC/RISCV/spmp-csr-names.s
index fb6bce657b351f..45863eba612f6d 100644
--- a/llvm/test/MC/RISCV/spmp-csr-names.s
+++ b/llvm/test/MC/RISCV/spmp-csr-names.s
@@ -13,8 +13,7 @@
# RUN: llvm-mc -filetype=obj -triple riscv32 -defsym=RV32=1 < %s \
# RUN: | llvm-objdump -d - \
# RUN: | FileCheck -check-prefix=RV32-ALIAS %s
-# RUN: not llvm-mc %s -triple=riscv64 -defsym=RV32=1 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV64-ERR %s
+# RUN: llvm-mc --verify %s -triple=riscv64 -defsym=RV32=1
# spmpen
# CHECK-INST: csrrs t1, spmpen, zero
@@ -44,7 +43,7 @@ csrrs t2, 0x316, zero
# RV32-INST: csrrs t2, spmpenh, zero
# RV32-ENC: encoding: [0xf3,0x23,0x30,0x19]
# RV32-ALIAS: csrr t2, spmpenh
-# CHECK-RV64-ERR: error: system register 'spmpenh' is RV32 only
+# expected-error at +1 {{system register 'spmpenh' is RV32 only}}
csrrs t1, spmpenh, zero
csrrs t2, 0x193, zero
.endif
diff --git a/llvm/test/MC/RISCV/tail-call-invalid.s b/llvm/test/MC/RISCV/tail-call-invalid.s
index 14ff996b2e4b13..07451d211e2a89 100644
--- a/llvm/test/MC/RISCV/tail-call-invalid.s
+++ b/llvm/test/MC/RISCV/tail-call-invalid.s
@@ -1,13 +1,13 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
-tail 1234 # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %pcrel_hi(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %pcrel_lo(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %pcrel_hi(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %pcrel_lo(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %hi(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %lo(1234) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %hi(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail %lo(foo) # CHECK: :[[@LINE]]:6: error: operand must be a bare symbol name
-tail foo at pls # CHECK: :[[@LINE]]:10: error: @ (except the deprecated/ignored @plt) is disallowed
+tail 1234 # expected-error:6 {{operand must be a bare symbol name}}
+tail %pcrel_hi(1234) # expected-error:6 {{operand must be a bare symbol name}}
+tail %pcrel_lo(1234) # expected-error:6 {{operand must be a bare symbol name}}
+tail %pcrel_hi(foo) # expected-error:6 {{operand must be a bare symbol name}}
+tail %pcrel_lo(foo) # expected-error:6 {{operand must be a bare symbol name}}
+tail %hi(1234) # expected-error:6 {{operand must be a bare symbol name}}
+tail %lo(1234) # expected-error:6 {{operand must be a bare symbol name}}
+tail %hi(foo) # expected-error:6 {{operand must be a bare symbol name}}
+tail %lo(foo) # expected-error:6 {{operand must be a bare symbol name}}
+tail foo at pls # expected-error:10 {{@ (except the deprecated/ignored @plt) is disallowed}}
diff --git a/llvm/test/MC/RISCV/tlsdesc.s b/llvm/test/MC/RISCV/tlsdesc.s
index e4feb0cbef35f7..aac59c468baecc 100644
--- a/llvm/test/MC/RISCV/tlsdesc.s
+++ b/llvm/test/MC/RISCV/tlsdesc.s
@@ -5,8 +5,8 @@
# RUN: llvm-mc -filetype=obj -triple riscv64 < %s --mattr=+relax | llvm-objdump -dr -M no-aliases - | FileCheck %s --check-prefixes=INST,RELAX,RV64
-# RUN: not llvm-mc -triple riscv32 < %s --defsym RV32=1 --defsym ERR=1 2>&1 | FileCheck %s --check-prefixes=ERR,ERR-RV32
-# RUN: not llvm-mc -triple riscv64 < %s --defsym ERR=1 2>&1 | FileCheck %s --check-prefixes=ERR,ERR-RV64
+# RUN: llvm-mc --verify=err-rv32,expected -triple riscv32 --defsym RV32=1 --defsym ERR=1 < %s
+# RUN: llvm-mc --verify=err-rv64,expected -triple riscv64 --defsym ERR=1 < %s
start: # @start
# %bb.0: # %entry
@@ -41,35 +41,35 @@ start: # @start
## Check invalid usage
.ifdef ERR
auipc x1, %tlsdesc_call(foo)
-# ERR: :[[#@LINE-1]]:12: error: operand must be a symbol with a %pcrel_hi/%got_pcrel_hi/%tls_ie_pcrel_hi/%tls_gd_pcrel_hi specifier or an integer in the range
+# expected-error at -1:12 {{operand must be a symbol with a %pcrel_hi/%got_pcrel_hi/%tls_ie_pcrel_hi/%tls_gd_pcrel_hi specifier or an integer in the range}}
auipc x1, %tlsdesc_call(1234)
-# ERR: :[[#@LINE-1]]:12: error: operand must be a symbol with a %pcrel_hi/%got_pcrel_hi/%tls_ie_pcrel_hi/%tls_gd_pcrel_hi specifier or an integer in the range
+# expected-error at -1:12 {{operand must be a symbol with a %pcrel_hi/%got_pcrel_hi/%tls_ie_pcrel_hi/%tls_gd_pcrel_hi specifier or an integer in the range}}
auipc a0, %tlsdesc_hi(a+b)
-# ERR: :[[#@LINE-1]]:12: error: operand must be a symbol with a %pcrel_hi/%got_pcrel_hi/%tls_ie_pcrel_hi/%tls_gd_pcrel_hi specifier or an integer in the range
+# expected-error at -1:12 {{operand must be a symbol with a %pcrel_hi/%got_pcrel_hi/%tls_ie_pcrel_hi/%tls_gd_pcrel_hi specifier or an integer in the range}}
lw a0, t0, %tlsdesc_load_lo(a_symbol)
-# ERR: :[[#@LINE-1]]:15: error: unexpected extra operand for instruction
+# expected-error at -1:15 {{unexpected extra operand for instruction}}
lw a0, t0, %tlsdesc_load_lo(a_symbol)(a4)
-# ERR-RV32: :[[#@LINE-1]]:2: error: invalid instruction, any one of the following would fix this:
-# ERR-RV32: :[[#@LINE-2]]:15: note: unexpected extra operand for instruction
-# ERR-RV32: :[[#@LINE-3]]:11: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-# ERR-RV32: :[[#@LINE-4]]:11: note: immediate must be an integer in the range [-2048, 2047]
-# ERR-RV64: :[[#@LINE-5]]:2: error: invalid instruction, any one of the following would fix this:
-# ERR-RV64: :[[#@LINE-6]]:15: note: unexpected extra operand for instruction
-# ERR-RV64: :[[#@LINE-7]]:11: note: operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]
-# ERR-RV64: :[[#@LINE-8]]:2: note: instruction requires the following: RV32I Base Instruction Set
+# err-rv32-error at -1:2 {{invalid instruction, any one of the following would fix this:}}
+# err-rv32-note at -2:15 {{unexpected extra operand for instruction}}
+# err-rv32-note at -3:11 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+# err-rv32-note at -4:11 {{immediate must be an integer in the range [-2048, 2047]}}
+# err-rv64-error at -5:2 {{invalid instruction, any one of the following would fix this:}}
+# err-rv64-note at -6:15 {{unexpected extra operand for instruction}}
+# err-rv64-note at -7:11 {{operand must be a symbol with %lo/%pcrel_lo/%tprel_lo specifier or an integer in the range [-2048, 2047]}}
+# err-rv64-note at -8:2 {{instruction requires the following: RV32I Base Instruction Set}}
addi a0, t0, %tlsdesc_add_lo(a_symbol)(a4)
-# ERR: :[[#@LINE-1]]:41: error: unexpected extra operand for instruction
+# expected-error at -1:41 {{unexpected extra operand for instruction}}
addi a0, %tlsdesc_add_lo(a_symbol)
-# ERR: :[[#@LINE-1]]:11: error: register must be a GPR
+# expected-error at -1:11 {{register must be a GPR}}
addi x1, %tlsdesc_load_lo(a_symbol)(a0)
-# ERR: :[[#@LINE-1]]:11: error: register must be a GPR
+# expected-error at -1:11 {{register must be a GPR}}
jalr x5, 0(a1), %tlsdesc_hi(a_symbol)
-# ERR: :[[#@LINE-1]]:2: error: invalid instruction, any one of the following would fix this:
-# ERR: :[[#@LINE-2]]:18: note: unexpected extra operand for instruction
-# ERR: :[[#@LINE-3]]:18: note: operand must be a symbol with %tlsdesc_call specifier
+# expected-error at -1:2 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -2:18 {{unexpected extra operand for instruction}}
+# expected-note at -3:18 {{operand must be a symbol with %tlsdesc_call specifier}}
jalr x1, 0(a1), %tlsdesc_call(a_symbol)
-# ERR: :[[#@LINE-1]]:13: error: the output operand must be t0/x5 when using %tlsdesc_call specifier
+# expected-error at -1:13 {{the output operand must be t0/x5 when using %tlsdesc_call specifier}}
.endif
diff --git a/llvm/test/MC/RISCV/xaifet-amo-valid.s b/llvm/test/MC/RISCV/xaifet-amo-valid.s
index cbb1374ba71d01..5ddc60793ae97c 100644
--- a/llvm/test/MC/RISCV/xaifet-amo-valid.s
+++ b/llvm/test/MC/RISCV/xaifet-amo-valid.s
@@ -3,10 +3,8 @@
// CHECK-DISASM: <stdin>: file format elf64-littleriscv
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+xaifet %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+xaifet %s \
# RUN: | llvm-objdump -d --mattr=+xaifet - | FileCheck %s --check-prefix=CHECK-DISASM
@@ -16,402 +14,402 @@
aif.amoaddg.d a4, s9, (t1)
// CHECK-ENCODING: aif.amoaddg.d a4, s9, (t1) # encoding: [0x3b,0x37,0x93,0x03]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0393373b aif.amoaddg.d a4, s9, (t1)
aif.amoaddg.w t1, s5, (t0)
// CHECK-ENCODING: aif.amoaddg.w t1, s5, (t0) # encoding: [0x3b,0xa3,0x52,0x03]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0352a33b aif.amoaddg.w t1, s5, (t0)
aif.amoaddl.d a4, s4, (a6)
// CHECK-ENCODING: aif.amoaddl.d a4, s4, (a6) # encoding: [0x3b,0x37,0x48,0x01]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0148373b aif.amoaddl.d a4, s4, (a6)
aif.amoaddl.w tp, t2, (gp)
// CHECK-ENCODING: aif.amoaddl.w tp, t2, (gp) # encoding: [0x3b,0xa2,0x71,0x00]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0071a23b aif.amoaddl.w tp, t2, (gp)
aif.amoandg.d s2, a5, (a2)
// CHECK-ENCODING: aif.amoandg.d s2, a5, (a2) # encoding: [0x3b,0x39,0xf6,0x62]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 62f6393b aif.amoandg.d s2, a5, (a2)
aif.amoandg.w t0, s8, (s2)
// CHECK-ENCODING: aif.amoandg.w t0, s8, (s2) # encoding: [0xbb,0x22,0x89,0x63]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 638922bb aif.amoandg.w t0, s8, (s2)
aif.amoandl.d sp, ra, (a4)
// CHECK-ENCODING: aif.amoandl.d sp, ra, (a4) # encoding: [0x3b,0x31,0x17,0x60]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6017313b aif.amoandl.d sp, ra, (a4)
aif.amoandl.w t5, s0, (gp)
// CHECK-ENCODING: aif.amoandl.w t5, s0, (gp) # encoding: [0x3b,0xaf,0x81,0x60]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6081af3b aif.amoandl.w t5, s0, (gp)
aif.amocmpswapg.d fp, gp, (a3)
// CHECK-ENCODING: aif.amocmpswapg.d s0, gp, (a3) # encoding: [0x3b,0xb4,0x36,0xf2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f236b43b aif.amocmpswapg.d s0, gp, (a3)
aif.amocmpswapg.w a5, tp, (s8)
// CHECK-ENCODING: aif.amocmpswapg.w a5, tp, (s8) # encoding: [0xbb,0x27,0x4c,0xf2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f24c27bb aif.amocmpswapg.w a5, tp, (s8)
aif.amocmpswapl.d t5, s6, (s1)
// CHECK-ENCODING: aif.amocmpswapl.d t5, s6, (s1) # encoding: [0x3b,0xbf,0x64,0xf1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f164bf3b aif.amocmpswapl.d t5, s6, (s1)
aif.amocmpswapl.w a7, s0, (sp)
// CHECK-ENCODING: aif.amocmpswapl.w a7, s0, (sp) # encoding: [0xbb,0x28,0x81,0xf0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f08128bb aif.amocmpswapl.w a7, s0, (sp)
aif.amomaxg.d tp, s10, (a2)
// CHECK-ENCODING: aif.amomaxg.d tp, s10, (a2) # encoding: [0x3b,0x32,0xa6,0xa3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a3a6323b aif.amomaxg.d tp, s10, (a2)
aif.amomaxg.w a0, s6, (a1)
// CHECK-ENCODING: aif.amomaxg.w a0, s6, (a1) # encoding: [0x3b,0xa5,0x65,0xa3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a365a53b aif.amomaxg.w a0, s6, (a1)
aif.amomaxl.d a6, s7, (s4)
// CHECK-ENCODING: aif.amomaxl.d a6, s7, (s4) # encoding: [0x3b,0x38,0x7a,0xa1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a17a383b aif.amomaxl.d a6, s7, (s4)
aif.amomaxl.w s4, s3, (a7)
// CHECK-ENCODING: aif.amomaxl.w s4, s3, (a7) # encoding: [0x3b,0xaa,0x38,0xa1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a138aa3b aif.amomaxl.w s4, s3, (a7)
aif.amomaxug.d t0, s4, (t2)
// CHECK-ENCODING: aif.amomaxug.d t0, s4, (t2) # encoding: [0xbb,0xb2,0x43,0xe3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e343b2bb aif.amomaxug.d t0, s4, (t2)
aif.amomaxug.w s5, t5, (t2)
// CHECK-ENCODING: aif.amomaxug.w s5, t5, (t2) # encoding: [0xbb,0xaa,0xe3,0xe3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e3e3aabb aif.amomaxug.w s5, t5, (t2)
aif.amomaxul.d t2, t2, (tp)
// CHECK-ENCODING: aif.amomaxul.d t2, t2, (tp) # encoding: [0xbb,0x33,0x72,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e07233bb aif.amomaxul.d t2, t2, (tp)
aif.amomaxul.w t5, a2, (t4)
// CHECK-ENCODING: aif.amomaxul.w t5, a2, (t4) # encoding: [0x3b,0xaf,0xce,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e0ceaf3b aif.amomaxul.w t5, a2, (t4)
aif.amoming.d fp, t0, (s1)
// CHECK-ENCODING: aif.amoming.d s0, t0, (s1) # encoding: [0x3b,0xb4,0x54,0x82]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8254b43b aif.amoming.d s0, t0, (s1)
aif.amoming.w a1, s4, (t2)
// CHECK-ENCODING: aif.amoming.w a1, s4, (t2) # encoding: [0xbb,0xa5,0x43,0x83]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8343a5bb aif.amoming.w a1, s4, (t2)
aif.amominl.d t0, a5, (t3)
// CHECK-ENCODING: aif.amominl.d t0, a5, (t3) # encoding: [0xbb,0x32,0xfe,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 80fe32bb aif.amominl.d t0, a5, (t3)
aif.amominl.w t3, s5, (gp)
// CHECK-ENCODING: aif.amominl.w t3, s5, (gp) # encoding: [0x3b,0xae,0x51,0x81]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8151ae3b aif.amominl.w t3, s5, (gp)
aif.amominug.d s9, t1, (s3)
// CHECK-ENCODING: aif.amominug.d s9, t1, (s3) # encoding: [0xbb,0xbc,0x69,0xc2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c269bcbb aif.amominug.d s9, t1, (s3)
aif.amominug.w a4, fp, (gp)
// CHECK-ENCODING: aif.amominug.w a4, s0, (gp) # encoding: [0x3b,0xa7,0x81,0xc2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c281a73b aif.amominug.w a4, s0, (gp)
aif.amominul.d ra, a6, (ra)
// CHECK-ENCODING: aif.amominul.d ra, a6, (ra) # encoding: [0xbb,0xb0,0x00,0xc1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c100b0bb aif.amominul.d ra, a6, (ra)
aif.amominul.w a1, a3, (s8)
// CHECK-ENCODING: aif.amominul.w a1, a3, (s8) # encoding: [0xbb,0x25,0xdc,0xc0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c0dc25bb aif.amominul.w a1, a3, (s8)
aif.amoorg.d a5, a7, (a4)
// CHECK-ENCODING: aif.amoorg.d a5, a7, (a4) # encoding: [0xbb,0x37,0x17,0x43]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 431737bb aif.amoorg.d a5, a7, (a4)
aif.amoorg.w s10, a5, (s9)
// CHECK-ENCODING: aif.amoorg.w s10, a5, (s9) # encoding: [0x3b,0xad,0xfc,0x42]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 42fcad3b aif.amoorg.w s10, a5, (s9)
aif.amoorl.d ra, t3, (zero)
// CHECK-ENCODING: aif.amoorl.d ra, t3, (zero) # encoding: [0xbb,0x30,0xc0,0x41]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 41c030bb aif.amoorl.d ra, t3, (zero)
aif.amoorl.w t5, a5, (a7)
// CHECK-ENCODING: aif.amoorl.w t5, a5, (a7) # encoding: [0x3b,0xaf,0xf8,0x40]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 40f8af3b aif.amoorl.w t5, a5, (a7)
aif.amoswapg.d s7, sp, (sp)
// CHECK-ENCODING: aif.amoswapg.d s7, sp, (sp) # encoding: [0xbb,0x3b,0x21,0x0a]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0a213bbb aif.amoswapg.d s7, sp, (sp)
aif.amoswapg.w a7, t3, (s9)
// CHECK-ENCODING: aif.amoswapg.w a7, t3, (s9) # encoding: [0xbb,0xa8,0xcc,0x0b]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0bcca8bb aif.amoswapg.w a7, t3, (s9)
aif.amoswapl.d sp, gp, (t5)
// CHECK-ENCODING: aif.amoswapl.d sp, gp, (t5) # encoding: [0x3b,0x31,0x3f,0x08]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 083f313b aif.amoswapl.d sp, gp, (t5)
aif.amoswapl.w s1, a7, (s9)
// CHECK-ENCODING: aif.amoswapl.w s1, a7, (s9) # encoding: [0xbb,0xa4,0x1c,0x09]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 091ca4bb aif.amoswapl.w s1, a7, (s9)
aif.amoxorg.d t4, s1, (s1)
// CHECK-ENCODING: aif.amoxorg.d t4, s1, (s1) # encoding: [0xbb,0xbe,0x94,0x22]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2294bebb aif.amoxorg.d t4, s1, (s1)
aif.amoxorg.w gp, a4, (sp)
// CHECK-ENCODING: aif.amoxorg.w gp, a4, (sp) # encoding: [0xbb,0x21,0xe1,0x22]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 22e121bb aif.amoxorg.w gp, a4, (sp)
aif.amoxorl.d sp, a0, (a0)
// CHECK-ENCODING: aif.amoxorl.d sp, a0, (a0) # encoding: [0x3b,0x31,0xa5,0x20]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 20a5313b aif.amoxorl.d sp, a0, (a0)
aif.amoxorl.w s1, a7, (fp)
// CHECK-ENCODING: aif.amoxorl.w s1, a7, (s0) # encoding: [0xbb,0x24,0x14,0x21]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 211424bb aif.amoxorl.w s1, a7, (s0)
aif.amoaddg.d a4, s9, 0(t1)
// CHECK-ENCODING: aif.amoaddg.d a4, s9, (t1) # encoding: [0x3b,0x37,0x93,0x03]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0393373b aif.amoaddg.d a4, s9, (t1)
aif.amoaddg.w t1, s5, 0(t0)
// CHECK-ENCODING: aif.amoaddg.w t1, s5, (t0) # encoding: [0x3b,0xa3,0x52,0x03]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0352a33b aif.amoaddg.w t1, s5, (t0)
aif.amoaddl.d a4, s4, 0(a6)
// CHECK-ENCODING: aif.amoaddl.d a4, s4, (a6) # encoding: [0x3b,0x37,0x48,0x01]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0148373b aif.amoaddl.d a4, s4, (a6)
aif.amoaddl.w tp, t2, 0(gp)
// CHECK-ENCODING: aif.amoaddl.w tp, t2, (gp) # encoding: [0x3b,0xa2,0x71,0x00]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0071a23b aif.amoaddl.w tp, t2, (gp)
aif.amoandg.d s2, a5, 0(a2)
// CHECK-ENCODING: aif.amoandg.d s2, a5, (a2) # encoding: [0x3b,0x39,0xf6,0x62]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 62f6393b aif.amoandg.d s2, a5, (a2)
aif.amoandg.w t0, s8, 0(s2)
// CHECK-ENCODING: aif.amoandg.w t0, s8, (s2) # encoding: [0xbb,0x22,0x89,0x63]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 638922bb aif.amoandg.w t0, s8, (s2)
aif.amoandl.d sp, ra, 0(a4)
// CHECK-ENCODING: aif.amoandl.d sp, ra, (a4) # encoding: [0x3b,0x31,0x17,0x60]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6017313b aif.amoandl.d sp, ra, (a4)
aif.amoandl.w t5, s0, 0(gp)
// CHECK-ENCODING: aif.amoandl.w t5, s0, (gp) # encoding: [0x3b,0xaf,0x81,0x60]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6081af3b aif.amoandl.w t5, s0, (gp)
aif.amocmpswapg.d fp, gp, 0(a3)
// CHECK-ENCODING: aif.amocmpswapg.d s0, gp, (a3) # encoding: [0x3b,0xb4,0x36,0xf2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f236b43b aif.amocmpswapg.d s0, gp, (a3)
aif.amocmpswapg.w a5, tp, 0(s8)
// CHECK-ENCODING: aif.amocmpswapg.w a5, tp, (s8) # encoding: [0xbb,0x27,0x4c,0xf2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f24c27bb aif.amocmpswapg.w a5, tp, (s8)
aif.amocmpswapl.d t5, s6, 0(s1)
// CHECK-ENCODING: aif.amocmpswapl.d t5, s6, (s1) # encoding: [0x3b,0xbf,0x64,0xf1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f164bf3b aif.amocmpswapl.d t5, s6, (s1)
aif.amocmpswapl.w a7, s0, 0(sp)
// CHECK-ENCODING: aif.amocmpswapl.w a7, s0, (sp) # encoding: [0xbb,0x28,0x81,0xf0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f08128bb aif.amocmpswapl.w a7, s0, (sp)
aif.amomaxg.d tp, s10, 0(a2)
// CHECK-ENCODING: aif.amomaxg.d tp, s10, (a2) # encoding: [0x3b,0x32,0xa6,0xa3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a3a6323b aif.amomaxg.d tp, s10, (a2)
aif.amomaxg.w a0, s6, 0(a1)
// CHECK-ENCODING: aif.amomaxg.w a0, s6, (a1) # encoding: [0x3b,0xa5,0x65,0xa3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a365a53b aif.amomaxg.w a0, s6, (a1)
aif.amomaxl.d a6, s7, 0(s4)
// CHECK-ENCODING: aif.amomaxl.d a6, s7, (s4) # encoding: [0x3b,0x38,0x7a,0xa1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a17a383b aif.amomaxl.d a6, s7, (s4)
aif.amomaxl.w s4, s3, 0(a7)
// CHECK-ENCODING: aif.amomaxl.w s4, s3, (a7) # encoding: [0x3b,0xaa,0x38,0xa1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a138aa3b aif.amomaxl.w s4, s3, (a7)
aif.amomaxug.d t0, s4, 0(t2)
// CHECK-ENCODING: aif.amomaxug.d t0, s4, (t2) # encoding: [0xbb,0xb2,0x43,0xe3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e343b2bb aif.amomaxug.d t0, s4, (t2)
aif.amomaxug.w s5, t5, 0(t2)
// CHECK-ENCODING: aif.amomaxug.w s5, t5, (t2) # encoding: [0xbb,0xaa,0xe3,0xe3]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e3e3aabb aif.amomaxug.w s5, t5, (t2)
aif.amomaxul.d t2, t2, 0(tp)
// CHECK-ENCODING: aif.amomaxul.d t2, t2, (tp) # encoding: [0xbb,0x33,0x72,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e07233bb aif.amomaxul.d t2, t2, (tp)
aif.amomaxul.w t5, a2, 0(t4)
// CHECK-ENCODING: aif.amomaxul.w t5, a2, (t4) # encoding: [0x3b,0xaf,0xce,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e0ceaf3b aif.amomaxul.w t5, a2, (t4)
aif.amoming.d fp, t0, 0(s1)
// CHECK-ENCODING: aif.amoming.d s0, t0, (s1) # encoding: [0x3b,0xb4,0x54,0x82]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8254b43b aif.amoming.d s0, t0, (s1)
aif.amoming.w a1, s4, 0(t2)
// CHECK-ENCODING: aif.amoming.w a1, s4, (t2) # encoding: [0xbb,0xa5,0x43,0x83]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8343a5bb aif.amoming.w a1, s4, (t2)
aif.amominl.d t0, a5, 0(t3)
// CHECK-ENCODING: aif.amominl.d t0, a5, (t3) # encoding: [0xbb,0x32,0xfe,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 80fe32bb aif.amominl.d t0, a5, (t3)
aif.amominl.w t3, s5, 0(gp)
// CHECK-ENCODING: aif.amominl.w t3, s5, (gp) # encoding: [0x3b,0xae,0x51,0x81]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8151ae3b aif.amominl.w t3, s5, (gp)
aif.amominug.d s9, t1, 0(s3)
// CHECK-ENCODING: aif.amominug.d s9, t1, (s3) # encoding: [0xbb,0xbc,0x69,0xc2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c269bcbb aif.amominug.d s9, t1, (s3)
aif.amominug.w a4, fp, 0(gp)
// CHECK-ENCODING: aif.amominug.w a4, s0, (gp) # encoding: [0x3b,0xa7,0x81,0xc2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c281a73b aif.amominug.w a4, s0, (gp)
aif.amominul.d ra, a6, 0(ra)
// CHECK-ENCODING: aif.amominul.d ra, a6, (ra) # encoding: [0xbb,0xb0,0x00,0xc1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c100b0bb aif.amominul.d ra, a6, (ra)
aif.amominul.w a1, a3, 0(s8)
// CHECK-ENCODING: aif.amominul.w a1, a3, (s8) # encoding: [0xbb,0x25,0xdc,0xc0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c0dc25bb aif.amominul.w a1, a3, (s8)
aif.amoorg.d a5, a7, 0(a4)
// CHECK-ENCODING: aif.amoorg.d a5, a7, (a4) # encoding: [0xbb,0x37,0x17,0x43]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 431737bb aif.amoorg.d a5, a7, (a4)
aif.amoorg.w s10, a5, 0(s9)
// CHECK-ENCODING: aif.amoorg.w s10, a5, (s9) # encoding: [0x3b,0xad,0xfc,0x42]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 42fcad3b aif.amoorg.w s10, a5, (s9)
aif.amoorl.d ra, t3, 0(zero)
// CHECK-ENCODING: aif.amoorl.d ra, t3, (zero) # encoding: [0xbb,0x30,0xc0,0x41]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 41c030bb aif.amoorl.d ra, t3, (zero)
aif.amoorl.w t5, a5, 0(a7)
// CHECK-ENCODING: aif.amoorl.w t5, a5, (a7) # encoding: [0x3b,0xaf,0xf8,0x40]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 40f8af3b aif.amoorl.w t5, a5, (a7)
aif.amoswapg.d s7, sp, 0(sp)
// CHECK-ENCODING: aif.amoswapg.d s7, sp, (sp) # encoding: [0xbb,0x3b,0x21,0x0a]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0a213bbb aif.amoswapg.d s7, sp, (sp)
aif.amoswapg.w a7, t3, 0(s9)
// CHECK-ENCODING: aif.amoswapg.w a7, t3, (s9) # encoding: [0xbb,0xa8,0xcc,0x0b]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0bcca8bb aif.amoswapg.w a7, t3, (s9)
aif.amoswapl.d sp, gp, 0(t5)
// CHECK-ENCODING: aif.amoswapl.d sp, gp, (t5) # encoding: [0x3b,0x31,0x3f,0x08]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 083f313b aif.amoswapl.d sp, gp, (t5)
aif.amoswapl.w s1, a7, 0(s9)
// CHECK-ENCODING: aif.amoswapl.w s1, a7, (s9) # encoding: [0xbb,0xa4,0x1c,0x09]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 091ca4bb aif.amoswapl.w s1, a7, (s9)
aif.amoxorg.d t4, s1, 0(s1)
// CHECK-ENCODING: aif.amoxorg.d t4, s1, (s1) # encoding: [0xbb,0xbe,0x94,0x22]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2294bebb aif.amoxorg.d t4, s1, (s1)
aif.amoxorg.w gp, a4, 0(sp)
// CHECK-ENCODING: aif.amoxorg.w gp, a4, (sp) # encoding: [0xbb,0x21,0xe1,0x22]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 22e121bb aif.amoxorg.w gp, a4, (sp)
aif.amoxorl.d sp, a0, 0(a0)
// CHECK-ENCODING: aif.amoxorl.d sp, a0, (a0) # encoding: [0x3b,0x31,0xa5,0x20]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 20a5313b aif.amoxorl.d sp, a0, (a0)
aif.amoxorl.w s1, a7, 0(fp)
// CHECK-ENCODING: aif.amoxorl.w s1, a7, (s0) # encoding: [0xbb,0x24,0x14,0x21]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 211424bb aif.amoxorl.w s1, a7, (s0)
#====----------------------------------------------------------------------===//
@@ -420,112 +418,112 @@ aif.amoxorl.w s1, a7, 0(fp)
aif.famoaddg.pi fa5, ft5, (a5)
// CHECK-ENCODING: aif.famoaddg.pi fa5, ft5, (a5) # encoding: [0x8b,0xc7,0xf2,0x86]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 86f2c78b aif.famoaddg.pi fa5, ft5, (a5)
aif.famoaddl.pi fs3, ft1, (gp)
// CHECK-ENCODING: aif.famoaddl.pi fs3, ft1, (gp) # encoding: [0x8b,0xc9,0x30,0x06]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0630c98b aif.famoaddl.pi fs3, ft1, (gp)
aif.famoandg.pi fs7, ft5, (s3)
// CHECK-ENCODING: aif.famoandg.pi fs7, ft5, (s3) # encoding: [0x8b,0xcb,0x32,0x97]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 9732cb8b aif.famoandg.pi fs7, ft5, (s3)
aif.famoandl.pi fs6, fs5, (a0)
// CHECK-ENCODING: aif.famoandl.pi fs6, fs5, (a0) # encoding: [0x0b,0xcb,0xaa,0x16]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 16aacb0b aif.famoandl.pi fs6, fs5, (a0)
aif.famomaxg.pi ft0, ft10, (s6)
// CHECK-ENCODING: aif.famomaxg.pi ft0, ft10, (s6) # encoding: [0x0b,0x40,0x6f,0xb7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: b76f400b aif.famomaxg.pi ft0, ft10, (s6)
aif.famomaxg.ps fs1, fs9, (s7)
// CHECK-ENCODING: aif.famomaxg.ps fs1, fs9, (s7) # encoding: [0x8b,0xc4,0x7c,0xa9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a97cc48b aif.famomaxg.ps fs1, fs9, (s7)
aif.famomaxl.pi ft11, ft6, (t5)
// CHECK-ENCODING: aif.famomaxl.pi ft11, ft6, (t5) # encoding: [0x8b,0x4f,0xe3,0x37]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 37e34f8b aif.famomaxl.pi ft11, ft6, (t5)
aif.famomaxl.ps fs6, fs9, (zero)
// CHECK-ENCODING: aif.famomaxl.ps fs6, fs9, (zero) # encoding: [0x0b,0xcb,0x0c,0x28]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 280ccb0b aif.famomaxl.ps fs6, fs9, (zero)
aif.famomaxug.pi ft9, fs1, (s5)
// CHECK-ENCODING: aif.famomaxug.pi ft9, fs1, (s5) # encoding: [0x8b,0xce,0x54,0xc7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c754ce8b aif.famomaxug.pi ft9, fs1, (s5)
aif.famomaxul.pi ft11, fs3, (s4)
// CHECK-ENCODING: aif.famomaxul.pi ft11, fs3, (s4) # encoding: [0x8b,0xcf,0x49,0x47]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 4749cf8b aif.famomaxul.pi ft11, fs3, (s4)
aif.famoming.pi fa5, ft6, (a7)
// CHECK-ENCODING: aif.famoming.pi fa5, ft6, (a7) # encoding: [0x8b,0x47,0x13,0xaf]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: af13478b aif.famoming.pi fa5, ft6, (a7)
aif.famoming.ps ft2, ft8, (fp)
// CHECK-ENCODING: aif.famoming.ps ft2, ft8, (s0) # encoding: [0x0b,0x41,0x8e,0xb0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: b08e410b aif.famoming.ps ft2, ft8, (s0)
aif.famominl.pi ft6, fs2, (a0)
// CHECK-ENCODING: aif.famominl.pi ft6, fs2, (a0) # encoding: [0x0b,0x43,0xa9,0x2e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2ea9430b aif.famominl.pi ft6, fs2, (a0)
aif.famominl.ps ft5, ft4, (s3)
// CHECK-ENCODING: aif.famominl.ps ft5, ft4, (s3) # encoding: [0x8b,0x42,0x32,0x31]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 3132428b aif.famominl.ps ft5, ft4, (s3)
aif.famominug.pi ft7, fs10, (s1)
// CHECK-ENCODING: aif.famominug.pi ft7, fs10, (s1) # encoding: [0x8b,0x43,0x9d,0xbe]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: be9d438b aif.famominug.pi ft7, fs10, (s1)
aif.famominul.pi fa6, fs10, (tp)
// CHECK-ENCODING: aif.famominul.pi fa6, fs10, (tp) # encoding: [0x0b,0x48,0x4d,0x3e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 3e4d480b aif.famominul.pi fa6, fs10, (tp)
aif.famoorg.pi ft9, fs8, (gp)
// CHECK-ENCODING: aif.famoorg.pi ft9, fs8, (gp) # encoding: [0x8b,0x4e,0x3c,0x9e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 9e3c4e8b aif.famoorg.pi ft9, fs8, (gp)
aif.famoorl.pi fa0, ft8, (s5)
// CHECK-ENCODING: aif.famoorl.pi fa0, ft8, (s5) # encoding: [0x0b,0x45,0x5e,0x1f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1f5e450b aif.famoorl.pi fa0, ft8, (s5)
aif.famoswapg.pi fs5, fs9, (s10)
// CHECK-ENCODING: aif.famoswapg.pi fs5, fs9, (s10) # encoding: [0x8b,0xca,0xac,0x8f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8facca8b aif.famoswapg.pi fs5, fs9, (s10)
aif.famoswapl.pi fs0, fa4, (s10)
// CHECK-ENCODING: aif.famoswapl.pi fs0, fa4, (s10) # encoding: [0x0b,0x44,0xa7,0x0f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0fa7440b aif.famoswapl.pi fs0, fa4, (s10)
aif.famoxorg.pi fs7, ft9, (t5)
// CHECK-ENCODING: aif.famoxorg.pi fs7, ft9, (t5) # encoding: [0x8b,0xcb,0xee,0xa7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a7eecb8b aif.famoxorg.pi fs7, ft9, (t5)
aif.famoxorl.pi fa7, fs7, (a4)
// CHECK-ENCODING: aif.famoxorl.pi fa7, fs7, (a4) # encoding: [0x8b,0xc8,0xeb,0x26]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 26ebc88b aif.famoxorl.pi fa7, fs7, (a4)
#====----------------------------------------------------------------------===//
@@ -534,42 +532,42 @@ aif.famoxorl.pi fa7, fs7, (a4)
aif.fgbg.ps fs7, fs6, (s0)
// CHECK-ENCODING: aif.fgbg.ps fs7, fs6, (s0) # encoding: [0x8b,0x7b,0x8b,0x82]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 828b7b8b aif.fgbg.ps fs7, fs6, (s0)
aif.fghg.ps fa4, fs8, (s6)
// CHECK-ENCODING: aif.fghg.ps fa4, fs8, (s6) # encoding: [0x0b,0x77,0x6c,0x8b]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8b6c770b aif.fghg.ps fa4, fs8, (s6)
aif.fgwg.ps fa6, fs6, (tp)
// CHECK-ENCODING: aif.fgwg.ps fa6, fs6, (tp) # encoding: [0x0b,0x78,0x4b,0x92]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 924b780b aif.fgwg.ps fa6, fs6, (tp)
aif.flwg.ps fs10, (a4)
// CHECK-ENCODING: aif.flwg.ps fs10, (a4) # encoding: [0x0b,0x7d,0x07,0x12]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 12077d0b aif.flwg.ps fs10, (a4)
aif.fscbg.ps fa6, fs5, (t0)
// CHECK-ENCODING: aif.fscbg.ps fa6, fs5, (t0) # encoding: [0x0b,0xf8,0x5a,0xc2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c25af80b aif.fscbg.ps fa6, fs5, (t0)
aif.fschg.ps fa3, fs9, (s8)
// CHECK-ENCODING: aif.fschg.ps fa3, fs9, (s8) # encoding: [0x8b,0xf6,0x8c,0xcb]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: cb8cf68b aif.fschg.ps fa3, fs9, (s8)
aif.fscwg.ps ft4, fs9, (s0)
// CHECK-ENCODING: aif.fscwg.ps ft4, fs9, (s0) # encoding: [0x0b,0xf2,0x8c,0xd2]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d28cf20b aif.fscwg.ps ft4, fs9, (s0)
aif.fswg.ps fa5, (t5)
// CHECK-ENCODING: aif.fswg.ps fa5, (t5) # encoding: [0x8b,0x77,0x0f,0x52]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 520f778b aif.fswg.ps fa5, (t5)
#====----------------------------------------------------------------------===//
@@ -578,42 +576,42 @@ aif.fswg.ps fa5, (t5)
aif.fgbl.ps fs3, ft11, (ra)
// CHECK-ENCODING: aif.fgbl.ps fs3, ft11, (ra) # encoding: [0x8b,0xf9,0x1f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 801ff98b aif.fgbl.ps fs3, ft11, (ra)
aif.fghl.ps ft1, fs2, (s5)
// CHECK-ENCODING: aif.fghl.ps ft1, fs2, (s5) # encoding: [0x8b,0x70,0x59,0x89]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8959708b aif.fghl.ps ft1, fs2, (s5)
aif.fgwl.ps ft6, fs2, (gp)
// CHECK-ENCODING: aif.fgwl.ps ft6, fs2, (gp) # encoding: [0x0b,0x73,0x39,0x90]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 9039730b aif.fgwl.ps ft6, fs2, (gp)
aif.flwl.ps fs1, (t2)
// CHECK-ENCODING: aif.flwl.ps fs1, (t2) # encoding: [0x8b,0xf4,0x03,0x10]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1003f48b aif.flwl.ps fs1, (t2)
aif.fscbl.ps ft5, ft7, (s5)
// CHECK-ENCODING: aif.fscbl.ps ft5, ft7, (s5) # encoding: [0x8b,0xf2,0x53,0xc1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c153f28b aif.fscbl.ps ft5, ft7, (s5)
aif.fschl.ps fs8, ft1, (t1)
// CHECK-ENCODING: aif.fschl.ps fs8, ft1, (t1) # encoding: [0x0b,0xfc,0x60,0xc8]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c860fc0b aif.fschl.ps fs8, ft1, (t1)
aif.fscwl.ps fs0, ft11, (ra)
// CHECK-ENCODING: aif.fscwl.ps fs0, ft11, (ra) # encoding: [0x0b,0xf4,0x1f,0xd0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d01ff40b aif.fscwl.ps fs0, ft11, (ra)
aif.fswl.ps ft7, (t2)
// CHECK-ENCODING: aif.fswl.ps ft7, (t2) # encoding: [0x8b,0xf3,0x03,0x50]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 5003f38b aif.fswl.ps ft7, (t2)
#====----------------------------------------------------------------------===//
@@ -622,22 +620,22 @@ aif.fswl.ps ft7, (t2)
aif.sbg a6, (t4)
// CHECK-ENCODING: aif.sbg a6, (t4) # encoding: [0x3b,0xb0,0x0e,0x13]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 130eb03b aif.sbg a6, (t4)
aif.shg sp, (s6)
// CHECK-ENCODING: aif.shg sp, (s6) # encoding: [0x3b,0x30,0x2b,0x1a]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1a2b303b aif.shg sp, (s6)
aif.sbg a6, 0(t4)
// CHECK-ENCODING: aif.sbg a6, (t4) # encoding: [0x3b,0xb0,0x0e,0x13]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 130eb03b aif.sbg a6, (t4)
aif.shg sp, 0(s6)
// CHECK-ENCODING: aif.shg sp, (s6) # encoding: [0x3b,0x30,0x2b,0x1a]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1a2b303b aif.shg sp, (s6)
#====----------------------------------------------------------------------===//
@@ -646,22 +644,22 @@ aif.shg sp, 0(s6)
aif.sbl a3, (fp)
// CHECK-ENCODING: aif.sbl a3, (s0) # encoding: [0x3b,0x30,0xd4,0x10]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 10d4303b aif.sbl a3, (s0)
aif.shl fp, (s10)
// CHECK-ENCODING: aif.shl s0, (s10) # encoding: [0x3b,0x30,0x8d,0x18]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 188d303b aif.shl s0, (s10)
aif.sbl a3, 0(fp)
// CHECK-ENCODING: aif.sbl a3, (s0) # encoding: [0x3b,0x30,0xd4,0x10]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 10d4303b aif.sbl a3, (s0)
aif.shl fp, 0(s10)
// CHECK-ENCODING: aif.shl s0, (s10) # encoding: [0x3b,0x30,0x8d,0x18]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 188d303b aif.shl s0, (s10)
#====----------------------------------------------------------------------===//
@@ -670,270 +668,270 @@ aif.shl fp, 0(s10)
csrwi aif.matp, 0x1f
// CHECK-ENCODING: csrwi aif.matp, 31 # encoding: [0x73,0xd0,0x0f,0x7c]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.matp' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.matp' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7c0fd073 csrwi aif.matp, 0x1f
csrwi aif.minstmask, 0x1f
// CHECK-ENCODING: csrwi aif.minstmask, 31 # encoding: [0x73,0xd0,0xdf,0x7c]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.minstmask' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.minstmask' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7cdfd073 csrwi aif.minstmask, 0x1f
csrwi aif.minstmatch, 0x1f
// CHECK-ENCODING: csrwi aif.minstmatch, 31 # encoding: [0x73,0xd0,0xef,0x7c]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.minstmatch' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.minstmatch' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7cefd073 csrwi aif.minstmatch, 0x1f
csrwi aif.cache_invalidate, 0x1f
// CHECK-ENCODING: csrwi aif.cache_invalidate, 31 # encoding: [0x73,0xd0,0x0f,0x7d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.cache_invalidate' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.cache_invalidate' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7d0fd073 csrwi aif.cache_invalidate, 0x1f
csrwi aif.menable_shadows, 0x1f
// CHECK-ENCODING: csrwi aif.menable_shadows, 31 # encoding: [0x73,0xd0,0x2f,0x7d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.menable_shadows' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.menable_shadows' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7d2fd073 csrwi aif.menable_shadows, 0x1f
csrwi aif.excl_mode, 0x1f
// CHECK-ENCODING: csrwi aif.excl_mode, 31 # encoding: [0x73,0xd0,0x3f,0x7d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.excl_mode' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.excl_mode' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7d3fd073 csrwi aif.excl_mode, 0x1f
csrwi aif.mbusaddr, 0x1f
// CHECK-ENCODING: csrwi aif.mbusaddr, 31 # encoding: [0x73,0xd0,0x5f,0x7d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.mbusaddr' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.mbusaddr' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7d5fd073 csrwi aif.mbusaddr, 0x1f
csrwi aif.mcache_control, 0x1f
// CHECK-ENCODING: csrwi aif.mcache_control, 31 # encoding: [0x73,0xd0,0x0f,0x7e]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.mcache_control' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.mcache_control' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7e0fd073 csrwi aif.mcache_control, 0x1f
csrwi aif.evict_sw, 0x1f
// CHECK-ENCODING: csrwi aif.evict_sw, 31 # encoding: [0x73,0xd0,0x9f,0x7f]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.evict_sw' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.evict_sw' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7f9fd073 csrwi aif.evict_sw, 0x1f
csrwi aif.flush_sw, 0x1f
// CHECK-ENCODING: csrwi aif.flush_sw, 31 # encoding: [0x73,0xd0,0xbf,0x7f]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.flush_sw' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.flush_sw' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7fbfd073 csrwi aif.flush_sw, 0x1f
csrwi aif.lock_sw, 0x1f
// CHECK-ENCODING: csrwi aif.lock_sw, 31 # encoding: [0x73,0xd0,0xdf,0x7f]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.lock_sw' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.lock_sw' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7fdfd073 csrwi aif.lock_sw, 0x1f
csrwi aif.unlock_sw, 0x1f
// CHECK-ENCODING: csrwi aif.unlock_sw, 31 # encoding: [0x73,0xd0,0xff,0x7f]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.unlock_sw' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.unlock_sw' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 7fffd073 csrwi aif.unlock_sw, 0x1f
csrwi aif.tensor_reduce, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_reduce, 31 # encoding: [0x73,0xd0,0x0f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_reduce' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_reduce' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 800fd073 csrwi aif.tensor_reduce, 0x1f
csrwi aif.tensor_fma, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_fma, 31 # encoding: [0x73,0xd0,0x1f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_fma' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_fma' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 801fd073 csrwi aif.tensor_fma, 0x1f
csrwi aif.tensor_conv_size, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_conv_size, 31 # encoding: [0x73,0xd0,0x2f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_conv_size' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_conv_size' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 802fd073 csrwi aif.tensor_conv_size, 0x1f
csrwi aif.tensor_conv_ctrl, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_conv_ctrl, 31 # encoding: [0x73,0xd0,0x3f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_conv_ctrl' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_conv_ctrl' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 803fd073 csrwi aif.tensor_conv_ctrl, 0x1f
csrwi aif.tensor_coop, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_coop, 31 # encoding: [0x73,0xd0,0x4f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_coop' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_coop' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 804fd073 csrwi aif.tensor_coop, 0x1f
csrwi aif.tensor_mask, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_mask, 31 # encoding: [0x73,0xd0,0x5f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_mask' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_mask' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 805fd073 csrwi aif.tensor_mask, 0x1f
csrwi aif.tensor_quant, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_quant, 31 # encoding: [0x73,0xd0,0x6f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_quant' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_quant' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 806fd073 csrwi aif.tensor_quant, 0x1f
csrwi aif.tex_send, 0x1f
// CHECK-ENCODING: csrwi aif.tex_send, 31 # encoding: [0x73,0xd0,0x7f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tex_send' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tex_send' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 807fd073 csrwi aif.tex_send, 0x1f
csrwi aif.tensor_error, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_error, 31 # encoding: [0x73,0xd0,0x8f,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_error' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_error' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 808fd073 csrwi aif.tensor_error, 0x1f
csrwi aif.ucache_control, 0x1f
// CHECK-ENCODING: csrwi aif.ucache_control, 31 # encoding: [0x73,0xd0,0x0f,0x81]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.ucache_control' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.ucache_control' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 810fd073 csrwi aif.ucache_control, 0x1f
csrwi aif.prefetch_va, 0x1f
// CHECK-ENCODING: csrwi aif.prefetch_va, 31 # encoding: [0x73,0xd0,0xff,0x81]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.prefetch_va' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.prefetch_va' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 81ffd073 csrwi aif.prefetch_va, 0x1f
csrwi aif.flb, 0x1f
// CHECK-ENCODING: csrwi aif.flb, 31 # encoding: [0x73,0xd0,0x0f,0x82]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.flb' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.flb' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 820fd073 csrwi aif.flb, 0x1f
csrwi aif.fcc, 0x1f
// CHECK-ENCODING: csrwi aif.fcc, 31 # encoding: [0x73,0xd0,0x1f,0x82]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.fcc' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.fcc' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 821fd073 csrwi aif.fcc, 0x1f
csrwi aif.stall, 0x1f
// CHECK-ENCODING: csrwi aif.stall, 31 # encoding: [0x73,0xd0,0x2f,0x82]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.stall' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.stall' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 822fd073 csrwi aif.stall, 0x1f
csrwi aif.tensor_wait, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_wait, 31 # encoding: [0x73,0xd0,0x0f,0x83]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_wait' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_wait' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 830fd073 csrwi aif.tensor_wait, 0x1f
csrwi aif.tensor_load, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_load, 31 # encoding: [0x73,0xd0,0xff,0x83]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_load' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_load' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 83ffd073 csrwi aif.tensor_load, 0x1f
csrwi aif.gsc_progress, 0x1f
// CHECK-ENCODING: csrwi aif.gsc_progress, 31 # encoding: [0x73,0xd0,0x0f,0x84]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.gsc_progress' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.gsc_progress' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 840fd073 csrwi aif.gsc_progress, 0x1f
csrwi aif.tensor_load_l2, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_load_l2, 31 # encoding: [0x73,0xd0,0xff,0x85]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_load_l2' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_load_l2' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 85ffd073 csrwi aif.tensor_load_l2, 0x1f
csrwi aif.tensor_store, 0x1f
// CHECK-ENCODING: csrwi aif.tensor_store, 31 # encoding: [0x73,0xd0,0xff,0x87]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.tensor_store' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.tensor_store' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 87ffd073 csrwi aif.tensor_store, 0x1f
csrwi aif.evict_va, 0x1f
// CHECK-ENCODING: csrwi aif.evict_va, 31 # encoding: [0x73,0xd0,0xff,0x89]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.evict_va' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.evict_va' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 89ffd073 csrwi aif.evict_va, 0x1f
csrwi aif.flush_va, 0x1f
// CHECK-ENCODING: csrwi aif.flush_va, 31 # encoding: [0x73,0xd0,0xff,0x8b]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.flush_va' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.flush_va' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 8bffd073 csrwi aif.flush_va, 0x1f
csrwi aif.validation0, 0x1f
// CHECK-ENCODING: csrwi aif.validation0, 31 # encoding: [0x73,0xd0,0x0f,0x8d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.validation0' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.validation0' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 8d0fd073 csrwi aif.validation0, 0x1f
csrwi aif.validation1, 0x1f
// CHECK-ENCODING: csrwi aif.validation1, 31 # encoding: [0x73,0xd0,0x1f,0x8d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.validation1' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.validation1' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 8d1fd073 csrwi aif.validation1, 0x1f
csrwi aif.validation2, 0x1f
// CHECK-ENCODING: csrwi aif.validation2, 31 # encoding: [0x73,0xd0,0x2f,0x8d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.validation2' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.validation2' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 8d2fd073 csrwi aif.validation2, 0x1f
csrwi aif.validation3, 0x1f
// CHECK-ENCODING: csrwi aif.validation3, 31 # encoding: [0x73,0xd0,0x3f,0x8d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.validation3' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.validation3' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 8d3fd073 csrwi aif.validation3, 0x1f
csrwi aif.lock_va, 0x1f
// CHECK-ENCODING: csrwi aif.lock_va, 31 # encoding: [0x73,0xd0,0xff,0x8d]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.lock_va' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.lock_va' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 8dffd073 csrwi aif.lock_va, 0x1f
csrwi aif.unlock_va, 0x1f
// CHECK-ENCODING: csrwi aif.unlock_va, 31 # encoding: [0x73,0xd0,0xff,0x8f]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.unlock_va' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.unlock_va' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 8fffd073 csrwi aif.unlock_va, 0x1f
csrwi aif.portctrl0, 0x1f
// CHECK-ENCODING: csrwi aif.portctrl0, 31 # encoding: [0x73,0xd0,0xcf,0x9c]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portctrl0' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portctrl0' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 9ccfd073 csrwi aif.portctrl0, 0x1f
csrwi aif.portctrl1, 0x1f
// CHECK-ENCODING: csrwi aif.portctrl1, 31 # encoding: [0x73,0xd0,0xdf,0x9c]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portctrl1' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portctrl1' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 9cdfd073 csrwi aif.portctrl1, 0x1f
csrwi aif.portctrl2, 0x1f
// CHECK-ENCODING: csrwi aif.portctrl2, 31 # encoding: [0x73,0xd0,0xef,0x9c]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portctrl2' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portctrl2' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 9cefd073 csrwi aif.portctrl2, 0x1f
csrwi aif.portctrl3, 0x1f
// CHECK-ENCODING: csrwi aif.portctrl3, 31 # encoding: [0x73,0xd0,0xff,0x9c]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portctrl3' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portctrl3' requires 'xaifet' to be enabled}}
// CHECK-DISASM: 9cffd073 csrwi aif.portctrl3, 0x1f
csrwi aif.fccnb, 0x1f
// CHECK-ENCODING: csrwi aif.fccnb, 31 # encoding: [0x73,0xd0,0x0f,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.fccnb' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.fccnb' requires 'xaifet' to be enabled}}
// CHECK-DISASM: cc0fd073 csrwi aif.fccnb, 0x1f
csrwi aif.porthead0, 0x1f
// CHECK-ENCODING: csrwi aif.porthead0, 31 # encoding: [0x73,0xd0,0x8f,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.porthead0' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.porthead0' requires 'xaifet' to be enabled}}
// CHECK-DISASM: cc8fd073 csrwi aif.porthead0, 0x1f
csrwi aif.porthead1, 0x1f
// CHECK-ENCODING: csrwi aif.porthead1, 31 # encoding: [0x73,0xd0,0x9f,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.porthead1' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.porthead1' requires 'xaifet' to be enabled}}
// CHECK-DISASM: cc9fd073 csrwi aif.porthead1, 0x1f
csrwi aif.porthead2, 0x1f
// CHECK-ENCODING: csrwi aif.porthead2, 31 # encoding: [0x73,0xd0,0xaf,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.porthead2' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.porthead2' requires 'xaifet' to be enabled}}
// CHECK-DISASM: ccafd073 csrwi aif.porthead2, 0x1f
csrwi aif.porthead3, 0x1f
// CHECK-ENCODING: csrwi aif.porthead3, 31 # encoding: [0x73,0xd0,0xbf,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.porthead3' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.porthead3' requires 'xaifet' to be enabled}}
// CHECK-DISASM: ccbfd073 csrwi aif.porthead3, 0x1f
csrwi aif.portheadnb0, 0x1f
// CHECK-ENCODING: csrwi aif.portheadnb0, 31 # encoding: [0x73,0xd0,0xcf,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portheadnb0' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portheadnb0' requires 'xaifet' to be enabled}}
// CHECK-DISASM: cccfd073 csrwi aif.portheadnb0, 0x1f
csrwi aif.portheadnb1, 0x1f
// CHECK-ENCODING: csrwi aif.portheadnb1, 31 # encoding: [0x73,0xd0,0xdf,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portheadnb1' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portheadnb1' requires 'xaifet' to be enabled}}
// CHECK-DISASM: ccdfd073 csrwi aif.portheadnb1, 0x1f
csrwi aif.portheadnb2, 0x1f
// CHECK-ENCODING: csrwi aif.portheadnb2, 31 # encoding: [0x73,0xd0,0xef,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portheadnb2' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portheadnb2' requires 'xaifet' to be enabled}}
// CHECK-DISASM: ccefd073 csrwi aif.portheadnb2, 0x1f
csrwi aif.portheadnb3, 0x1f
// CHECK-ENCODING: csrwi aif.portheadnb3, 31 # encoding: [0x73,0xd0,0xff,0xcc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.portheadnb3' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.portheadnb3' requires 'xaifet' to be enabled}}
// CHECK-DISASM: ccffd073 csrwi aif.portheadnb3, 0x1f
csrwi aif.hartid, 0x1f
// CHECK-ENCODING: csrwi aif.hartid, 31 # encoding: [0x73,0xd0,0x0f,0xcd]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.hartid' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.hartid' requires 'xaifet' to be enabled}}
// CHECK-DISASM: cd0fd073 csrwi aif.hartid, 0x1f
csrwi aif.dcache_debug, 0x1f
// CHECK-ENCODING: csrwi aif.dcache_debug, 31 # encoding: [0x73,0xd0,0x0f,0xfc]
-// CHECK-ERROR: :[[@LINE-2]]:7: error: system register 'aif.dcache_debug' requires 'xaifet' to be enabled
+// expected-error at -2:7 {{system register 'aif.dcache_debug' requires 'xaifet' to be enabled}}
// CHECK-DISASM: fc0fd073 csrwi aif.dcache_debug, 0x1f
diff --git a/llvm/test/MC/RISCV/xaifet-simd-valid.s b/llvm/test/MC/RISCV/xaifet-simd-valid.s
index 541db1272bbfed..f97106be59d140 100644
--- a/llvm/test/MC/RISCV/xaifet-simd-valid.s
+++ b/llvm/test/MC/RISCV/xaifet-simd-valid.s
@@ -2,36 +2,34 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+xaifet %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+xaifet %s \
# RUN: | llvm-objdump -d --mattr=+xaifet - | FileCheck %s --check-prefix=CHECK-DISASM
aif.bitmixb s7, gp, gp
// CHECK-ENCODING: aif.bitmixb s7, gp, gp # encoding: [0xbb,0xfb,0x31,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8031fbbb aif.bitmixb s7, gp, gp
aif.cubefaceidx.ps fa0, fs9, ft9
// CHECK-ENCODING: aif.cubefaceidx.ps fa0, fs9, ft9 # encoding: [0x7b,0x95,0xdc,0x89]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 89dc957b aif.cubefaceidx.ps fa0, fs9, ft9
aif.cubeface.ps ft9, fa3, ft10
// CHECK-ENCODING: aif.cubeface.ps ft9, fa3, ft10 # encoding: [0xfb,0x8e,0xe6,0x89]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 89e68efb aif.cubeface.ps ft9, fa3, ft10
aif.cubesgnsc.ps ft9, ft8, fs9
// CHECK-ENCODING: aif.cubesgnsc.ps ft9, ft8, fs9 # encoding: [0xfb,0x2e,0x9e,0x89]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 899e2efb aif.cubesgnsc.ps ft9, ft8, fs9
aif.cubesgntc.ps fs2, ft6, fa6
// CHECK-ENCODING: aif.cubesgntc.ps fs2, ft6, fa6 # encoding: [0x7b,0x39,0x03,0x89]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8903397b aif.cubesgntc.ps fs2, ft6, fa6
#====----------------------------------------------------------------------===//
@@ -40,577 +38,577 @@ aif.cubesgntc.ps fs2, ft6, fa6
aif.faddi.pi fa4, ft1, -96
// CHECK-ENCODING: aif.faddi.pi fa4, ft1, -96 # encoding: [0x3f,0x87,0x00,0xec]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: ec00873f aif.faddi.pi fa4, ft1, -0x60
aif.fadd.pi fs10, fa5, fs8
// CHECK-ENCODING: aif.fadd.pi fs10, fa5, fs8 # encoding: [0x7b,0x8d,0x87,0x07]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 07878d7b aif.fadd.pi fs10, fa5, fs8
aif.fadd.ps fs0, ft0, fs4, rtz
// CHECK-ENCODING: aif.fadd.ps fs0, ft0, fs4, rtz # encoding: [0x7b,0x14,0x40,0x01]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0140147b aif.fadd.ps fs0, ft0, fs4, rtz
aif.fandi.pi fa7, fs1, 16
// CHECK-ENCODING: aif.fandi.pi fa7, fs1, 16 # encoding: [0xbf,0x98,0x04,0x05]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 050498bf aif.fandi.pi fa7, fs1, 0x10
aif.fand.pi ft2, fs8, fa1
// CHECK-ENCODING: aif.fand.pi ft2, fs8, fa1 # encoding: [0x7b,0x71,0xbc,0x06]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 06bc717b aif.fand.pi ft2, fs8, fa1
aif.fbci.pi fs9, 1015523
// CHECK-ENCODING: aif.fbci.pi fs9, 1015523 # encoding: [0xdf,0x3c,0xee,0xf7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: f7ee3cdf aif.fbci.pi fs9, 0xf7ee3
aif.fbci.ps fs9, 946477
// CHECK-ENCODING: aif.fbci.ps fs9, 946477 # encoding: [0x9f,0xdc,0x12,0xe7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e712dc9f aif.fbci.ps fs9, 0xe712d
aif.fbcx.ps fa3, s3
// CHECK-ENCODING: aif.fbcx.ps fa3, s3 # encoding: [0x8b,0xb6,0x09,0x00]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0009b68b aif.fbcx.ps fa3, s3
aif.fbc.ps fs0, 1529(s9)
// CHECK-ENCODING: aif.fbc.ps fs0, 1529(s9) # encoding: [0x0b,0x84,0x9c,0x5f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 5f9c840b aif.fbc.ps fs0, 0x5f9(s9)
aif.fclass.ps fs0, fs8
// CHECK-ENCODING: aif.fclass.ps fs0, fs8 # encoding: [0x7b,0x14,0x0c,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e00c147b aif.fclass.ps fs0, fs8
aif.fcmovm.ps ft5, fa7, fs6
// CHECK-ENCODING: aif.fcmovm.ps ft5, fa7, fs6 # encoding: [0xf7,0x82,0x68,0x01]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 016882f7 aif.fcmovm.ps ft5, fa7, fs6
aif.fcmov.ps fs11, ft1, ft8, fa1
// CHECK-ENCODING: aif.fcmov.ps fs11, ft1, ft8, fa1 # encoding: [0xbf,0xad,0xc0,0x5d]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 5dc0adbf aif.fcmov.ps fs11, ft1, ft8, fa1
aif.fcvt.f10.ps fa2, ft1
// CHECK-ENCODING: aif.fcvt.f10.ps fa2, ft1 # encoding: [0x7b,0x86,0xb0,0xd8]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d8b0867b aif.fcvt.f10.ps fa2, ft1
aif.fcvt.f11.ps fa0, ft4
// CHECK-ENCODING: aif.fcvt.f11.ps fa0, ft4 # encoding: [0x7b,0x05,0x82,0xd8]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d882057b aif.fcvt.f11.ps fa0, ft4
aif.fcvt.f16.ps ft1, fa2
// CHECK-ENCODING: aif.fcvt.f16.ps ft1, fa2 # encoding: [0xfb,0x00,0x96,0xd8]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d89600fb aif.fcvt.f16.ps ft1, fa2
aif.fcvt.ps.f10 ft5, fa0
// CHECK-ENCODING: aif.fcvt.ps.f10 ft5, fa0 # encoding: [0xfb,0x02,0x85,0xd0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d08502fb aif.fcvt.ps.f10 ft5, fa0
aif.fcvt.ps.f11 fa0, fa6
// CHECK-ENCODING: aif.fcvt.ps.f11 fa0, fa6 # encoding: [0x7b,0x05,0x98,0xd0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d098057b aif.fcvt.ps.f11 fa0, fa6
aif.fcvt.ps.f16 fa4, fs0
// CHECK-ENCODING: aif.fcvt.ps.f16 fa4, fs0 # encoding: [0x7b,0x07,0xa4,0xd0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d0a4077b aif.fcvt.ps.f16 fa4, fs0
aif.fcvt.ps.pw fs0, ft1, rtz
// CHECK-ENCODING: aif.fcvt.ps.pw fs0, ft1, rtz # encoding: [0x7b,0x94,0x00,0xd0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d000947b aif.fcvt.ps.pw fs0, ft1, rtz
aif.fcvt.ps.pwu ft8, ft0, rtz
// CHECK-ENCODING: aif.fcvt.ps.pwu ft8, ft0, rtz # encoding: [0x7b,0x1e,0x10,0xd0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d0101e7b aif.fcvt.ps.pwu ft8, ft0, rtz
aif.fcvt.ps.rast ft7, fa0
// CHECK-ENCODING: aif.fcvt.ps.rast ft7, fa0 # encoding: [0xfb,0x03,0x25,0xd0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d02503fb aif.fcvt.ps.rast ft7, fa0
aif.fcvt.ps.sn16 ft11, fa2
// CHECK-ENCODING: aif.fcvt.ps.sn16 ft11, fa2 # encoding: [0xfb,0x0f,0x96,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d1960ffb aif.fcvt.ps.sn16 ft11, fa2
aif.fcvt.ps.sn8 fs1, ft2
// CHECK-ENCODING: aif.fcvt.ps.sn8 fs1, ft2 # encoding: [0xfb,0x04,0xb1,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d1b104fb aif.fcvt.ps.sn8 fs1, ft2
aif.fcvt.ps.un10 fs0, fs11
// CHECK-ENCODING: aif.fcvt.ps.un10 fs0, fs11 # encoding: [0x7b,0x84,0x2d,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d12d847b aif.fcvt.ps.un10 fs0, fs11
aif.fcvt.ps.un16 fa7, ft5
// CHECK-ENCODING: aif.fcvt.ps.un16 fa7, ft5 # encoding: [0xfb,0x88,0x12,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d11288fb aif.fcvt.ps.un16 fa7, ft5
aif.fcvt.ps.un2 fs0, fa7
// CHECK-ENCODING: aif.fcvt.ps.un2 fs0, fa7 # encoding: [0x7b,0x84,0x78,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d178847b aif.fcvt.ps.un2 fs0, fa7
aif.fcvt.ps.un24 ft6, ft1
// CHECK-ENCODING: aif.fcvt.ps.un24 ft6, ft1 # encoding: [0x7b,0x83,0x00,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d100837b aif.fcvt.ps.un24 ft6, ft1
aif.fcvt.ps.un8 fa3, fa4
// CHECK-ENCODING: aif.fcvt.ps.un8 fa3, fa4 # encoding: [0xfb,0x06,0x37,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d13706fb aif.fcvt.ps.un8 fa3, fa4
aif.fcvt.pwu.ps ft10, ft1, rup
// CHECK-ENCODING: aif.fcvt.pwu.ps ft10, ft1, rup # encoding: [0x7b,0xbf,0x10,0xc0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c010bf7b aif.fcvt.pwu.ps ft10, ft1, rup
aif.fcvt.pw.ps fs6, ft5, rup
// CHECK-ENCODING: aif.fcvt.pw.ps fs6, ft5, rup # encoding: [0x7b,0xbb,0x02,0xc0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c002bb7b aif.fcvt.pw.ps fs6, ft5, rup
aif.fcvt.rast.ps ft11, fs7
// CHECK-ENCODING: aif.fcvt.rast.ps ft11, fs7 # encoding: [0xfb,0x8f,0x2b,0xc0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c02b8ffb aif.fcvt.rast.ps ft11, fs7
aif.fcvt.sn16.ps ft1, fs7
// CHECK-ENCODING: aif.fcvt.sn16.ps ft1, fs7 # encoding: [0xfb,0x80,0x9b,0xd9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d99b80fb aif.fcvt.sn16.ps ft1, fs7
aif.fcvt.sn8.ps fs3, ft5
// CHECK-ENCODING: aif.fcvt.sn8.ps fs3, ft5 # encoding: [0xfb,0x89,0xb2,0xd9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d9b289fb aif.fcvt.sn8.ps fs3, ft5
aif.fcvt.un10.ps ft5, fa6
// CHECK-ENCODING: aif.fcvt.un10.ps ft5, fa6 # encoding: [0xfb,0x02,0x28,0xd9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d92802fb aif.fcvt.un10.ps ft5, fa6
aif.fcvt.un16.ps fs9, ft6
// CHECK-ENCODING: aif.fcvt.un16.ps fs9, ft6 # encoding: [0xfb,0x0c,0x13,0xd9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d9130cfb aif.fcvt.un16.ps fs9, ft6
aif.fcvt.un24.ps fs8, ft8
// CHECK-ENCODING: aif.fcvt.un24.ps fs8, ft8 # encoding: [0x7b,0x0c,0x0e,0xd9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d90e0c7b aif.fcvt.un24.ps fs8, ft8
aif.fcvt.un2.ps fa0, fa3
// CHECK-ENCODING: aif.fcvt.un2.ps fa0, fa3 # encoding: [0x7b,0x85,0x76,0xd9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d976857b aif.fcvt.un2.ps fa0, fa3
aif.fcvt.un8.ps fa0, ft2
// CHECK-ENCODING: aif.fcvt.un8.ps fa0, ft2 # encoding: [0x7b,0x05,0x31,0xd9]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d931057b aif.fcvt.un8.ps fa0, ft2
aif.fdivu.pi fa1, fa5, fa2
// CHECK-ENCODING: aif.fdivu.pi fa1, fa5, fa2 # encoding: [0xfb,0x95,0xc7,0x1e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1ec795fb aif.fdivu.pi fa1, fa5, fa2
aif.fdiv.pi ft3, fa0, fs4
// CHECK-ENCODING: aif.fdiv.pi ft3, fa0, fs4 # encoding: [0xfb,0x01,0x45,0x1f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1f4501fb aif.fdiv.pi ft3, fa0, fs4
aif.fdiv.ps fs10, ft5, fs11, rdn
// CHECK-ENCODING: aif.fdiv.ps fs10, ft5, fs11, rdn # encoding: [0x7b,0xad,0xb2,0x19]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 19b2ad7b aif.fdiv.ps fs10, ft5, fs11, rdn
aif.feqm.ps m4, ft5, ft8
// CHECK-ENCODING: aif.feqm.ps m4, ft5, ft8 # encoding: [0x7b,0xe2,0xc2,0xa1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a1c2e27b aif.feqm.ps m4, ft5, ft8
aif.feq.pi ft10, fa1, fs0
// CHECK-ENCODING: aif.feq.pi ft10, fa1, fs0 # encoding: [0x7b,0xaf,0x85,0xa6]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a685af7b aif.feq.pi ft10, fa1, fs0
aif.feq.ps fa5, ft4, fs2
// CHECK-ENCODING: aif.feq.ps fa5, ft4, fs2 # encoding: [0xfb,0x27,0x22,0xa1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a12227fb aif.feq.ps fa5, ft4, fs2
aif.fexp.ps fs10, ft3
// CHECK-ENCODING: aif.fexp.ps fs10, ft3 # encoding: [0x7b,0x8d,0x41,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 58418d7b aif.fexp.ps fs10, ft3
aif.flog.ps fa0, fs10
// CHECK-ENCODING: aif.flog.ps fa0, fs10 # encoding: [0x7b,0x05,0x3d,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 583d057b aif.flog.ps fa0, fs10
aif.ffrc.ps fs9, ft8
// CHECK-ENCODING: aif.ffrc.ps fs9, ft8 # encoding: [0xfb,0x0c,0x2e,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 582e0cfb aif.ffrc.ps fs9, ft8
aif.fg32b.ps fa2, a0, (s0)
// CHECK-ENCODING: aif.fg32b.ps fa2, a0, (s0) # encoding: [0x0b,0x16,0x85,0x08]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0885160b aif.fg32b.ps fa2, a0, (s0)
aif.fg32h.ps ft10, s6, (s9)
// CHECK-ENCODING: aif.fg32h.ps ft10, s6, (s9) # encoding: [0x0b,0x1f,0x9b,0x11]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 119b1f0b aif.fg32h.ps ft10, s6, (s9)
aif.fg32w.ps fs5, ra, (a0)
// CHECK-ENCODING: aif.fg32w.ps fs5, ra, (a0) # encoding: [0x8b,0x9a,0xa0,0x20]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 20a09a8b aif.fg32w.ps fs5, ra, (a0)
aif.fgb.ps fs11, ft7, (s4)
// CHECK-ENCODING: aif.fgb.ps fs11, ft7, (s4) # encoding: [0x8b,0x9d,0x43,0x49]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 49439d8b aif.fgb.ps fs11, ft7, (s4)
aif.fgh.ps ft3, ft7, (t5)
// CHECK-ENCODING: aif.fgh.ps ft3, ft7, (t5) # encoding: [0x8b,0x91,0xe3,0x51]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 51e3918b aif.fgh.ps ft3, ft7, (t5)
aif.fgw.ps fs10, fa7, (s3)
// CHECK-ENCODING: aif.fgw.ps fs10, fa7, (s3) # encoding: [0x0b,0x9d,0x38,0x61]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 61389d0b aif.fgw.ps fs10, fa7, (s3)
aif.flem.ps m6, ft4, ft3
// CHECK-ENCODING: aif.flem.ps m6, ft4, ft3 # encoding: [0x7b,0x43,0x32,0xa0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a032437b aif.flem.ps m6, ft4, ft3
aif.fle.pi ft2, fs3, fa7
// CHECK-ENCODING: aif.fle.pi ft2, fs3, fa7 # encoding: [0x7b,0x81,0x19,0xa7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a719817b aif.fle.pi ft2, fs3, fa7
aif.fle.ps ft9, fs11, fa1
// CHECK-ENCODING: aif.fle.ps ft9, fs11, fa1 # encoding: [0xfb,0x8e,0xbd,0xa0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a0bd8efb aif.fle.ps ft9, fs11, fa1
aif.flq2 fa5, -2020(sp)
// CHECK-ENCODING: aif.flq2 fa5, -2020(sp) # encoding: [0x87,0x57,0xc1,0x81]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 81c15787 aif.flq2 fa5, -0x7e4(sp)
aif.fltm.pi m0, ft3, fs1
// CHECK-ENCODING: aif.fltm.pi m0, ft3, fs1 # encoding: [0x7b,0x80,0x91,0x3e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 3e91807b aif.fltm.pi m0, ft3, fs1
aif.fltm.ps m6, ft2, fa3
// CHECK-ENCODING: aif.fltm.ps m6, ft2, fa3 # encoding: [0x7b,0x53,0xd1,0xa0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a0d1537b aif.fltm.ps m6, ft2, fa3
aif.fltu.pi ft5, fa1, fs10
// CHECK-ENCODING: aif.fltu.pi ft5, fa1, fs10 # encoding: [0xfb,0xb2,0xa5,0xa7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a7a5b2fb aif.fltu.pi ft5, fa1, fs10
aif.flt.pi ft11, fa4, fs8
// CHECK-ENCODING: aif.flt.pi ft11, fa4, fs8 # encoding: [0xfb,0x1f,0x87,0xa7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a7871ffb aif.flt.pi ft11, fa4, fs8
aif.flt.ps fs11, fs3, fs5
// CHECK-ENCODING: aif.flt.ps fs11, fs3, fs5 # encoding: [0xfb,0x9d,0x59,0xa1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a1599dfb aif.flt.ps fs11, fs3, fs5
aif.flw.ps ft9, 1224(s5)
// CHECK-ENCODING: aif.flw.ps ft9, 1224(s5) # encoding: [0x8b,0xae,0x8a,0x4c]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 4c8aae8b aif.flw.ps ft9, 0x4c8(s5)
aif.fmadd.ps fs0, fs2, ft8, ft8, rmm
// CHECK-ENCODING: aif.fmadd.ps fs0, fs2, ft8, ft8, rmm # encoding: [0x5b,0x44,0xc9,0xe1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e1c9445b aif.fmadd.ps fs0, fs2, ft8, ft8, rmm
aif.fmaxu.pi ft10, fs3, fs11
// CHECK-ENCODING: aif.fmaxu.pi ft10, fs3, fs11 # encoding: [0x7b,0xbf,0xb9,0x2f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2fb9bf7b aif.fmaxu.pi ft10, fs3, fs11
aif.fmax.pi ft3, fs1, fs6
// CHECK-ENCODING: aif.fmax.pi ft3, fs1, fs6 # encoding: [0xfb,0x91,0x64,0x2f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2f6491fb aif.fmax.pi ft3, fs1, fs6
aif.fmax.ps fa0, fs2, ft3
// CHECK-ENCODING: aif.fmax.ps fa0, fs2, ft3 # encoding: [0x7b,0x15,0x39,0x28]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2839157b aif.fmax.ps fa0, fs2, ft3
aif.fminu.pi ft5, ft2, ft2
// CHECK-ENCODING: aif.fminu.pi ft5, ft2, ft2 # encoding: [0xfb,0x22,0x21,0x2e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2e2122fb aif.fminu.pi ft5, ft2, ft2
aif.fmin.pi fs10, fs10, fs3
// CHECK-ENCODING: aif.fmin.pi fs10, fs10, fs3 # encoding: [0x7b,0x0d,0x3d,0x2f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 2f3d0d7b aif.fmin.pi fs10, fs10, fs3
aif.fmin.ps fa1, ft5, ft5
// CHECK-ENCODING: aif.fmin.ps fa1, ft5, ft5 # encoding: [0xfb,0x85,0x52,0x28]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 285285fb aif.fmin.ps fa1, ft5, ft5
aif.fmsub.ps fs0, fs7, fs6, ft3, rmm
// CHECK-ENCODING: aif.fmsub.ps fs0, fs7, fs6, ft3, rmm # encoding: [0x5b,0xc4,0x6b,0x1b]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1b6bc45b aif.fmsub.ps fs0, fs7, fs6, ft3, rmm
aif.fmulhu.pi ft6, fs7, fs4
// CHECK-ENCODING: aif.fmulhu.pi ft6, fs7, fs4 # encoding: [0x7b,0xa3,0x4b,0x17]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 174ba37b aif.fmulhu.pi ft6, fs7, fs4
aif.fmulh.pi fa3, fa3, fs1
// CHECK-ENCODING: aif.fmulh.pi fa3, fa3, fs1 # encoding: [0xfb,0x96,0x96,0x16]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 169696fb aif.fmulh.pi fa3, fa3, fs1
aif.fmul.pi ft4, ft7, ft4
// CHECK-ENCODING: aif.fmul.pi ft4, ft7, ft4 # encoding: [0x7b,0x82,0x43,0x16]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1643827b aif.fmul.pi ft4, ft7, ft4
aif.fmul.ps fa5, fa2, fs10, rtz
// CHECK-ENCODING: aif.fmul.ps fa5, fa2, fs10, rtz # encoding: [0xfb,0x17,0xa6,0x11]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 11a617fb aif.fmul.ps fa5, fa2, fs10, rtz
aif.fmvs.x.ps fp, fs0, 6
// CHECK-ENCODING: aif.fmvs.x.ps s0, fs0, 6 # encoding: [0x7b,0x24,0x64,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e064247b aif.fmvs.x.ps s0, fs0, 0x6
aif.fmvz.x.ps a5, ft6, 6
// CHECK-ENCODING: aif.fmvz.x.ps a5, ft6, 6 # encoding: [0xfb,0x07,0x63,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e06307fb aif.fmvz.x.ps a5, ft6, 0x6
aif.fnmadd.ps ft10, ft8, fs5, fs3, rdn
// CHECK-ENCODING: aif.fnmadd.ps ft10, ft8, fs5, fs3, rdn # encoding: [0x5b,0x2f,0x5e,0x9f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 9f5e2f5b aif.fnmadd.ps ft10, ft8, fs5, fs3, rdn
aif.fnmsub.ps ft0, ft11, fs7, fa5, rtz
// CHECK-ENCODING: aif.fnmsub.ps ft0, ft11, fs7, fa5, rtz # encoding: [0x5b,0x90,0x7f,0x7d]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 7d7f905b aif.fnmsub.ps ft0, ft11, fs7, fa5, rtz
aif.fnot.pi fs10, fs6
// CHECK-ENCODING: aif.fnot.pi fs10, fs6 # encoding: [0x7b,0x2d,0x0b,0x06]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 060b2d7b aif.fnot.pi fs10, fs6
aif.for.pi ft10, fa0, fa4
// CHECK-ENCODING: aif.for.pi ft10, fa0, fa4 # encoding: [0x7b,0x6f,0xe5,0x06]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 06e56f7b aif.for.pi ft10, fa0, fa4
aif.fpackrepb.pi ft8, fs11
// CHECK-ENCODING: aif.fpackrepb.pi ft8, fs11 # encoding: [0x7b,0x8e,0x0d,0x26]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 260d8e7b aif.fpackrepb.pi ft8, fs11
aif.fpackreph.pi ft2, ft10
// CHECK-ENCODING: aif.fpackreph.pi ft2, ft10 # encoding: [0x7b,0x11,0x0f,0x26]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 260f117b aif.fpackreph.pi ft2, ft10
aif.frcp_fix.rast ft3, fs0, fa1
// CHECK-ENCODING: aif.frcp_fix.rast ft3, fs0, fa1 # encoding: [0xfb,0x01,0xb4,0x30]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 30b401fb aif.frcp_fix.rast ft3, fs0, fa1
aif.frcp.ps ft11, fs2
// CHECK-ENCODING: aif.frcp.ps ft11, fs2 # encoding: [0xfb,0x0f,0x79,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 58790ffb aif.frcp.ps ft11, fs2
aif.fremu.pi ft4, ft4, ft1
// CHECK-ENCODING: aif.fremu.pi ft4, ft4, ft1 # encoding: [0x7b,0x32,0x12,0x1e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1e12327b aif.fremu.pi ft4, ft4, ft1
aif.frem.pi fa2, fs10, ft1
// CHECK-ENCODING: aif.frem.pi fa2, fs10, ft1 # encoding: [0x7b,0x26,0x1d,0x1e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 1e1d267b aif.frem.pi fa2, fs10, ft1
aif.fround.ps fa3, fs7, rtz
// CHECK-ENCODING: aif.fround.ps fa3, fs7, rtz # encoding: [0xfb,0x96,0x1b,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 581b96fb aif.fround.ps fa3, fs7, rtz
aif.frsq.ps fs1, fs1
// CHECK-ENCODING: aif.frsq.ps fs1, fs1 # encoding: [0xfb,0x84,0x84,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 588484fb aif.frsq.ps fs1, fs1
aif.fsat8.pi ft1, fs7
// CHECK-ENCODING: aif.fsat8.pi ft1, fs7 # encoding: [0xfb,0xb0,0x0b,0x06]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 060bb0fb aif.fsat8.pi ft1, fs7
aif.fsatu8.pi fa1, fa2
// CHECK-ENCODING: aif.fsatu8.pi fa1, fa2 # encoding: [0xfb,0x35,0x16,0x06]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 061635fb aif.fsatu8.pi fa1, fa2
aif.fsc32b.ps ft7, gp, (s3)
// CHECK-ENCODING: aif.fsc32b.ps ft7, gp, (s3) # encoding: [0x8b,0x93,0x31,0x89]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 8931938b aif.fsc32b.ps ft7, gp, (s3)
aif.fsc32h.ps fa3, s6, (tp)
// CHECK-ENCODING: aif.fsc32h.ps fa3, s6, (tp) # encoding: [0x8b,0x16,0x4b,0x90]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 904b168b aif.fsc32h.ps fa3, s6, (tp)
aif.fsc32w.ps ft0, t5, (a0)
// CHECK-ENCODING: aif.fsc32w.ps ft0, t5, (a0) # encoding: [0x0b,0x10,0xaf,0xa0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a0af100b aif.fsc32w.ps ft0, t5, (a0)
aif.fscb.ps ft9, ft1, (zero)
// CHECK-ENCODING: aif.fscb.ps ft9, ft1, (zero) # encoding: [0x8b,0x9e,0x00,0xc8]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: c8009e8b aif.fscb.ps ft9, ft1, (zero)
aif.fsch.ps fs2, fa0, (t5)
// CHECK-ENCODING: aif.fsch.ps fs2, fa0, (t5) # encoding: [0x0b,0x19,0xe5,0xd1]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d1e5190b aif.fsch.ps fs2, fa0, (t5)
aif.fscw.ps ft1, ft0, (a0)
// CHECK-ENCODING: aif.fscw.ps ft1, ft0, (a0) # encoding: [0x8b,0x10,0xa0,0xe0]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e0a0108b aif.fscw.ps ft1, ft0, (a0)
aif.fsetm.pi m0, fa5
// CHECK-ENCODING: aif.fsetm.pi m0, fa5 # encoding: [0x7b,0xc0,0x07,0xa6]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: a607c07b aif.fsetm.pi m0, fa5
aif.fsgnjn.ps ft6, fs10, ft2
// CHECK-ENCODING: aif.fsgnjn.ps ft6, fs10, ft2 # encoding: [0x7b,0x13,0x2d,0x20]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 202d137b aif.fsgnjn.ps ft6, fs10, ft2
aif.fsgnjx.ps ft9, fs2, fs0
// CHECK-ENCODING: aif.fsgnjx.ps ft9, fs2, fs0 # encoding: [0xfb,0x2e,0x89,0x20]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 20892efb aif.fsgnjx.ps ft9, fs2, fs0
aif.fsgnj.ps fs3, fa7, ft0
// CHECK-ENCODING: aif.fsgnj.ps fs3, fa7, ft0 # encoding: [0xfb,0x89,0x08,0x20]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 200889fb aif.fsgnj.ps fs3, fa7, ft0
aif.fsin.ps ft2, ft4
// CHECK-ENCODING: aif.fsin.ps ft2, ft4 # encoding: [0x7b,0x01,0x62,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 5862017b aif.fsin.ps ft2, ft4
aif.fslli.pi ft1, fs10, 25
// CHECK-ENCODING: aif.fslli.pi ft1, fs10, 25 # encoding: [0xfb,0x10,0x9d,0x4f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 4f9d10fb aif.fslli.pi ft1, fs10, 0x19
aif.fsll.pi ft3, ft9, fa7
// CHECK-ENCODING: aif.fsll.pi ft3, ft9, fa7 # encoding: [0xfb,0x91,0x1e,0x07]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 071e91fb aif.fsll.pi ft3, ft9, fa7
aif.fsq2 fa4, -1100(s5)
// CHECK-ENCODING: aif.fsq2 fa4, -1100(s5) # encoding: [0x27,0xda,0xea,0xba]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: baeada27 aif.fsq2 fa4, -0x44c(s5)
aif.fsqrt.ps ft2, fs11
// CHECK-ENCODING: aif.fsqrt.ps ft2, fs11 # encoding: [0x7b,0x81,0x0d,0x58]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 580d817b aif.fsqrt.ps ft2, fs11
aif.fsrai.pi ft1, fs5, 5
// CHECK-ENCODING: aif.fsrai.pi ft1, fs5, 5 # encoding: [0xfb,0xf0,0x5a,0x4e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 4e5af0fb aif.fsrai.pi ft1, fs5, 0x5
aif.fsra.pi fs1, ft11, ft2
// CHECK-ENCODING: aif.fsra.pi fs1, ft11, ft2 # encoding: [0xfb,0xd4,0x2f,0x0e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0e2fd4fb aif.fsra.pi fs1, ft11, ft2
aif.fsrli.pi fs0, fa4, 5
// CHECK-ENCODING: aif.fsrli.pi fs0, fa4, 5 # encoding: [0x7b,0x54,0x57,0x4e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 4e57547b aif.fsrli.pi fs0, fa4, 0x5
aif.fsrl.pi fa2, fs0, fa4
// CHECK-ENCODING: aif.fsrl.pi fa2, fs0, fa4 # encoding: [0x7b,0x56,0xe4,0x06]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 06e4567b aif.fsrl.pi fa2, fs0, fa4
aif.fsub.pi ft0, ft10, ft9
// CHECK-ENCODING: aif.fsub.pi ft0, ft10, ft9 # encoding: [0x7b,0x00,0xdf,0x0f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0fdf007b aif.fsub.pi ft0, ft10, ft9
aif.fsub.ps ft2, ft2, fs8, dyn
// CHECK-ENCODING: aif.fsub.ps ft2, ft2, fs8 # encoding: [0x7b,0x71,0x81,0x09]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 0981717b aif.fsub.ps ft2, ft2, fs8
aif.fswizz.ps ft3, fa4, 188
// CHECK-ENCODING: aif.fswizz.ps ft3, fa4, 188 # encoding: [0xfb,0x41,0x77,0xe7]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: e77741fb aif.fswizz.ps ft3, fa4, 0xbc
aif.fsw.ps fs4, 1772(a1)
// CHECK-ENCODING: aif.fsw.ps fs4, 1772(a1) # encoding: [0x0b,0xe6,0x45,0x6f]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6f45e60b aif.fsw.ps fs4, 0x6ec(a1)
aif.fxor.pi ft10, fa6, fs6
// CHECK-ENCODING: aif.fxor.pi ft10, fa6, fs6 # encoding: [0x7b,0x4f,0x68,0x07]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 07684f7b aif.fxor.pi ft10, fa6, fs6
#====----------------------------------------------------------------------===//
@@ -619,55 +617,55 @@ aif.fxor.pi ft10, fa6, fs6
aif.maskand m3, m5, m0
// CHECK-ENCODING: aif.maskand m3, m5, m0 # encoding: [0xfb,0xf1,0x02,0x66]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6602f1fb aif.maskand m3, m5, m0
aif.masknot m6, m6
// CHECK-ENCODING: aif.masknot m6, m6 # encoding: [0x7b,0x23,0x03,0x66]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6603237b aif.masknot m6, m6
aif.maskor m0, m7, m5
// CHECK-ENCODING: aif.maskor m0, m7, m5 # encoding: [0x7b,0xe0,0x53,0x66]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6653e07b aif.maskor m0, m7, m5
aif.maskpopc s9, m7
// CHECK-ENCODING: aif.maskpopc s9, m7 # encoding: [0xfb,0x8c,0x03,0x52]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 52038cfb aif.maskpopc s9, m7
aif.maskpopcz s10, m4
// CHECK-ENCODING: aif.maskpopcz s10, m4 # encoding: [0x7b,0x0d,0x02,0x54]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 54020d7b aif.maskpopcz s10, m4
aif.maskpopc.rast m1, m3, m2, 2
// CHECK-ENCODING: aif.maskpopc.rast m1, m3, m2, 2 # encoding: [0xfb,0x80,0x29,0x5e]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 5e2980fb aif.maskpopc.rast m1, m3, m2, 0x2
aif.maskxor m6, m6, m2
// CHECK-ENCODING: aif.maskxor m6, m6, m2 # encoding: [0x7b,0x43,0x23,0x66]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 6623437b aif.maskxor m6, m6, m2
aif.mova.m.x t1
// CHECK-ENCODING: aif.mova.m.x t1 # encoding: [0x7b,0x10,0x03,0xd6]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d603107b aif.mova.m.x t1
aif.mova.x.m s1
// CHECK-ENCODING: aif.mova.x.m s1 # encoding: [0xfb,0x04,0x00,0xd6]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: d60004fb aif.mova.x.m s1
aif.mov.m.x m3, t0, 201
// CHECK-ENCODING: aif.mov.m.x m3, t0, 201 # encoding: [0xfb,0x91,0x92,0x57]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 579291fb aif.mov.m.x m3, t0, 0xc9
aif.packb a1, a2, a4
// CHECK-ENCODING: aif.packb a1, a2, a4 # encoding: [0xbb,0x65,0xe6,0x80]
-// CHECK-ERROR: :[[@LINE-2]]:1: error: instruction requires the following: 'XAIFET' (AI Foundry ET Extension)
+// expected-error at -2:1 {{instruction requires the following: 'XAIFET' (AI Foundry ET Extension)}}
// CHECK-DISASM: 80e665bb aif.packb a1, a2, a4
diff --git a/llvm/test/MC/RISCV/xandesperf-fixups-diagnostics.s b/llvm/test/MC/RISCV/xandesperf-fixups-diagnostics.s
index 2f799977f764f0..a3d6507deeddbe 100644
--- a/llvm/test/MC/RISCV/xandesperf-fixups-diagnostics.s
+++ b/llvm/test/MC/RISCV/xandesperf-fixups-diagnostics.s
@@ -1,7 +1,7 @@
-# RUN: not llvm-mc -triple riscv32 -filetype obj -mattr=+xandesperf < %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -filetype obj -mattr=+xandesperf -o /dev/null < %s
- nds.bbc t0, 7, far_distant # CHECK: :[[@LINE]]:18: error: fixup value out of range
- nds.bbc t0, 7, unaligned # CHECK: :[[@LINE]]:18: error: fixup value must be 2-byte aligned
+ nds.bbc t0, 7, far_distant # expected-error:18 {{fixup value out of range}}
+ nds.bbc t0, 7, unaligned # expected-error:18 {{fixup value must be 2-byte aligned}}
.byte 0
unaligned:
diff --git a/llvm/test/MC/RISCV/xandesperf-rv64-invalid.s b/llvm/test/MC/RISCV/xandesperf-rv64-invalid.s
index cadda5f56f406c..29db6cb27e0955 100644
--- a/llvm/test/MC/RISCV/xandesperf-rv64-invalid.s
+++ b/llvm/test/MC/RISCV/xandesperf-rv64-invalid.s
@@ -1,28 +1,27 @@
# XAndesPerf - Andes Performance Extension
-# RUN: not llvm-mc -triple riscv64 -mattr=+xandesperf < %s 2>&1 \
-# RUN: | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xandesperf < %s
# Out of range immediates
## uimmlog2xlen/uimm6
-nds.bbc t0, 64, 256 # CHECK: :[[@LINE]]:13: error: immediate must be an integer in the range [0, 63]
-nds.bbs t1, 64, 256 # CHECK: :[[@LINE]]:13: error: immediate must be an integer in the range [0, 63]
+nds.bbc t0, 64, 256 # expected-error:13 {{immediate must be an integer in the range [0, 63]}}
+nds.bbs t1, 64, 256 # expected-error:13 {{immediate must be an integer in the range [0, 63]}}
## uimmlog2xlen/uimm6
-nds.bfos a0, a1, 64, 3 # CHECK: :[[@LINE]]:18: error: immediate must be an integer in the range [0, 63]
-nds.bfoz t0, t1, 6, 64 # CHECK: :[[@LINE]]:21: error: immediate must be an integer in the range [0, 63]
+nds.bfos a0, a1, 64, 3 # expected-error:18 {{immediate must be an integer in the range [0, 63]}}
+nds.bfoz t0, t1, 6, 64 # expected-error:21 {{immediate must be an integer in the range [0, 63]}}
## simm19_lsb00
-nds.lwugp t0, 0x3fffd # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 4 bytes in the range [-262144, 262140]
-nds.lwugp t0, 0x7 # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 4 bytes in the range [-262144, 262140]
-nds.lwugp t0, -0x40001 # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 4 bytes in the range [-262144, 262140]
-nds.lwugp t0, -0x7 # CHECK: :[[@LINE]]:15: error: immediate must be a multiple of 4 bytes in the range [-262144, 262140]
+nds.lwugp t0, 0x3fffd # expected-error:15 {{immediate must be a multiple of 4 bytes in the range [-262144, 262140]}}
+nds.lwugp t0, 0x7 # expected-error:15 {{immediate must be a multiple of 4 bytes in the range [-262144, 262140]}}
+nds.lwugp t0, -0x40001 # expected-error:15 {{immediate must be a multiple of 4 bytes in the range [-262144, 262140]}}
+nds.lwugp t0, -0x7 # expected-error:15 {{immediate must be a multiple of 4 bytes in the range [-262144, 262140]}}
## simm20_lsb000
-nds.ldgp t0, 0x7fff9 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
-nds.ldgp t0, 0x14 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
-nds.ldgp t0, -0x80001 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
-nds.ldgp t0, -0x14 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
-nds.sdgp t0, 0x7fff9 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
-nds.sdgp t0, 0x14 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
-nds.sdgp t0, -0x80001 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
-nds.sdgp t0, -0x14 # CHECK: :[[@LINE]]:14: error: immediate must be a multiple of 8 bytes in the range [-524288, 524280]
+nds.ldgp t0, 0x7fff9 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
+nds.ldgp t0, 0x14 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
+nds.ldgp t0, -0x80001 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
+nds.ldgp t0, -0x14 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
+nds.sdgp t0, 0x7fff9 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
+nds.sdgp t0, 0x14 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
+nds.sdgp t0, -0x80001 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
+nds.sdgp t0, -0x14 # expected-error:14 {{immediate must be a multiple of 8 bytes in the range [-524288, 524280]}}
diff --git a/llvm/test/MC/RISCV/xandesvbfhcvt-valid.s b/llvm/test/MC/RISCV/xandesvbfhcvt-valid.s
index 355846719e46fb..6d0c7e176e08b5 100644
--- a/llvm/test/MC/RISCV/xandesvbfhcvt-valid.s
+++ b/llvm/test/MC/RISCV/xandesvbfhcvt-valid.s
@@ -4,24 +4,22 @@
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+xandesvbfhcvt < %s \
# RUN: | llvm-objdump --mattr=+xandesvbfhcvt -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc %s -triple=riscv64 -mattr=+xandesvbfhcvt -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM %s
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+xandesvbfhcvt < %s \
# RUN: | llvm-objdump --mattr=+xandesvbfhcvt -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# CHECK-OBJ: nds.vfwcvt.s.bf16 v8, v10
# CHECK-ASM: nds.vfwcvt.s.bf16 v8, v10
# CHECK-ASM: encoding: [0x5b,0x44,0xa0,0x00]
-# CHECK-ERROR: instruction requires the following: 'XAndesVBFHCvt' (Andes Vector BFLOAT16 Conversion Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVBFHCvt' (Andes Vector BFLOAT16 Conversion Extension)}}
nds.vfwcvt.s.bf16 v8, v10
# CHECK-OBJ: nds.vfncvt.bf16.s v8, v10
# CHECK-ASM: nds.vfncvt.bf16.s v8, v10
# CHECK-ASM: encoding: [0x5b,0xc4,0xa0,0x00]
-# CHECK-ERROR: instruction requires the following: 'XAndesVBFHCvt' (Andes Vector BFLOAT16 Conversion Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVBFHCvt' (Andes Vector BFLOAT16 Conversion Extension)}}
nds.vfncvt.bf16.s v8, v10
diff --git a/llvm/test/MC/RISCV/xandesvdot-valid.s b/llvm/test/MC/RISCV/xandesvdot-valid.s
index 06433790219dea..c5a9ad7d8b0f02 100644
--- a/llvm/test/MC/RISCV/xandesvdot-valid.s
+++ b/llvm/test/MC/RISCV/xandesvdot-valid.s
@@ -4,48 +4,46 @@
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+xandesvdot < %s \
# RUN: | llvm-objdump --mattr=+xandesvdot -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc %s -triple=riscv64 -mattr=+xandesvdot -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM %s
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+xandesvdot < %s \
# RUN: | llvm-objdump --mattr=+xandesvdot -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# CHECK-OBJ: nds.vd4dots.vv v8, v10, v12
# CHECK-ASM: nds.vd4dots.vv v8, v10, v12
# CHECK-ASM: encoding: [0x5b,0x44,0xc5,0x12]
-# CHECK-ERROR: instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension)}}
nds.vd4dots.vv v8, v10, v12
# CHECK-OBJ: nds.vd4dots.vv v8, v10, v12, v0.t
# CHECK-ASM: nds.vd4dots.vv v8, v10, v12, v0.t
# CHECK-ASM: encoding: [0x5b,0x44,0xc5,0x10]
-# CHECK-ERROR: instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension)}}
nds.vd4dots.vv v8, v10, v12, v0.t
# CHECK-OBJ: nds.vd4dotu.vv v8, v10, v12
# CHECK-ASM: nds.vd4dotu.vv v8, v10, v12
# CHECK-ASM: encoding: [0x5b,0x44,0xc5,0x1e]
-# CHECK-ERROR: instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension)}}
nds.vd4dotu.vv v8, v10, v12
# CHECK-OBJ: nds.vd4dotu.vv v8, v10, v12, v0.t
# CHECK-ASM: nds.vd4dotu.vv v8, v10, v12, v0.t
# CHECK-ASM: encoding: [0x5b,0x44,0xc5,0x1c]
-# CHECK-ERROR: instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension)}}
nds.vd4dotu.vv v8, v10, v12, v0.t
# CHECK-OBJ: nds.vd4dotsu.vv v8, v10, v12
# CHECK-ASM: nds.vd4dotsu.vv v8, v10, v12
# CHECK-ASM: encoding: [0x5b,0x44,0xc5,0x16]
-# CHECK-ERROR: instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension)}}
nds.vd4dotsu.vv v8, v10, v12
# CHECK-OBJ: nds.vd4dotsu.vv v8, v10, v12, v0.t
# CHECK-ASM: nds.vd4dotsu.vv v8, v10, v12, v0.t
# CHECK-ASM: encoding: [0x5b,0x44,0xc5,0x14]
-# CHECK-ERROR: instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVDot' (Andes Vector Dot Product Extension)}}
nds.vd4dotsu.vv v8, v10, v12, v0.t
diff --git a/llvm/test/MC/RISCV/xandesvpackfph-valid.s b/llvm/test/MC/RISCV/xandesvpackfph-valid.s
index 955e71386d40be..ce017c4be3ce8c 100644
--- a/llvm/test/MC/RISCV/xandesvpackfph-valid.s
+++ b/llvm/test/MC/RISCV/xandesvpackfph-valid.s
@@ -4,36 +4,34 @@
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+xandesvpackfph < %s \
# RUN: | llvm-objdump --mattr=+xandesvpackfph -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc %s -triple=riscv64 -mattr=+xandesvpackfph -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM %s
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+xandesvpackfph < %s \
# RUN: | llvm-objdump --mattr=+xandesvpackfph -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# CHECK-OBJ: nds.vfpmadt.vf v8, fa0, v10
# CHECK-ASM: nds.vfpmadt.vf v8, fa0, v10
# CHECK-ASM: encoding: [0x5b,0x44,0xa5,0x0a]
-# CHECK-ERROR: instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension)}}
nds.vfpmadt.vf v8, fa0, v10
# CHECK-OBJ: nds.vfpmadt.vf v8, fa0, v10, v0.t
# CHECK-ASM: nds.vfpmadt.vf v8, fa0, v10, v0.t
# CHECK-ASM: encoding: [0x5b,0x44,0xa5,0x08]
-# CHECK-ERROR: instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension)}}
nds.vfpmadt.vf v8, fa0, v10, v0.t
# CHECK-OBJ: nds.vfpmadb.vf v8, fa0, v10
# CHECK-ASM: nds.vfpmadb.vf v8, fa0, v10
# CHECK-ASM: encoding: [0x5b,0x44,0xa5,0x0e]
-# CHECK-ERROR: instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension)}}
nds.vfpmadb.vf v8, fa0, v10
# CHECK-OBJ: nds.vfpmadb.vf v8, fa0, v10, v0.t
# CHECK-ASM: nds.vfpmadb.vf v8, fa0, v10, v0.t
# CHECK-ASM: encoding: [0x5b,0x44,0xa5,0x0c]
-# CHECK-ERROR: instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVPackFPH' (Andes Vector Packed FP16 Extension)}}
nds.vfpmadb.vf v8, fa0, v10, v0.t
diff --git a/llvm/test/MC/RISCV/xandesvsinth-invalid.s b/llvm/test/MC/RISCV/xandesvsinth-invalid.s
index 818ac98d9e30e1..ba27634ca08c77 100644
--- a/llvm/test/MC/RISCV/xandesvsinth-invalid.s
+++ b/llvm/test/MC/RISCV/xandesvsinth-invalid.s
@@ -1,15 +1,15 @@
# XAndesVSIntH - Andes Vector Small INT Handling Extension
-# RUN: not llvm-mc -triple=riscv32 -mattr=+xandesvsinth < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple=riscv64 -mattr=+xandesvsinth < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+xandesvsinth < %s
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+xandesvsinth < %s
-# CHECK: :[[@LINE+1]]:1: error: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at +1:1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors)}}
nds.vfwcvt.f.n.v v8, v10
-# CHECK: :[[@LINE+1]]:1: error: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at +1:1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors)}}
nds.vfwcvt.f.nu.v v8, v10
-# CHECK: :[[@LINE+1]]:1: error: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at +1:1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors)}}
nds.vfwcvt.f.b.v v8, v10
-# CHECK: :[[@LINE+1]]:1: error: instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors){{$}}
+# expected-error at +1:1 {{instruction requires the following: 'V' (Vector Extension for Application Processors), 'Zve32f' (Vector Extensions for Embedded Processors)}}
nds.vfwcvt.f.bu.v v8, v10
diff --git a/llvm/test/MC/RISCV/xandesvsintload-valid.s b/llvm/test/MC/RISCV/xandesvsintload-valid.s
index 19efba86a61045..abf6150538e078 100644
--- a/llvm/test/MC/RISCV/xandesvsintload-valid.s
+++ b/llvm/test/MC/RISCV/xandesvsintload-valid.s
@@ -4,36 +4,34 @@
# RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+xandesvsintload < %s \
# RUN: | llvm-objdump --mattr=+xandesvsintload -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc %s -triple=riscv64 -mattr=+xandesvsintload -show-encoding \
# RUN: | FileCheck -check-prefixes=CHECK-ASM %s
# RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+xandesvsintload < %s \
# RUN: | llvm-objdump --mattr=+xandesvsintload -M no-aliases -d -r - \
# RUN: | FileCheck -check-prefixes=CHECK-OBJ %s
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# CHECK-OBJ: nds.vln8.v v8, (a0)
# CHECK-ASM: nds.vln8.v v8, (a0)
# CHECK-ASM: encoding: [0x5b,0x44,0x25,0x06]
-# CHECK-ERROR: instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension)}}
nds.vln8.v v8, (a0)
# CHECK-OBJ: nds.vln8.v v8, (a0), v0.t
# CHECK-ASM: nds.vln8.v v8, (a0), v0.t
# CHECK-ASM: encoding: [0x5b,0x44,0x25,0x04]
-# CHECK-ERROR: instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension)}}
nds.vln8.v v8, (a0), v0.t
# CHECK-OBJ: nds.vlnu8.v v8, (a0)
# CHECK-ASM: nds.vlnu8.v v8, (a0)
# CHECK-ASM: encoding: [0x5b,0x44,0x35,0x06]
-# CHECK-ERROR: instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension)}}
nds.vlnu8.v v8, (a0)
# CHECK-OBJ: nds.vlnu8.v v8, (a0), v0.t
# CHECK-ASM: nds.vlnu8.v v8, (a0), v0.t
# CHECK-ASM: encoding: [0x5b,0x44,0x35,0x04]
-# CHECK-ERROR: instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension){{$}}
+# expected-error at +1 {{instruction requires the following: 'XAndesVSIntLoad' (Andes Vector INT4 Load Extension)}}
nds.vlnu8.v v8, (a0), v0.t
diff --git a/llvm/test/MC/RISCV/xqccmi-invalid.s b/llvm/test/MC/RISCV/xqccmi-invalid.s
index 2249bbbf2d4b4a..7dcc5ea2884f4a 100644
--- a/llvm/test/MC/RISCV/xqccmi-invalid.s
+++ b/llvm/test/MC/RISCV/xqccmi-invalid.s
@@ -1,8 +1,8 @@
# Xqccmi - Qualcomm 16-bit Instruction Lookup Table
-# RUN: not llvm-mc -triple=riscv32 -mattr=+experimental-xqccmi -M no-aliases -show-encoding < %s 2>&1 | FileCheck -check-prefix=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+experimental-xqccmi -M no-aliases -show-encoding < %s
-# CHECK-ERROR: error: immediate must be an integer in the range [0, 2047]
+# expected-error at +1 {{immediate must be an integer in the range [0, 2047]}}
qc.cm.ilut 2048
-# CHECK-ERROR: error: immediate must be an integer in the range [0, 2047]
+# expected-error at +1 {{immediate must be an integer in the range [0, 2047]}}
qc.cm.ilut -1
diff --git a/llvm/test/MC/RISCV/xqccmt-invalid.s b/llvm/test/MC/RISCV/xqccmt-invalid.s
index 75067b1f26b4ff..500623ef4d8c2e 100644
--- a/llvm/test/MC/RISCV/xqccmt-invalid.s
+++ b/llvm/test/MC/RISCV/xqccmt-invalid.s
@@ -1,13 +1,11 @@
-# RUN: not llvm-mc -triple=riscv32 -mattr=+experimental-xqccmt -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
-# RUN: not llvm-mc -triple=riscv64 -mattr=+experimental-xqccmt -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple=riscv32 -mattr=+experimental-xqccmt -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple=riscv64 -mattr=+experimental-xqccmt -M no-aliases -show-encoding < %s
-# CHECK-ERROR: error: immediate must be an integer in the range [0, 31]
+# expected-error at +1 {{immediate must be an integer in the range [0, 31]}}
qc.cm.jt 32
-# CHECK-ERROR: error: immediate must be an integer in the range [32, 255]
+# expected-error at +1 {{immediate must be an integer in the range [32, 255]}}
qc.cm.jalt 256
-# CHECK-ERROR: error: immediate must be an integer in the range [32, 255]
+# expected-error at +1 {{immediate must be an integer in the range [32, 255]}}
qc.cm.jalt 31
diff --git a/llvm/test/MC/RISCV/xqci-access-pseudos.s b/llvm/test/MC/RISCV/xqci-access-pseudos.s
index 51f0d8b3539b33..7d74a2c9086f5f 100644
--- a/llvm/test/MC/RISCV/xqci-access-pseudos.s
+++ b/llvm/test/MC/RISCV/xqci-access-pseudos.s
@@ -7,8 +7,7 @@
# RUN: | llvm-objdump --mattr=+zca,+zcb -M no-aliases --no-print-imm-hex -dr - \
# RUN: | FileCheck -check-prefix=CHECK-INST,CHECK-RELOC %s
-# RUN: not llvm-mc %s -triple=riscv64 -mattr=+zca,+zcb 2>&1 \
-# RUN: | FileCheck -check-prefix=CHECK-RV64 %s
+# RUN: llvm-mc --verify %s -triple=riscv64 -mattr=+zca,+zcb
## This tests the instructions which accept %qc.access(...), which are the
## RVI, Zca, and Zcb loads and stores, on RV32 only.
@@ -20,9 +19,9 @@ lb a0, 0(a1), %qc.access(extern1)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern1
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:15: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:15 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
lbu a0, 0(a1), %qc.access(extern1)
# CHECK-INST: lbu a0, 0(a1)
@@ -31,9 +30,9 @@ lbu a0, 0(a1), %qc.access(extern1)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern1
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:16: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:16 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
lh a2, 0(a3), %qc.access(extern2)
# CHECK-INST: lh a2, 0(a3)
@@ -42,9 +41,9 @@ lh a2, 0(a3), %qc.access(extern2)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern2
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:15: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:15 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
lhu a2, 0(a3), %qc.access(extern2)
# CHECK-INST: lhu a2, 0(a3)
@@ -53,9 +52,9 @@ lhu a2, 0(a3), %qc.access(extern2)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern2
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:16: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:16 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
lw a4, 0(a5), %qc.access(extern4)
# CHECK-INST: lw a4, 0(a5)
@@ -64,9 +63,9 @@ lw a4, 0(a5), %qc.access(extern4)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern4
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:15: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:15 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
sb a0, 0(a1), %qc.access(extern1)
# CHECK-INST: sb a0, 0(a1)
@@ -75,9 +74,9 @@ sb a0, 0(a1), %qc.access(extern1)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern1
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:15: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:15 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
sh a2, 0(a3), %qc.access(extern2)
# CHECK-INST: sh a2, 0(a3)
@@ -86,9 +85,9 @@ sh a2, 0(a3), %qc.access(extern2)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern2
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:15: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:15 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
sw a4, 0(a5), %qc.access(extern4)
# CHECK-INST: sw a4, 0(a5)
@@ -97,9 +96,9 @@ sw a4, 0(a5), %qc.access(extern4)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_32 extern4
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:15: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:15 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
## No c.lb
@@ -110,9 +109,9 @@ c.lbu a0, 0(a1), %qc.access(extern1)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_16 extern1
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:18: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:18 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
c.lh a2, 0(a3), %qc.access(extern2)
# CHECK-INST: c.lh a2, 0(a3)
@@ -121,9 +120,9 @@ c.lh a2, 0(a3), %qc.access(extern2)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_16 extern2
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:17: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:17 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
c.lhu a2, 0(a3), %qc.access(extern2)
# CHECK-INST: c.lhu a2, 0(a3)
@@ -132,9 +131,9 @@ c.lhu a2, 0(a3), %qc.access(extern2)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_16 extern2
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:18: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:18 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
c.lw a4, 0(a5), %qc.access(extern4)
# CHECK-INST: c.lw a4, 0(a5)
@@ -143,9 +142,9 @@ c.lw a4, 0(a5), %qc.access(extern4)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_16 extern4
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:17: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:17 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
c.sb a0, 0(a1), %qc.access(extern1)
# CHECK-INST: c.sb a0, 0(a1)
@@ -154,9 +153,9 @@ c.sb a0, 0(a1), %qc.access(extern1)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_16 extern1
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:17: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:17 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
c.sh a2, 0(a3), %qc.access(extern2)
# CHECK-INST: c.sh a2, 0(a3)
@@ -165,9 +164,9 @@ c.sh a2, 0(a3), %qc.access(extern2)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_16 extern2
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:17: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:17 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
c.sw a4, 0(a5), %qc.access(extern4)
# CHECK-INST: c.sw a4, 0(a5)
@@ -176,6 +175,6 @@ c.sw a4, 0(a5), %qc.access(extern4)
# CHECK-RELOC: R_RISCV_VENDOR QUALCOMM
# CHECK-RELOC-NEXT: R_RISCV_QC_ACCESS_16 extern4
# CHECK-RELOC-NEXT: R_RISCV_RELAX
-# CHECK-RV64: [[@LINE-7]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-RV64: [[@LINE-8]]:17: note: unexpected extra operand for instruction
-# CHECK-RV64: [[@LINE-9]]:1: note: instruction requires the following: RV32I Base Instruction Set
+# expected-error at -7:1 {{invalid instruction, any one of the following would fix this:}}
+# expected-note at -8:17 {{unexpected extra operand for instruction}}
+# expected-note at -9:1 {{instruction requires the following: RV32I Base Instruction Set}}
diff --git a/llvm/test/MC/RISCV/xqcibm-invalid.s b/llvm/test/MC/RISCV/xqcibm-invalid.s
index d2885203a64891..abbf59ee825c1a 100644
--- a/llvm/test/MC/RISCV/xqcibm-invalid.s
+++ b/llvm/test/MC/RISCV/xqcibm-invalid.s
@@ -1,616 +1,614 @@
# Xqcibm - Qualcomm uC Bit Manipulation Extension
-# RUN: not llvm-mc -triple riscv32 -mattr=+xqcibm < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-PLUS %s --implicit-check-not="error:"
-# RUN: not llvm-mc -triple riscv32 -mattr=-xqcibm < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-MINUS %s --implicit-check-not="error:"
+# RUN: llvm-mc --verify=plus -triple riscv32 -mattr=+xqcibm < %s
+# RUN: llvm-mc --verify=minus -triple riscv32 -mattr=-xqcibm < %s
-# CHECK-PLUS: :[[@LINE+2]]:18: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress2 x7, 5
-# CHECK-PLUS: :[[@LINE+2]]:16: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress2 x7
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress2 x0,x5
-# CHECK-PLUS: :[[@LINE+2]]:18: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress2 x7, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.compress2 x7, x5
-# CHECK-PLUS: :[[@LINE+2]]:19: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress3 x10, 22
-# CHECK-PLUS: :[[@LINE+2]]:17: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress3 x10
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress3 x0, x22
-# CHECK-PLUS: :[[@LINE+2]]:19: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.compress3 x10, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.compress3 x10, x22
-# CHECK-PLUS: :[[@LINE+2]]:17: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand2 x23, 23
-# CHECK-PLUS: :[[@LINE+2]]:15: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand2 x23
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand2 x0, x23
-# CHECK-PLUS: :[[@LINE+2]]:17: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand2 x23, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.expand2 x23, x23
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand3 x2, 6
-# CHECK-PLUS: :[[@LINE+2]]:14: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand3 x2
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand3 x0, x6
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.expand3 x2, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.expand3 x2, x6
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.clo x23, 24
-# CHECK-PLUS: :[[@LINE+2]]:11: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.clo x23
-# CHECK-PLUS: :[[@LINE+2]]:8: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:8 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.clo x0, x24
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.clo x23, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.clo x23, x24
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.cto x12, 13
-# CHECK-PLUS: :[[@LINE+2]]:11: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.cto x12
-# CHECK-PLUS: :[[@LINE+2]]:8: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:8 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.cto x0, x13
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.cto x12, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.cto x12, x13
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.brev32 x20, 24
-# CHECK-PLUS: :[[@LINE+2]]:14: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.brev32 x20
-# CHECK-PLUS: :[[@LINE+2]]:11: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.brev32 x0, x24
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.brev32 x20, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.brev32 x20, x24
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbri x10, 20, -1024
-# CHECK-PLUS: :[[@LINE+2]]:11: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbri x0, x20, -1024
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbri x10, x0, -1024
-# CHECK-PLUS: :[[@LINE+2]]:19: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbri x10, x20
-# CHECK-PLUS: :[[@LINE+2]]:21: error: immediate must be an integer in the range [-1024, 1023]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{immediate must be an integer in the range [-1024, 1023]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbri x10, x20, -1027
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insbri x10, x20, -1024
-# CHECK-PLUS: :[[@LINE+2]]:10: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:10 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbi x0, -10, 12, 15
-# CHECK-PLUS: :[[@LINE+2]]:21: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbi x6, -10, 12
-# CHECK-PLUS: :[[@LINE+2]]:14: error: immediate must be an integer in the range [-16, 15]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{immediate must be an integer in the range [-16, 15]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbi x6, -17, 12, 15
-# CHECK-PLUS: :[[@LINE+2]]:19: error: immediate must be an integer in the range [1, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{immediate must be an integer in the range [1, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbi x6, -10, 45, 15
-# CHECK-PLUS: :[[@LINE+2]]:23: error: immediate must be an integer in the range [0, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:23 {{immediate must be an integer in the range [0, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbi x6, -10, 12, 65
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insbi x6, -10, 12, 15
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insb x10, 7, 6, 31
-# CHECK-PLUS: :[[@LINE+2]]:19: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insb x10, x7, 6
-# CHECK-PLUS: :[[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insb x0, x7, 6, 31
-# CHECK-PLUS: :[[@LINE+2]]:18: error: immediate must be an integer in the range [1, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{immediate must be an integer in the range [1, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insb x10, x7, 46, 31
-# CHECK-PLUS: :[[@LINE+2]]:21: error: immediate must be an integer in the range [0, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{immediate must be an integer in the range [0, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insb x10, x7, 6, 61
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insb x10, x7, 6, 31
-# CHECK-PLUS: :[[@LINE+2]]:15: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbh x20, 12, 8, 12
-# CHECK-PLUS: :[[@LINE+2]]:21: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbh x20, x12, 8
-# CHECK-PLUS: :[[@LINE+2]]:10: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:10 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbh x0, x12, 8, 12
-# CHECK-PLUS: :[[@LINE+2]]:20: error: immediate must be an integer in the range [1, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{immediate must be an integer in the range [1, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbh x20, x12, 48, 12
-# CHECK-PLUS: :[[@LINE+2]]:23: error: immediate must be an integer in the range [0, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:23 {{immediate must be an integer in the range [0, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbh x20, x12, 8, 72
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insbh x20, x12, 8, 12
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extu x15, 12, 20, 20
-# CHECK-PLUS: :[[@LINE+2]]:21: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extu x15, x12, 20
-# CHECK-PLUS: :[[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extu x0, x12, 20, 20
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extu x15, x0, 20, 20
-# CHECK-PLUS: :[[@LINE+2]]:19: error: immediate must be an integer in the range [1, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{immediate must be an integer in the range [1, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extu x15, x12, 0, 20
-# CHECK-PLUS: :[[@LINE+2]]:23: error: immediate must be an integer in the range [0, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:23 {{immediate must be an integer in the range [0, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extu x15, x12, 20, 60
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extu x15, x12, 20, 20
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.ext x27, 6, 31, 1
-# CHECK-PLUS: :[[@LINE+2]]:19: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.ext x27, x6, 31
-# CHECK-PLUS: :[[@LINE+2]]:8: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:8 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.ext x0, x6, 31, 1
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.ext x27, x0, 31, 1
-# CHECK-PLUS: :[[@LINE+2]]:17: error: immediate must be an integer in the range [1, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{immediate must be an integer in the range [1, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.ext x27, x6, 0, 1
-# CHECK-PLUS: :[[@LINE+2]]:21: error: immediate must be an integer in the range [0, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{immediate must be an integer in the range [0, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.ext x27, x6, 31, 41
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.ext x27, x6, 31, 1
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdu x1, 8, 8, 8
-# CHECK-PLUS: :[[@LINE+2]]:19: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdu x1, x8, 8
-# CHECK-PLUS: :[[@LINE+2]]:10: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:10 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdu x0, x8, 8, 8
-# CHECK-PLUS: :[[@LINE+2]]:18: error: immediate must be an integer in the range [1, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{immediate must be an integer in the range [1, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdu x1, x8, 48, 8
-# CHECK-PLUS: :[[@LINE+2]]:21: error: immediate must be an integer in the range [0, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{immediate must be an integer in the range [0, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdu x1, x8, 8, 78
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extdu x1, x8, 8, 8
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extd x13, 21, 10, 15
-# CHECK-PLUS: :[[@LINE+2]]:21: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extd x13, x21, 10
-# CHECK-PLUS: :[[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extd x0, x21, 10, 15
-# CHECK-PLUS: :[[@LINE+2]]:19: error: immediate must be an integer in the range [1, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{immediate must be an integer in the range [1, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extd x13, x21, 60, 15
-# CHECK-PLUS: :[[@LINE+2]]:23: error: immediate must be an integer in the range [0, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:23 {{immediate must be an integer in the range [0, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extd x13, x21, 10, 85
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extd x13, x21, 10, 15
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbr x10, x19, 5
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbr x10, x20
-# CHECK-PLUS: :[[@LINE+2]]:10: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:10 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbr x0, x19, x5
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbr x10, x19, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insbr x10, x19, x5
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbhr x15, x4, 6
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbhr x15, x4
-# CHECK-PLUS: :[[@LINE+2]]:11: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbhr x0, x4, x6
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbhr x15, x4, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insbhr x15, x4, x6
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbpr x21, x8, 9
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbpr x21, x8
-# CHECK-PLUS: :[[@LINE+2]]:11: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbpr x0, x8, x9
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbpr x21, x8, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insbpr x21, x8, x9
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbprh x2, x3, 11
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbprh x2, x3
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbprh x0, x3, x11
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.insbprh x2, x3, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.insbprh x2, x3, x11
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdur x9, x19, 29
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdur x9, x19
-# CHECK-PLUS: :[[@LINE+2]]:11: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdur x0, x19, x29
-# CHECK-PLUS: :[[@LINE+2]]:15: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdur x9, x31, x29
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdur x9, x19, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extdur x9, x19, x29
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdr x12, x29, 30
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdr x12, x29
-# CHECK-PLUS: :[[@LINE+2]]:10: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:10 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdr x0, x29, x30
-# CHECK-PLUS: :[[@LINE+2]]:15: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdr x12, x31, x30
-# CHECK-PLUS: :[[@LINE+2]]:20: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdr x12, x29, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extdr x12, x29, x30
-# CHECK-PLUS: :[[@LINE+2]]:22: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdupr x13, x23, 3
-# CHECK-PLUS: :[[@LINE+2]]:20: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdupr x13, x23
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdupr x0, x23, x3
-# CHECK-PLUS: :[[@LINE+2]]:17: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdupr x13, x31, x3
-# CHECK-PLUS: :[[@LINE+2]]:22: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdupr x13, x23, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extdupr x13, x23, x3
-# CHECK-PLUS: :[[@LINE+2]]:22: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extduprh x18, x8, 9
-# CHECK-PLUS: :[[@LINE+2]]:20: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extduprh x18, x8
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extduprh x0, x8, x9
-# CHECK-PLUS: :[[@LINE+2]]:18: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extduprh x18, x31, x9
-# CHECK-PLUS: :[[@LINE+2]]:22: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extduprh x18, x8, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extduprh x18, x8, x9
-# CHECK-PLUS: :[[@LINE+2]]:19: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdpr x1, x4, 15
-# CHECK-PLUS: :[[@LINE+2]]:17: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdpr x1, x4
-# CHECK-PLUS: :[[@LINE+2]]:11: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdpr x0, x4, x15
-# CHECK-PLUS: :[[@LINE+2]]:15: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdpr x1, x31, x15
-# CHECK-PLUS: :[[@LINE+2]]:19: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdpr x1, x4, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extdpr x1, x4, x15
-# CHECK-PLUS: :[[@LINE+2]]:21: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdprh x6, x24, 25
-# CHECK-PLUS: :[[@LINE+2]]:19: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdprh x6, x24
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdprh x0, x24, x25
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding t6 (x31)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding t6 (x31)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdprh x6, x31, x25
-# CHECK-PLUS: :[[@LINE+2]]:21: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.extdprh x6, x24, x0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.extdprh x6, x24, x25
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR from x8 to x15
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR from x8 to x15}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.bexti x1, 8
-# CHECK-PLUS: :[[@LINE+2]]:15: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.bexti x15
-# CHECK-PLUS: :[[@LINE+2]]:17: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.bexti x15, 43
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.c.bexti x9, 8
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR from x8 to x15
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR from x8 to x15}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.bseti x2, 10
-# CHECK-PLUS: :[[@LINE+2]]:15: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.bseti x12
-# CHECK-PLUS: :[[@LINE+2]]:17: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.bseti x12, -10
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.c.bseti x12, 30
-# CHECK-PLUS: :[[@LINE+2]]:11: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:11 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.extu x0, 10
-# CHECK-PLUS: :[[@LINE+2]]:13: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.extu x5
-# CHECK-PLUS: :[[@LINE+2]]:16: error: immediate must be an integer in the range [6, 32]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{immediate must be an integer in the range [6, 32]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.c.extu x17, 3
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcibm' (Qualcomm uC Bit Manipulation Extension)}}
qc.c.extu x17, 32
diff --git a/llvm/test/MC/RISCV/xqciint-csrs-invalid.s b/llvm/test/MC/RISCV/xqciint-csrs-invalid.s
index 5175b8c846ec67..29fabc97456c99 100644
--- a/llvm/test/MC/RISCV/xqciint-csrs-invalid.s
+++ b/llvm/test/MC/RISCV/xqciint-csrs-invalid.s
@@ -1,190 +1,189 @@
# Xqciint - Qualcomm uC Custom CSRs
-# RUN: not llvm-mc -triple riscv32 -mattr=-xqciint < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-FEATURE %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=-xqciint < %s
csrrs t2, qc.mmcr, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mmcr' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mmcr' requires 'xqciint' to be enabled}}
csrrs t2, qc.mntvec, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mntvec' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mntvec' requires 'xqciint' to be enabled}}
csrrs t2, qc.mstktopaddr, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mstktopaddr' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mstktopaddr' requires 'xqciint' to be enabled}}
csrrs t2, qc.mstkbottomaddr, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mstkbottomaddr' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mstkbottomaddr' requires 'xqciint' to be enabled}}
csrrs t2, qc.mthreadptr, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mthreadptr' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mthreadptr' requires 'xqciint' to be enabled}}
csrrs t2, qc.mcause, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mcause' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mcause' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip0, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip0' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip0' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip1, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip1' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip1' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip2, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip2' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip2' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip3, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip3' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip3' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip4, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip4' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip4' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip5, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip5' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip5' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip6, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip6' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip6' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicip7, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicip7' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicip7' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie0, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie0' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie0' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie1, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie1' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie1' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie2, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie2' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie2' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie3, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie3' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie3' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie4, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie4' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie4' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie5, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie5' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie5' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie6, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie6' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie6' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicie7, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicie7' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicie7' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl00, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl00' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl00' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl01, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl01' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl01' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl02, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl02' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl02' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl03, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl03' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl03' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl04, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl04' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl04' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl05, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl05' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl05' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl06, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl06' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl06' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl07, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl07' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl07' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl08, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl08' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl08' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl09, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl09' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl09' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl10, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl10' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl10' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl11, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl11' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl11' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl12, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl12' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl12' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl13, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl13' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl13' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl14, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl14' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl14' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl15, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl15' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl15' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl16, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl16' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl16' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl17, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl17' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl17' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl18, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl18' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl18' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl19, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl19' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl19' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl20, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl20' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl20' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl21, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl21' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl21' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl22, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl22' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl22' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl23, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl23' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl23' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl24, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl24' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl24' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl25, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl25' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl25' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl26, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl26' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl26' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl27, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl27' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl27' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl28, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl28' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl28' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl29, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl29' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl29' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl30, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl30' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl30' requires 'xqciint' to be enabled}}
csrrs t2, qc.mclicilvl31, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mclicilvl31' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mclicilvl31' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpstartaddr0, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpstartaddr0' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpstartaddr0' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpstartaddr1, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpstartaddr1' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpstartaddr1' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpstartaddr2, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpstartaddr2' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpstartaddr2' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpstartaddr3, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpstartaddr3' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpstartaddr3' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpendaddr0, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpendaddr0' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpendaddr0' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpendaddr1, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpendaddr1' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpendaddr1' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpendaddr2, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpendaddr2' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpendaddr2' requires 'xqciint' to be enabled}}
csrrs t2, qc.mwpendaddr3, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'qc.mwpendaddr3' requires 'xqciint' to be enabled
+// expected-error at -1:11 {{system register 'qc.mwpendaddr3' requires 'xqciint' to be enabled}}
diff --git a/llvm/test/MC/RISCV/xqciio-invalid.s b/llvm/test/MC/RISCV/xqciio-invalid.s
index 08fa01645fd79e..4f5a33b970f192 100644
--- a/llvm/test/MC/RISCV/xqciio-invalid.s
+++ b/llvm/test/MC/RISCV/xqciio-invalid.s
@@ -1,33 +1,31 @@
# Xqciio - Qualcomm uC External Input Output Extension
-# RUN: not llvm-mc -triple riscv32 -mattr=+xqciio < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK,CHECK-PLUS --implicit-check-not="error:" --implicit-check-not="note:" %s
-# RUN: not llvm-mc -triple riscv32 -mattr=-xqciio < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK,CHECK-MINUS --implicit-check-not="error:" --implicit-check-not="note:" %s
+# RUN: llvm-mc --verify=expected,plus -triple riscv32 -mattr=+xqciio < %s
+# RUN: llvm-mc --verify=expected,minus -triple riscv32 -mattr=-xqciio < %s
-# CHECK: :[[@LINE+1]]:18: error: expected register
+# expected-error at +1:18 {{expected register}}
qc.outw x5, 2048(10)
-# CHECK-PLUS: :[[@LINE+2]]:13: error: expected '('
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)
+# plus-error at +2:13 {{expected '('}}
+# minus-error at +1:1 {{instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)}}
qc.outw x5, x10
-# CHECK-PLUS: :[[@LINE+2]]:13: error: immediate must be a multiple of 4 bytes in the range [0, 16380]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{immediate must be a multiple of 4 bytes in the range [0, 16380]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.outw x5, 4099(x10)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)}}
qc.outw x5, 2048(x10)
-# CHECK: :[[@LINE+1]]:19: error: expected register
+# expected-error at +1:19 {{expected register}}
qc.inw x23, 16380(17)
-# CHECK-PLUS: :[[@LINE+2]]:13: error: expected '('
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)
+# plus-error at +2:13 {{expected '('}}
+# minus-error at +1:1 {{instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)}}
qc.inw x23, x17
-# CHECK-PLUS: :[[@LINE+2]]:13: error: immediate must be a multiple of 4 bytes in the range [0, 16380]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{immediate must be a multiple of 4 bytes in the range [0, 16380]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.inw x23, 16384(x17)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqciio' (Qualcomm uC External Input Output Extension)}}
qc.inw x23, 16380(x17)
diff --git a/llvm/test/MC/RISCV/xqcilo-pseudos-invalid.s b/llvm/test/MC/RISCV/xqcilo-pseudos-invalid.s
index 3f97bdda014d2f..1f986b5284da17 100644
--- a/llvm/test/MC/RISCV/xqcilo-pseudos-invalid.s
+++ b/llvm/test/MC/RISCV/xqcilo-pseudos-invalid.s
@@ -1,108 +1,106 @@
# Xqcilo - Qualcomm uC Large Offset Load Store extension
-# RUN: not llvm-mc %s -triple=riscv32 -mattr=+xqcilo,+xqcili \
-# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-ENABLED --implicit-check-not="error:" --implicit-check-not="note:" %s
-# RUN: not llvm-mc %s -triple=riscv32 -mattr=-xqcilo \
-# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-DISABLED --implicit-check-not="error:" --implicit-check-not="note:" %s
-
-# CHECK-ENABLED: [[@LINE+4]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ENABLED: [[@LINE+3]]:13: note: operand must be a bare symbol name
-# CHECK-ENABLED: [[@LINE+2]]:19: note: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: invalid instruction
+# RUN: llvm-mc --verify=enabled %s -triple=riscv32 -mattr=+xqcilo,+xqcili
+# RUN: llvm-mc --verify=disabled %s -triple=riscv32 -mattr=-xqcilo
+
+# enabled-error at +4:1 {{invalid instruction, any one of the following would fix this:}}
+# enabled-note at +3:13 {{operand must be a bare symbol name}}
+# enabled-note at +2:19 {{too few operands for instruction}}
+# disabled-error at +1:1 {{invalid instruction}}
qc.e.lb a0, 0xf000
-# CHECK-ENABLED: [[@LINE+4]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ENABLED: [[@LINE+3]]:14: note: operand must be a bare symbol name
-# CHECK-ENABLED: [[@LINE+2]]:20: note: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: invalid instruction
+# enabled-error at +4:1 {{invalid instruction, any one of the following would fix this:}}
+# enabled-note at +3:14 {{operand must be a bare symbol name}}
+# enabled-note at +2:20 {{too few operands for instruction}}
+# disabled-error at +1:1 {{invalid instruction}}
qc.e.lbu a0, 0xf000
-# CHECK-ENABLED: [[@LINE+4]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ENABLED: [[@LINE+3]]:13: note: operand must be a bare symbol name
-# CHECK-ENABLED: [[@LINE+2]]:19: note: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: invalid instruction
+# enabled-error at +4:1 {{invalid instruction, any one of the following would fix this:}}
+# enabled-note at +3:13 {{operand must be a bare symbol name}}
+# enabled-note at +2:19 {{too few operands for instruction}}
+# disabled-error at +1:1 {{invalid instruction}}
qc.e.lh a0, 0xf000
-# CHECK-ENABLED: [[@LINE+4]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ENABLED: [[@LINE+3]]:14: note: operand must be a bare symbol name
-# CHECK-ENABLED: [[@LINE+2]]:20: note: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: invalid instruction
+# enabled-error at +4:1 {{invalid instruction, any one of the following would fix this:}}
+# enabled-note at +3:14 {{operand must be a bare symbol name}}
+# enabled-note at +2:20 {{too few operands for instruction}}
+# disabled-error at +1:1 {{invalid instruction}}
qc.e.lhu a0, 0xf000
-# CHECK-ENABLED: [[@LINE+4]]:1: error: invalid instruction, any one of the following would fix this:
-# CHECK-ENABLED: [[@LINE+3]]:13: note: operand must be a bare symbol name
-# CHECK-ENABLED: [[@LINE+2]]:19: note: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: invalid instruction
+# enabled-error at +4:1 {{invalid instruction, any one of the following would fix this:}}
+# enabled-note at +3:13 {{operand must be a bare symbol name}}
+# enabled-note at +2:19 {{too few operands for instruction}}
+# disabled-error at +1:1 {{invalid instruction}}
qc.e.lw a0, 0xf000
-# CHECK-ENABLED: [[@LINE+2]]:13: error: operand must be a bare symbol name
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:13 {{operand must be a bare symbol name}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sb a0, 0xf000, t0
-# CHECK-ENABLED: [[@LINE+2]]:13: error: operand must be a bare symbol name
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:13 {{operand must be a bare symbol name}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sh a0, 0xf000, t0
-# CHECK-ENABLED: [[@LINE+2]]:13: error: operand must be a bare symbol name
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:13 {{operand must be a bare symbol name}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sw a0, 0xf000, t0
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lb a0, undefined
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lbu a0, undefined
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lh a0, undefined
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lhu a0, undefined
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lw a0, undefined
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sb a0, undefined, t0
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sh a0, undefined, t0
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcili' (Qualcomm uC Load Large Immediate Extension), 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sw a0, undefined, t0
-# CHECK-ENABLED: [[@LINE+2]]:22: error: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:22 {{too few operands for instruction}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sb a0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:22: error: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:22 {{too few operands for instruction}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sh a0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:22: error: too few operands for instruction
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:22 {{too few operands for instruction}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sw a0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lb x0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:10: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:10 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lbu x0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lh x0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:10: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:10 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lhu x0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.lw x0, undefined
-# CHECK-ENABLED: [[@LINE+2]]:24: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:24 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sb a0, undefined, x0
-# CHECK-ENABLED: [[@LINE+2]]:24: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:24 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sh a0, undefined, x0
-# CHECK-ENABLED: [[@LINE+2]]:24: error: register must be a GPR excluding zero (x0)
-# CHECK-DISABLED: [[@LINE+1]]:1: error: instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)
+# enabled-error at +2:24 {{register must be a GPR excluding zero (x0)}}
+# disabled-error at +1:1 {{instruction requires the following: 'Xqcilo' (Qualcomm uC Large Offset Load Store Extension)}}
qc.e.sw a0, undefined, x0
diff --git a/llvm/test/MC/RISCV/xqcilsm-invalid.s b/llvm/test/MC/RISCV/xqcilsm-invalid.s
index d5a33ca22d5bf6..7dc90fb2622e43 100644
--- a/llvm/test/MC/RISCV/xqcilsm-invalid.s
+++ b/llvm/test/MC/RISCV/xqcilsm-invalid.s
@@ -1,137 +1,135 @@
# Xqcilsm - Qualcomm uC Load Store Multiple Extension
-# RUN: not llvm-mc -triple riscv32 -mattr=+xqcilsm < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK,CHECK-PLUS --implicit-check-not="error:" --implicit-check-not="note:" %s
-# RUN: not llvm-mc -triple riscv32 -mattr=-xqcilsm < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK,CHECK-MINUS --implicit-check-not="error:" --implicit-check-not="note:" %s
+# RUN: llvm-mc --verify=expected,plus -triple riscv32 -mattr=+xqcilsm < %s
+# RUN: llvm-mc --verify=expected,minus -triple riscv32 -mattr=-xqcilsm < %s
-# CHECK: :[[@LINE+1]]:20: error: expected register
+# expected-error at +1:20 {{expected register}}
qc.swm x5, x20, 12(20)
-# CHECK-PLUS: :[[@LINE+2]]:8: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:8 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swm x0, x20, 12(x3)
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swm x5, x0, 12(x3)
-# CHECK-PLUS: :[[@LINE+2]]:14: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swm x5, x3
-# CHECK-PLUS: :[[@LINE+2]]:17: error: immediate must be a multiple of 4 bytes in the range [0, 124]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swm x5, x20, 45(x3)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)}}
qc.swm x5, x20, 12(x3)
-# CHECK: :[[@LINE+1]]:20: error: expected register
+# expected-error at +1:20 {{expected register}}
qc.swmi x10, 4, 20(4)
-# CHECK-PLUS: :[[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swmi x0, 4, 20(x4)
-# CHECK-PLUS: :[[@LINE+2]]:19: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swmi x10, 4, 20
-# CHECK-PLUS: :[[@LINE+2]]:14: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swmi x10, 32, 20(x4)
-# CHECK-PLUS: :[[@LINE+2]]:14: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swmi x10, 0, 20(x4)
-# CHECK-PLUS: :[[@LINE+2]]:17: error: immediate must be a multiple of 4 bytes in the range [0, 124]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.swmi x10, 4, 45(x4)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)}}
qc.swmi x10, 4, 20(x4)
-# CHECK: :[[@LINE+1]]:23: error: expected register
+# expected-error at +1:23 {{expected register}}
qc.setwm x4, x30, 124(2)
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.setwm x4, x0, 124(x2)
-# CHECK-PLUS: :[[@LINE+2]]:22: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.setwm x4, x30, 124
-# CHECK-PLUS: :[[@LINE+2]]:19: error: immediate must be a multiple of 4 bytes in the range [0, 124]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.setwm x4, x30, 128(x2)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)}}
qc.setwm x4, x30, 124(x2)
-# CHECK: :[[@LINE+1]]:22: error: expected register
+# expected-error at +1:22 {{expected register}}
qc.setwmi x5, 31, 12(12)
-# CHECK-PLUS: :[[@LINE+2]]:21: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.setwmi x5, 31, 12
-# CHECK-PLUS: :[[@LINE+2]]:15: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.setwmi x5, 37, 12(x12)
-# CHECK-PLUS: :[[@LINE+2]]:15: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:15 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.setwmi x5, 0, 12(x12)
-# CHECK-PLUS: :[[@LINE+2]]:19: error: immediate must be a multiple of 4 bytes in the range [0, 124]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.setwmi x5, 31, 98(x12)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)}}
qc.setwmi x5, 31, 12(x12)
-# CHECK: :[[@LINE+1]]:19: error: expected register
+# expected-error at +1:19 {{expected register}}
qc.lwm x7, x1, 24(20)
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwm x7, x1, 24
-# CHECK-PLUS: :[[@LINE+2]]:8: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:8 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwm x0, x1, 24(x20)
-# CHECK-PLUS: :[[@LINE+2]]:16: error: immediate must be a multiple of 4 bytes in the range [0, 124]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwm x7, x1, 46(x20)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)}}
qc.lwm x7, x1, 24(x20)
-# CHECK: :[[@LINE+1]]:19: error: expected register
+# expected-error at +1:19 {{expected register}}
qc.lwmi x13, 9, 4(23)
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwmi x13, 9, 4
-# CHECK-PLUS: :[[@LINE+2]]:9: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:9 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwmi x0, 9, 4(x23)
-# CHECK-PLUS: :[[@LINE+2]]:14: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwmi x13, 44, 4(x23)
-# CHECK-PLUS: :[[@LINE+2]]:14: error: immediate must be an integer in the range [1, 31]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{immediate must be an integer in the range [1, 31]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwmi x13, 0, 4(x23)
-# CHECK-PLUS: :[[@LINE+2]]:17: error: immediate must be a multiple of 4 bytes in the range [0, 124]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{immediate must be a multiple of 4 bytes in the range [0, 124]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lwmi x13, 9, 77(x23)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcilsm' (Qualcomm uC Load Store Multiple Extension)}}
qc.lwmi x13, 9, 4(x23)
diff --git a/llvm/test/MC/RISCV/xqcisls-invalid.s b/llvm/test/MC/RISCV/xqcisls-invalid.s
index 91b619d11aae6d..d5a0d3d35c4ba7 100644
--- a/llvm/test/MC/RISCV/xqcisls-invalid.s
+++ b/llvm/test/MC/RISCV/xqcisls-invalid.s
@@ -1,164 +1,162 @@
# Xqcisls - Qualcomm uC Scaled Load Store Extension
-# RUN: not llvm-mc -triple riscv32 -mattr=+xqcisls < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-PLUS %s
-# RUN: not llvm-mc -triple riscv32 -mattr=-xqcisls < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-MINUS %s
+# RUN: llvm-mc --verify=plus -triple riscv32 -mattr=+xqcisls < %s
+# RUN: llvm-mc --verify=minus -triple riscv32 -mattr=-xqcisls < %s
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrb x5, x2, x0, 4
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrb x5, x2, x4
-# CHECK-PLUS: :[[@LINE+2]]:20: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrb x5, x2, x4, 12
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrb x5, 2, x4, 4
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.lrb x5, x2, x4, 4
-# CHECK-PLUS: :[[@LINE+2]]:17: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrh x1, x12, x0, 2
-# CHECK-PLUS: :[[@LINE+2]]:19: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:19 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrh x1, x12, x6
-# CHECK-PLUS: :[[@LINE+2]]:21: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrh x1, x12, x6, 22
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrh x1, 12, x6, 2
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.lrh x1, x12, x6, 2
-# CHECK-PLUS: :[[@LINE+2]]:17: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrw x15, x7, x0, 1
-# CHECK-PLUS: :[[@LINE+2]]:20: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrw x15, x7, x14
-# CHECK-PLUS: :[[@LINE+2]]:22: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrw x15, x7, x14, 11
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrw x15, 7, x14, 1
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.lrw x15, x7, x14, 1
-# CHECK-PLUS: :[[@LINE+2]]:18: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrbu x9, x11, x0, 7
-# CHECK-PLUS: :[[@LINE+2]]:20: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrbu x9, x11, x4
-# CHECK-PLUS: :[[@LINE+2]]:22: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrbu x9, x11, x4, 37
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrbu x9, 11, x4, 7
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.lrbu x9, x11, x4, 7
-# CHECK-PLUS: :[[@LINE+2]]:18: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrhu x16, x6, x0, 4
-# CHECK-PLUS: :[[@LINE+2]]:21: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrhu x16, x6, x10
-# CHECK-PLUS: :[[@LINE+2]]:23: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:23 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrhu x16, x6, x10, 44
-# CHECK-PLUS: :[[@LINE+2]]:14: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:14 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.lrhu x16, 6, x10, 4
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.lrhu x16, x6, x10, 4
-# CHECK-PLUS: :[[@LINE+2]]:16: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:16 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srb x0, x2, x0, 3
-# CHECK-PLUS: :[[@LINE+2]]:18: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srb x0, x2, x8
-# CHECK-PLUS: :[[@LINE+2]]:20: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srb x0, x2, x8, 93
-# CHECK-PLUS: :[[@LINE+2]]:12: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:12 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srb x0, 2, x8, 3
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.srb x0, x2, x8, 3
-# CHECK-PLUS: :[[@LINE+2]]:17: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:17 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srh x13, x0, x0, 6
-# CHECK-PLUS: :[[@LINE+2]]:20: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:20 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srh x13, x0, x20
-# CHECK-PLUS: :[[@LINE+2]]:22: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:22 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srh x13, x0, x20, 76
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srh x13, 0, x20, 6
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.srh x13, x0, x20, 6
-# CHECK-PLUS: :[[@LINE+2]]:18: error: register must be a GPR excluding zero (x0)
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:18 {{register must be a GPR excluding zero (x0)}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srw x17, x18, x0, 0
-# CHECK-PLUS: :[[@LINE+2]]:21: error: too few operands for instruction
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:21 {{too few operands for instruction}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srw x17, x18, x19
-# CHECK-PLUS: :[[@LINE+2]]:23: error: immediate must be an integer in the range [0, 7]
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:23 {{immediate must be an integer in the range [0, 7]}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srw x17, x18, x19, 10
-# CHECK-PLUS: :[[@LINE+2]]:13: error: register must be a GPR
-# CHECK-MINUS: :[[@LINE+1]]:1: error: invalid instruction
+# plus-error at +2:13 {{register must be a GPR}}
+# minus-error at +1:1 {{invalid instruction}}
qc.srw x17, 18, x19, 0
-# CHECK-MINUS: :[[@LINE+1]]:1: error: instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)
+# minus-error at +1:1 {{instruction requires the following: 'Xqcisls' (Qualcomm uC Scaled Load Store Extension)}}
qc.srw x17, x18, x19, 0
diff --git a/llvm/test/MC/RISCV/xsfmclic-invalid.s b/llvm/test/MC/RISCV/xsfmclic-invalid.s
index dc8cc0b6c3543e..863102439d8ebf 100644
--- a/llvm/test/MC/RISCV/xsfmclic-invalid.s
+++ b/llvm/test/MC/RISCV/xsfmclic-invalid.s
@@ -1,20 +1,18 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=-experimental-xsfmclic < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-FEATURE %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=-experimental-xsfmclic < %s
-# RUN: not llvm-mc -triple riscv64 -mattr=-experimental-xsfmclic < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-FEATURE %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=-experimental-xsfmclic < %s
csrrs t1, sf.mtvt, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.mtvt' requires 'experimental-xsfmclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.mtvt' requires 'experimental-xsfmclic' to be enabled}}
csrrs t1, sf.mnxti, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.mnxti' requires 'experimental-xsfmclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.mnxti' requires 'experimental-xsfmclic' to be enabled}}
csrrs t1, sf.mintstatus, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.mintstatus' requires 'experimental-xsfmclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.mintstatus' requires 'experimental-xsfmclic' to be enabled}}
csrrs t1, sf.mscratchcsw, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.mscratchcsw' requires 'experimental-xsfmclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.mscratchcsw' requires 'experimental-xsfmclic' to be enabled}}
csrrs t1, sf.mscratchcswl, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.mscratchcswl' requires 'experimental-xsfmclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.mscratchcswl' requires 'experimental-xsfmclic' to be enabled}}
diff --git a/llvm/test/MC/RISCV/xsfsclic-invalid.s b/llvm/test/MC/RISCV/xsfsclic-invalid.s
index c4acfdfb8dcff4..6d2c708e5d4283 100644
--- a/llvm/test/MC/RISCV/xsfsclic-invalid.s
+++ b/llvm/test/MC/RISCV/xsfsclic-invalid.s
@@ -1,20 +1,18 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=-experimental-xsfsclic < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-FEATURE %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=-experimental-xsfsclic < %s
-# RUN: not llvm-mc -triple riscv64 -mattr=-experimental-xsfsclic < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-FEATURE %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=-experimental-xsfsclic < %s
csrrs t1, sf.stvt, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.stvt' requires 'experimental-xsfsclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.stvt' requires 'experimental-xsfsclic' to be enabled}}
csrrs t1, sf.snxti, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.snxti' requires 'experimental-xsfsclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.snxti' requires 'experimental-xsfsclic' to be enabled}}
csrrs t1, sf.sintstatus, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.sintstatus' requires 'experimental-xsfsclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.sintstatus' requires 'experimental-xsfsclic' to be enabled}}
csrrs t1, sf.sscratchcsw, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.sscratchcsw' requires 'experimental-xsfsclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.sscratchcsw' requires 'experimental-xsfsclic' to be enabled}}
csrrs t1, sf.sscratchcswl, zero
-// CHECK-FEATURE: :[[@LINE-1]]:11: error: system register 'sf.sscratchcswl' requires 'experimental-xsfsclic' to be enabled
+// expected-error at -1:11 {{system register 'sf.sscratchcswl' requires 'experimental-xsfsclic' to be enabled}}
diff --git a/llvm/test/MC/RISCV/xsfvfexp.s b/llvm/test/MC/RISCV/xsfvfexp.s
index 36751a46892f4b..cc35fd0904e8b1 100644
--- a/llvm/test/MC/RISCV/xsfvfexp.s
+++ b/llvm/test/MC/RISCV/xsfvfexp.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+xsfvfexp32e %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+xsfvfexp32e %s \
# RUN: | llvm-objdump -d --mattr=+xsfvfexp32e - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -19,4 +18,4 @@
sf.vfexp.v v2, v5, v0.t
# CHECK-INST: sf.vfexp.v v2, v5, v0.t
# CHECK-ENCODING: [0x57,0x91,0x53,0x4c]
-# CHECK-ERROR: instruction requires the following: 'Xsfvfbfexp16e', 'Xsfvfexp16e', or 'Xsfvfexp32e' (SiFive Vector Floating-Point Exponential Function Instruction){{$}}
+# expected-error at -3 {{instruction requires the following: 'Xsfvfbfexp16e', 'Xsfvfexp16e', or 'Xsfvfexp32e' (SiFive Vector Floating-Point Exponential Function Instruction)}}
diff --git a/llvm/test/MC/RISCV/xsfvfexpa.s b/llvm/test/MC/RISCV/xsfvfexpa.s
index 1a3162f3fdc006..8a8ee7a3b72e84 100644
--- a/llvm/test/MC/RISCV/xsfvfexpa.s
+++ b/llvm/test/MC/RISCV/xsfvfexpa.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+xsfvfexpa %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+xsfvfexpa %s \
# RUN: | llvm-objdump -d --mattr=+xsfvfexpa - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -9,4 +8,4 @@
sf.vfexpa.v v2, v5, v0.t
# CHECK-INST: sf.vfexpa.v v2, v5, v0.t
# CHECK-ENCODING: [0x57,0x11,0x53,0x4c]
-# CHECK-ERROR: instruction requires the following: 'Xsfvfexpa' (SiFive Vector Floating-Point Exponential Approximation Instruction){{$}}
+# expected-error at -3 {{instruction requires the following: 'Xsfvfexpa' (SiFive Vector Floating-Point Exponential Approximation Instruction)}}
diff --git a/llvm/test/MC/RISCV/xsifive-invalid.s b/llvm/test/MC/RISCV/xsifive-invalid.s
index afb14242ed9c8b..cdd113152d2eac 100644
--- a/llvm/test/MC/RISCV/xsifive-invalid.s
+++ b/llvm/test/MC/RISCV/xsifive-invalid.s
@@ -1,20 +1,20 @@
-# RUN: not llvm-mc -triple riscv32 < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 < %s
+# RUN: llvm-mc --verify -triple riscv64 < %s
-sf.cflush.d.l1 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sf.cflush.d.l1 0x10 # expected-error:1 {{invalid instruction}}
-sf.cdiscard.d.l1 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sf.cdiscard.d.l1 0x10 # expected-error:1 {{invalid instruction}}
-sf.cflush.d.l1 x0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'XSiFivecflushdlone' (SiFive sf.cflush.d.l1 Instruction){{$}}
+sf.cflush.d.l1 x0 # expected-error:1 {{instruction requires the following: 'XSiFivecflushdlone' (SiFive sf.cflush.d.l1 Instruction)}}
-sf.cflush.d.l1 x7 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'XSiFivecflushdlone' (SiFive sf.cflush.d.l1 Instruction){{$}}
+sf.cflush.d.l1 x7 # expected-error:1 {{instruction requires the following: 'XSiFivecflushdlone' (SiFive sf.cflush.d.l1 Instruction)}}
-sf.cdiscard.d.l1 x0 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'XSiFivecdiscarddlone' (SiFive sf.cdiscard.d.l1 Instruction){{$}}
+sf.cdiscard.d.l1 x0 # expected-error:1 {{instruction requires the following: 'XSiFivecdiscarddlone' (SiFive sf.cdiscard.d.l1 Instruction)}}
-sf.cdiscard.d.l1 x7 # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'XSiFivecdiscarddlone' (SiFive sf.cdiscard.d.l1 Instruction){{$}}
+sf.cdiscard.d.l1 x7 # expected-error:1 {{instruction requires the following: 'XSiFivecdiscarddlone' (SiFive sf.cdiscard.d.l1 Instruction)}}
-sf.cease x1 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sf.cease x1 # expected-error:1 {{invalid instruction}}
-sf.cease 0x10 # CHECK: :[[@LINE]]:1: error: invalid instruction
+sf.cease 0x10 # expected-error:1 {{invalid instruction}}
-sf.cease # CHECK: :[[@LINE]]:1: error: instruction requires the following: 'XSfcease' (SiFive sf.cease Instruction){{$}}
+sf.cease # expected-error:1 {{instruction requires the following: 'XSfcease' (SiFive sf.cease Instruction)}}
diff --git a/llvm/test/MC/RISCV/xsmtvdot-invalid.s b/llvm/test/MC/RISCV/xsmtvdot-invalid.s
index 670a63d5a5bf20..30fbe5f63c81c4 100644
--- a/llvm/test/MC/RISCV/xsmtvdot-invalid.s
+++ b/llvm/test/MC/RISCV/xsmtvdot-invalid.s
@@ -1,37 +1,36 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+xsmtvdot < %s 2>&1 \
-# RUN: | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xsmtvdot < %s
# NoSlide
smt.vmadot v1, v2, v4
-// CHECK: :[[@LINE-1]]:14: error: invalid operand for instruction{{$}}
+// expected-error at -1:14 {{invalid operand for instruction}}
smt.vmadot v2, v2, v4
-// CHECK: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot v4, v2, v4
-// CHECK: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot v2, v3, v4
-// CHECK: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot v2, v4, v3
-// CHECK: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
# slide
smt.vmadot1 v1, v2, v2
-// CHECK: :[[@LINE-1]]:15: error: invalid operand for instruction
+// expected-error at -1:15 {{invalid operand for instruction}}
smt.vmadot1 v2, v5, v4
-// CHECK: :[[@LINE-1]]:19: error: invalid operand for instruction
+// expected-error at -1:19 {{invalid operand for instruction}}
smt.vmadot1 v2, v2, v4
-// CHECK: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot1 v2, v4, v2
-// CHECK: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot1 v0, v1, v2
-// CHECK: :[[@LINE-1]]:19: error: invalid operand for instruction
+// expected-error at -1:19 {{invalid operand for instruction}}
smt.vmadot1 v0, v2, v1
-// CHECK: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
diff --git a/llvm/test/MC/RISCV/xsmtvdotii-invalid.s b/llvm/test/MC/RISCV/xsmtvdotii-invalid.s
index 2ffebd5dab7a2b..8d2ef096fe678c 100644
--- a/llvm/test/MC/RISCV/xsmtvdotii-invalid.s
+++ b/llvm/test/MC/RISCV/xsmtvdotii-invalid.s
@@ -1,189 +1,188 @@
// NOTE: Assertions have been autogenerated by utils/update_mc_test_checks.py UTC_ARGS: --version 5
-# RUN: not llvm-mc -triple riscv64 -mattr=+xsmtvdotii < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-ERROR %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xsmtvdotii < %s
smt.vmadot v3, v2, v0, i4
-// CHECK-ERROR: :[[@LINE-1]]:12: error: invalid operand for instruction{{$}}
+// expected-error at -1:12 {{invalid operand for instruction}}
smt.vmadot v2, v2, v0, i4
-// CHECK-ERROR: :[[@LINE-1]]:12: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:12 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot v0, v2, v0, i4
-// CHECK-ERROR: :[[@LINE-1]]:12: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:12 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot v2, v3, v0, i4
-// CHECK-ERROR: :[[@LINE-1]]:12: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:12 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot v2, v4, v0, fp16
-// CHECK-ERROR: :[[@LINE-1]]:24: error: SpacemiT's Integer Matrix only supports [i4|i8] mode{{$}}
+// expected-error at -1:24 {{SpacemiT's Integer Matrix only supports [i4|i8] mode}}
smt.vmadot1 v3, v2, v4, i8
-// CHECK-ERROR: :[[@LINE-1]]:13: error: invalid operand for instruction{{$}}
+// expected-error at -1:13 {{invalid operand for instruction}}
smt.vmadot1 v0, v3, v4, i8
-// CHECK-ERROR: :[[@LINE-1]]:17: error: invalid operand for instruction{{$}}
+// expected-error at -1:17 {{invalid operand for instruction}}
smt.vmadot1 v2, v2, v4, i8
-// CHECK-ERROR: :[[@LINE-1]]:13: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:13 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot1 v4, v2, v4, i8
-// CHECK-ERROR: :[[@LINE-1]]:13: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:13 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot1 v0, v2, v4, i4
-// CHECK-ERROR: :[[@LINE-1]]:25: error: smt.vmadot with slide only supports i8 type{{$}}
+// expected-error at -1:25 {{smt.vmadot with slide only supports i8 type}}
smt.vmadot1 v0, v2, v4, fp16
-// CHECK-ERROR: :[[@LINE-1]]:25: error: SpacemiT's Integer Matrix only supports [i4|i8] mode{{$}}
+// expected-error at -1:25 {{SpacemiT's Integer Matrix only supports [i4|i8] mode}}
smt.vmadot.sp v3, v2, v8, v0, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: invalid operand for instruction{{$}}
+// expected-error at -1:15 {{invalid operand for instruction}}
smt.vmadot.sp v2, v3, v8, v0, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:19: error: invalid operand for instruction{{$}}
+// expected-error at -1:19 {{invalid operand for instruction}}
smt.vmadot.sp v2, v2, v8, v0, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot.sp v8, v2, v8, v0, 1, i4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot.sp v0, v2, v8, v0, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: register conflicts with vmask register v0{{$}}
+// expected-error at -1:15 {{register conflicts with vmask register v0}}
smt.vmadot.sp v2, v0, v8, v1, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:19: error: register conflicts with vmask register v1{{$}}
+// expected-error at -1:19 {{register conflicts with vmask register v1}}
smt.vmadot.sp v2, v4, v1, v1, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:23: error: register conflicts with vmask register v1{{$}}
+// expected-error at -1:23 {{register conflicts with vmask register v1}}
smt.vmadot.sp v2, v4, v8, v3, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:27: error: vmask operand only supports v0 or v1{{$}}
+// expected-error at -1:27 {{vmask operand only supports v0 or v1}}
smt.vmadot.sp v2, v4, v8, v1, 4, i4
-// CHECK-ERROR: :[[@LINE-1]]:31: error: immediate must be an integer in the range [0, 3]{{$}}
+// expected-error at -1:31 {{immediate must be an integer in the range [0, 3]}}
smt.vmadot.hp v2, v2, v8, v0, 4, i4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot.hp v8, v2, v8, v0, 5, i4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vmadot.hp v0, v4, v8, v0, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: register conflicts with vmask register v0{{$}}
+// expected-error at -1:15 {{register conflicts with vmask register v0}}
smt.vmadot.hp v2, v0, v8, v0, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:19: error: register conflicts with vmask register v0{{$}}
+// expected-error at -1:19 {{register conflicts with vmask register v0}}
smt.vmadot.hp v8, v2, v0, v0, 5, i4
-// CHECK-ERROR: :[[@LINE-1]]:23: error: register conflicts with vmask register v0{{$}}
+// expected-error at -1:23 {{register conflicts with vmask register v0}}
smt.vmadot.hp v2, v4, v8, v2, 3, i4
-// CHECK-ERROR: :[[@LINE-1]]:27: error: vmask operand only supports v0 or v1{{$}}
+// expected-error at -1:27 {{vmask operand only supports v0 or v1}}
smt.vmadot.hp v2, v4, v8, v0, 8, i4
-// CHECK-ERROR: :[[@LINE-1]]:31: error: immediate must be an integer in the range [0, 7]{{$}}
+// expected-error at -1:31 {{immediate must be an integer in the range [0, 7]}}
smt.vfwmadot v3, v4, v2
-// CHECK-ERROR: :[[@LINE-1]]:14: error: invalid operand for instruction{{$}}
+// expected-error at -1:14 {{invalid operand for instruction}}
smt.vfwmadot v4, v4, v2
-// CHECK-ERROR: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vfwmadot v2, v4, v2
-// CHECK-ERROR: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vfwmadot v2, v3, v4
-// CHECK-ERROR: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vfwmadot v2, v4, v3
-// CHECK-ERROR: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vfwmadot v4, v2, v3, i8
-// CHECK-ERROR: :[[@LINE-1]]:26: error: unexpected extra operand for instruction{{$}}
+// expected-error at -1:26 {{unexpected extra operand for instruction}}
smt.vfwmadot1 v3, v2, v4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: invalid operand for instruction{{$}}
+// expected-error at -1:15 {{invalid operand for instruction}}
smt.vfwmadot1 v2, v3, v4
-// CHECK-ERROR: :[[@LINE-1]]:19: error: invalid operand for instruction{{$}}
+// expected-error at -1:19 {{invalid operand for instruction}}
smt.vfwmadot1 v2, v2, v4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vfwmadot1 v4, v2, v4
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vfwmadot1 v2, v3, v4
-// CHECK-ERROR: :[[@LINE-1]]:19: error: invalid operand for instruction{{$}}
+// expected-error at -1:19 {{invalid operand for instruction}}
smt.vfwmadot1 v2, v4, v3
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vfwmadot1 v0, v2, v4, i8
-// CHECK-ERROR: :[[@LINE-1]]:27: error: unexpected extra operand for instruction{{$}}
+// expected-error at -1:27 {{unexpected extra operand for instruction}}
smt.vnpack.vv v3, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnpack.vv v5, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnpack.vv v1, v3, v5, 4
-// CHECK-ERROR: :[[@LINE-1]]:27: error: immediate must be an integer in the range [0, 3]{{$}}
+// expected-error at -1:27 {{immediate must be an integer in the range [0, 3]}}
smt.vnspack.vv v3, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:16: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:16 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnspack.vv v5, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:16: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:16 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnspack.vv v1, v3, v5, 4
-// CHECK-ERROR: :[[@LINE-1]]:28: error: immediate must be an integer in the range [0, 3]{{$}}
+// expected-error at -1:28 {{immediate must be an integer in the range [0, 3]}}
smt.vnpack4.vv v3, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:16: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:16 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnpack4.vv v5, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:16: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:16 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnpack4.vv v1, v3, v5, 4
-// CHECK-ERROR: :[[@LINE-1]]:28: error: immediate must be an integer in the range [0, 3]{{$}}
+// expected-error at -1:28 {{immediate must be an integer in the range [0, 3]}}
smt.vnspack4.vv v3, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:17: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:17 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnspack4.vv v5, v3, v5, 1
-// CHECK-ERROR: :[[@LINE-1]]:17: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:17 {{the destination vector register group cannot overlap the source vector register group}}
smt.vnspack4.vv v1, v3, v5, 4
-// CHECK-ERROR: :[[@LINE-1]]:29: error: immediate must be an integer in the range [0, 3]{{$}}
+// expected-error at -1:29 {{immediate must be an integer in the range [0, 3]}}
smt.vpack.vv v3, v2, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:14: error: invalid operand for instruction{{$}}
+// expected-error at -1:14 {{invalid operand for instruction}}
smt.vpack.vv v2, v2, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vpack.vv v4, v2, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vpack.vv v0, v1, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:14: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:14 {{the destination vector register group cannot overlap the source vector register group}}
smt.vpack.vv v0, v2, v4, 4
-// CHECK-ERROR: :[[@LINE-1]]:26: error: immediate must be an integer in the range [0, 3]{{$}}
+// expected-error at -1:26 {{immediate must be an integer in the range [0, 3]}}
smt.vupack.vv v3, v2, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:15: error: invalid operand for instruction{{$}}
+// expected-error at -1:15 {{invalid operand for instruction}}
smt.vupack.vv v2, v2, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vupack.vv v4, v2, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vupack.vv v0, v1, v4, 1
-// CHECK-ERROR: :[[@LINE-1]]:15: error: the destination vector register group cannot overlap the source vector register group{{$}}
+// expected-error at -1:15 {{the destination vector register group cannot overlap the source vector register group}}
smt.vupack.vv v0, v2, v4, 4
-// CHECK-ERROR: :[[@LINE-1]]:27: error: immediate must be an integer in the range [0, 3]{{$}}
+// expected-error at -1:27 {{immediate must be an integer in the range [0, 3]}}
diff --git a/llvm/test/MC/RISCV/xtheadcmo-invalid.s b/llvm/test/MC/RISCV/xtheadcmo-invalid.s
index ec6a935c814a93..9a3ec8694c0889 100644
--- a/llvm/test/MC/RISCV/xtheadcmo-invalid.s
+++ b/llvm/test/MC/RISCV/xtheadcmo-invalid.s
@@ -1,25 +1,25 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadcmo < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadcmo < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadcmo < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xtheadcmo < %s
-th.dcache.csw # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.isw # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.cisw # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.cval1 # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.cva # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.iva # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.civa # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.cpal1 # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.cpa # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.ipa # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.dcache.cipa # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.icache.iva # CHECK: :[[@LINE]]:1: error: too few operands for instruction
-th.icache.ipa # CHECK: :[[@LINE]]:1: error: too few operands for instruction
+th.dcache.csw # expected-error:1 {{too few operands for instruction}}
+th.dcache.isw # expected-error:1 {{too few operands for instruction}}
+th.dcache.cisw # expected-error:1 {{too few operands for instruction}}
+th.dcache.cval1 # expected-error:1 {{too few operands for instruction}}
+th.dcache.cva # expected-error:1 {{too few operands for instruction}}
+th.dcache.iva # expected-error:1 {{too few operands for instruction}}
+th.dcache.civa # expected-error:1 {{too few operands for instruction}}
+th.dcache.cpal1 # expected-error:1 {{too few operands for instruction}}
+th.dcache.cpa # expected-error:1 {{too few operands for instruction}}
+th.dcache.ipa # expected-error:1 {{too few operands for instruction}}
+th.dcache.cipa # expected-error:1 {{too few operands for instruction}}
+th.icache.iva # expected-error:1 {{too few operands for instruction}}
+th.icache.ipa # expected-error:1 {{too few operands for instruction}}
-th.dcache.call t0 # CHECK: :[[@LINE]]:16: error: unexpected extra operand for instruction
-th.dcache.iall t0 # CHECK: :[[@LINE]]:16: error: unexpected extra operand for instruction
-th.dcache.ciall t0 # CHECK: :[[@LINE]]:17: error: unexpected extra operand for instruction
-th.icache.iall t0 # CHECK: :[[@LINE]]:16: error: unexpected extra operand for instruction
-th.icache.ialls t0 # CHECK: :[[@LINE]]:17: error: unexpected extra operand for instruction
-th.l2cache.call t0 # CHECK: :[[@LINE]]:17: error: unexpected extra operand for instruction
-th.l2cache.iall t0 # CHECK: :[[@LINE]]:17: error: unexpected extra operand for instruction
-th.l2cache.ciall t0 # CHECK: :[[@LINE]]:18: error: unexpected extra operand for instruction
+th.dcache.call t0 # expected-error:16 {{unexpected extra operand for instruction}}
+th.dcache.iall t0 # expected-error:16 {{unexpected extra operand for instruction}}
+th.dcache.ciall t0 # expected-error:17 {{unexpected extra operand for instruction}}
+th.icache.iall t0 # expected-error:16 {{unexpected extra operand for instruction}}
+th.icache.ialls t0 # expected-error:17 {{unexpected extra operand for instruction}}
+th.l2cache.call t0 # expected-error:17 {{unexpected extra operand for instruction}}
+th.l2cache.iall t0 # expected-error:17 {{unexpected extra operand for instruction}}
+th.l2cache.ciall t0 # expected-error:18 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/xtheadcondmov-invalid.s b/llvm/test/MC/RISCV/xtheadcondmov-invalid.s
index 9bae4026747c6a..91a05ed4991bc2 100644
--- a/llvm/test/MC/RISCV/xtheadcondmov-invalid.s
+++ b/llvm/test/MC/RISCV/xtheadcondmov-invalid.s
@@ -1,9 +1,9 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadcondmov < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadcondmov < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadcondmov < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xtheadcondmov < %s
-th.mveqz a0,a1 # CHECK: :[[@LINE]]:15: error: too few operands for instruction
-th.mveqz a0,a1,a2,a3 # CHECK: :[[@LINE]]:19: error: unexpected extra operand for instruction
-th.mveqz a0,a1,1 # CHECK: :[[@LINE]]:16: error: register must be a GPR
-th.mvnez a0,a1 # CHECK: :[[@LINE]]:15: error: too few operands for instruction
-th.mvnez a0,a1,a2,a3 # CHECK: :[[@LINE]]:19: error: unexpected extra operand for instruction
-th.mvnez a0,a1,1 # CHECK: :[[@LINE]]:16: error: register must be a GPR
+th.mveqz a0,a1 # expected-error:15 {{too few operands for instruction}}
+th.mveqz a0,a1,a2,a3 # expected-error:19 {{unexpected extra operand for instruction}}
+th.mveqz a0,a1,1 # expected-error:16 {{register must be a GPR}}
+th.mvnez a0,a1 # expected-error:15 {{too few operands for instruction}}
+th.mvnez a0,a1,a2,a3 # expected-error:19 {{unexpected extra operand for instruction}}
+th.mvnez a0,a1,1 # expected-error:16 {{register must be a GPR}}
diff --git a/llvm/test/MC/RISCV/xtheadmac-invalid.s b/llvm/test/MC/RISCV/xtheadmac-invalid.s
index f1cd7c7d91e180..d9e4589ec164e3 100644
--- a/llvm/test/MC/RISCV/xtheadmac-invalid.s
+++ b/llvm/test/MC/RISCV/xtheadmac-invalid.s
@@ -1,15 +1,15 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadmac < %s 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-RV32 %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadmac < %s 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-RV64 %s
+# RUN: llvm-mc --verify=expected,rv32 -triple riscv32 -mattr=+xtheadmac < %s
+# RUN: llvm-mc --verify=expected,rv64 -triple riscv64 -mattr=+xtheadmac < %s
th.mula t0, t1, 0(t2)
-# CHECK: :[[@LINE-1]]:18: error: register must be a GPR
+# expected-error at -1:18 {{register must be a GPR}}
th.muls t0, 12, t2
-# CHECK: :[[@LINE-1]]:14: error: register must be a GPR
+# expected-error at -1:14 {{register must be a GPR}}
th.mulsh t0, t1, 34
-# CHECK: :[[@LINE-1]]:18: error: register must be a GPR
+# expected-error at -1:18 {{register must be a GPR}}
th.mulsw t0, -56, t2
-# CHECK-RV64: :[[@LINE-1]]:14: error: register must be a GPR
-# CHECK-RV32: :[[@LINE-2]]:1: error: invalid instruction
+# rv64-error at -1:14 {{register must be a GPR}}
+# rv32-error at -2:1 {{invalid instruction}}
diff --git a/llvm/test/MC/RISCV/xtheadsync-invalid.s b/llvm/test/MC/RISCV/xtheadsync-invalid.s
index a962aebb40ef64..0dc3b73e691c07 100644
--- a/llvm/test/MC/RISCV/xtheadsync-invalid.s
+++ b/llvm/test/MC/RISCV/xtheadsync-invalid.s
@@ -1,8 +1,8 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xtheadsync < %s 2>&1 | FileCheck %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+xtheadsync < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xtheadsync < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+xtheadsync < %s
-th.sfence.vmas t0 # CHECK: :[[@LINE]]:18: error: too few operands for instruction
-th.sync t0 # CHECK: :[[@LINE]]:9: error: unexpected extra operand for instruction
-th.sync.s t0 # CHECK: :[[@LINE]]:11: error: unexpected extra operand for instruction
-th.sync.i t0 # CHECK: :[[@LINE]]:11: error: unexpected extra operand for instruction
-th.sync.is t0 # CHECK: :[[@LINE]]:12: error: unexpected extra operand for instruction
+th.sfence.vmas t0 # expected-error:18 {{too few operands for instruction}}
+th.sync t0 # expected-error:9 {{unexpected extra operand for instruction}}
+th.sync.s t0 # expected-error:11 {{unexpected extra operand for instruction}}
+th.sync.i t0 # expected-error:11 {{unexpected extra operand for instruction}}
+th.sync.is t0 # expected-error:12 {{unexpected extra operand for instruction}}
diff --git a/llvm/test/MC/RISCV/zfa-double-invalid.s b/llvm/test/MC/RISCV/zfa-double-invalid.s
index f28bd5cd0b9765..c2b6973df03e19 100644
--- a/llvm/test/MC/RISCV/zfa-double-invalid.s
+++ b/llvm/test/MC/RISCV/zfa-double-invalid.s
@@ -1,45 +1,41 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfa,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXTD %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfa,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXTD %s
-
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfa,+zfh -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zfa,+zfh -M no-aliases -show-encoding < %s
+
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fminm.d fa0, fa1, fa2
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fmaxm.d fs3, fs4, fs5
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fround.d fs1, fs2
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fround.d fs1, fs2, dyn
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fround.d fs1, fs2, rtz
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fround.d fs1, fs2, rne
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
froundnx.d fs1, fs2
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
froundnx.d fs1, fs2, dyn
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
froundnx.d fs1, fs2, rtz
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
froundnx.d fs1, fs2, rne
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fcvtmod.w.d a1, ft1, rtz
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fltq.d a1, fs1, fs2
-# CHECK-NO-EXTD: error: instruction requires the following: 'D' (Double-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'D' (Double-Precision Floating-Point)}}
fleq.d a1, ft1, ft2
diff --git a/llvm/test/MC/RISCV/zfa-half-invalid.s b/llvm/test/MC/RISCV/zfa-half-invalid.s
index debaf717d0905b..ec1371347b7dfc 100644
--- a/llvm/test/MC/RISCV/zfa-half-invalid.s
+++ b/llvm/test/MC/RISCV/zfa-half-invalid.s
@@ -1,42 +1,38 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfa,+d \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXTZFH %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfa,+d \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXTZFH %s
-
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfa,+d -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zfa,+d -M no-aliases -show-encoding < %s
+
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fminm.h fa0, fa1, fa2
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fmaxm.h fs3, fs4, fs5
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fround.h fs1, fs2
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fround.h fs1, fs2, dyn
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fround.h fs1, fs2, rtz
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fround.h fs1, fs2, rne
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
froundnx.h fs1, fs2
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
froundnx.h fs1, fs2, dyn
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
froundnx.h fs1, fs2, rtz
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
froundnx.h fs1, fs2, rne
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fltq.h a1, fs1, fs2
-# CHECK-NO-EXTZFH: error: instruction requires the following: 'Zfh' (Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfh' (Half-Precision Floating-Point)}}
fleq.h a1, ft1, ft2
diff --git a/llvm/test/MC/RISCV/zfa-invalid.s b/llvm/test/MC/RISCV/zfa-invalid.s
index cedc9279db3cb2..0b4b3f7a65c23d 100644
--- a/llvm/test/MC/RISCV/zfa-invalid.s
+++ b/llvm/test/MC/RISCV/zfa-invalid.s
@@ -1,87 +1,87 @@
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfa,+q,+zfh < %s 2>&1 | FileCheck -check-prefixes=CHECK-NO-RV32 %s
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfa,+q,+zfh < %s 2>&1 | FileCheck -check-prefixes=CHECK-NO-RV64 %s
+# RUN: llvm-mc --verify=no-rv32 -triple riscv64 -mattr=+zfa,+q,+zfh < %s
+# RUN: llvm-mc --verify=no-rv64 -triple riscv32 -mattr=+zfa,+q,+zfh < %s
# Invalid rounding modes
-# CHECK-NO-RV64: error: operand must be 'rtz' floating-point rounding mode
-# CHECK-NO-RV32: error: operand must be 'rtz' floating-point rounding mode
+# no-rv64-error at +2 {{operand must be 'rtz' floating-point rounding mode}}
+# no-rv32-error at +1 {{operand must be 'rtz' floating-point rounding mode}}
fcvtmod.w.d a1, ft1, rne
-# CHECK-NO-RV64: error: operand must be 'rtz' floating-point rounding mode
-# CHECK-NO-RV32: error: operand must be 'rtz' floating-point rounding mode
+# no-rv64-error at +2 {{operand must be 'rtz' floating-point rounding mode}}
+# no-rv32-error at +1 {{operand must be 'rtz' floating-point rounding mode}}
fcvtmod.w.d a1, ft1, dyn
-# CHECK-NO-RV64: error: operand must be 'rtz' floating-point rounding mode
-# CHECK-NO-RV32: error: operand must be 'rtz' floating-point rounding mode
+# no-rv64-error at +2 {{operand must be 'rtz' floating-point rounding mode}}
+# no-rv32-error at +1 {{operand must be 'rtz' floating-point rounding mode}}
fcvtmod.w.d a1, ft1, rmm
-# CHECK-NO-RV64: error: operand must be 'rtz' floating-point rounding mode
-# CHECK-NO-RV32: error: operand must be 'rtz' floating-point rounding mode
+# no-rv64-error at +2 {{operand must be 'rtz' floating-point rounding mode}}
+# no-rv32-error at +1 {{operand must be 'rtz' floating-point rounding mode}}
fcvtmod.w.d a1, ft1, rdn
-# CHECK-NO-RV64: error: operand must be 'rtz' floating-point rounding mode
-# CHECK-NO-RV32: error: operand must be 'rtz' floating-point rounding mode
+# no-rv64-error at +2 {{operand must be 'rtz' floating-point rounding mode}}
+# no-rv32-error at +1 {{operand must be 'rtz' floating-point rounding mode}}
fcvtmod.w.d a1, ft1, rup
# Invalid floating-point immediate
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.s ft1, 5.250000e-01
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.d ft1, 3.560000e+02
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.h ft1, 1.600000e+00
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.q ft1, 2.250000e+00
-# CHECK-NO-RV64: error: invalid floating point immediate
-# CHECK-NO-RV32: error: invalid floating point immediate
+# no-rv64-error at +2 {{invalid floating point immediate}}
+# no-rv32-error at +1 {{invalid floating point immediate}}
fli.s ft1, -min
-# CHECK-NO-RV64: error: invalid floating point immediate
-# CHECK-NO-RV32: error: invalid floating point immediate
+# no-rv64-error at +2 {{invalid floating point immediate}}
+# no-rv32-error at +1 {{invalid floating point immediate}}
fli.s ft1, -inf
-# CHECK-NO-RV64: error: invalid floating point immediate
-# CHECK-NO-RV32: error: invalid floating point immediate
+# no-rv64-error at +2 {{invalid floating point immediate}}
+# no-rv32-error at +1 {{invalid floating point immediate}}
fli.s ft1, -nan
# Don't accept decimal minimum.
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.s ft1, 1.1754943508222875079687365372222456778186655567720875215087517062784172594547271728515625e-38
# Don't accept decimal minimum.
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.d ft1, 2.225073858507201383090232717332404064219215980462331830553327416887204434813918195854283159012511020564067339731035811005152434161553460108856012385377718821130777993532002330479610147442583636071921565046942503734208375250806650616658158948720491179968591639648500635908770118304874799780887753749949451580451605050915399856582470818645113537935804992115981085766051992433352114352390148795699609591288891602992641511063466313393663477586513029371762047325631781485664350872122828637642044846811407613911477062801689853244110024161447421618567166150540154285084716752901903161322778896729707373123334086988983175067838846926092773977972858659654941091369095406136467568702398678315290680984617210924625396728515625e-308
# Don't accept decimal minimum.
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.h ft1, 6.103516e-05
# Don't accept single precision minimum for double.
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.d ft1, 1.1754943508222875079687365372222456778186655567720875215087517062784172594547271728515625e-38
# Don't accept single precision minimum for half.
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.h ft1, 1.1754943508222875079687365372222456778186655567720875215087517062784172594547271728515625e-38
# Don't accept single precision minimum for quad.
-# CHECK-NO-RV64: error: operand must be a valid floating-point constant
-# CHECK-NO-RV32: error: operand must be a valid floating-point constant
+# no-rv64-error at +2 {{operand must be a valid floating-point constant}}
+# no-rv32-error at +1 {{operand must be a valid floating-point constant}}
fli.q ft1, 1.1754943508222875079687365372222456778186655567720875215087517062784172594547271728515625e-38
# Don't accept integers.
-# CHECK-NO-RV32: error: invalid floating point immediate
-# CHECK-NO-RV64: error: invalid floating point immediate
+# no-rv32-error at +2 {{invalid floating point immediate}}
+# no-rv64-error at +1 {{invalid floating point immediate}}
fli.s ft1, 1
diff --git a/llvm/test/MC/RISCV/zfa-quad-invalid.s b/llvm/test/MC/RISCV/zfa-quad-invalid.s
index 3ca89c6ebe6271..84b2a5e4a4984f 100644
--- a/llvm/test/MC/RISCV/zfa-quad-invalid.s
+++ b/llvm/test/MC/RISCV/zfa-quad-invalid.s
@@ -1,42 +1,38 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+zfa,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXTQ %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+zfa,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXTQ %s
-
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+zfa,+zfh -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+zfa,+zfh -M no-aliases -show-encoding < %s
+
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fminm.q fa0, fa1, fa2
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fmaxm.q fs3, fs4, fs5
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fround.q fs1, fs2
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fround.q fs1, fs2, dyn
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fround.q fs1, fs2, rtz
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fround.q fs1, fs2, rne
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
froundnx.q fs1, fs2
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
froundnx.q fs1, fs2, dyn
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
froundnx.q fs1, fs2, rtz
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
froundnx.q fs1, fs2, rne
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fltq.q a1, fs1, fs2
-# CHECK-NO-EXTQ: error: instruction requires the following: 'Q' (Quad-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Q' (Quad-Precision Floating-Point)}}
fleq.q a1, ft1, ft2
diff --git a/llvm/test/MC/RISCV/zfa-valid.s b/llvm/test/MC/RISCV/zfa-valid.s
index edf830642c263f..0480643b0ff718 100644
--- a/llvm/test/MC/RISCV/zfa-valid.s
+++ b/llvm/test/MC/RISCV/zfa-valid.s
@@ -9,1516 +9,1512 @@
# RUN: | llvm-objdump --mattr=+zfa,+q,+zfh -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -mattr=+q,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+q,+zfh \
-# RUN: -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+q,+zfh -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+q,+zfh -M no-aliases -show-encoding < %s
# CHECK-ASM-AND-OBJ: fli.s ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, -1.000000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, -0x1p+0
# CHECK-ASM-AND-OBJ: fli.s ft1, min
# CHECK-ASM: encoding: [0xd3,0x80,0x10,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, min
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.52587890625e-05
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-16
# CHECK-ASM-AND-OBJ: fli.s ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 3.0517578125e-05
# CHECK-ASM-AND-OBJ: fli.s ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-15
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 3.906250e-03
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-8
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 7.812500e-03
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-7
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 6.250000e-02
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-4
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.250000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-3
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 2.500000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-2
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 3.125000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.4p-2
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 3.750000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.8p-2
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 4.375000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.cp-2
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 5.000000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p-1
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 6.250000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.4p-1
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 7.500000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.8p-1
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 8.750000e-01
# CHECK-ASM-AND-OBJ: fli.s ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.cp-1
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.000000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+0
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.250000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.4p+0
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.500000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.8p+0
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.750000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.cp+0
# CHECK-ASM-AND-OBJ: fli.s ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 2.000000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+1
# CHECK-ASM-AND-OBJ: fli.s ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 2.500000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.4p+1
# CHECK-ASM-AND-OBJ: fli.s ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 3.000000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1.8p+1
# CHECK-ASM-AND-OBJ: fli.s ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 4.000000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+2
# CHECK-ASM-AND-OBJ: fli.s ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 8.000000e+00
# CHECK-ASM-AND-OBJ: fli.s ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+3
# CHECK-ASM-AND-OBJ: fli.s ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.600000e+01
# CHECK-ASM-AND-OBJ: fli.s ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+4
# CHECK-ASM-AND-OBJ: fli.s ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 1.280000e+02
# CHECK-ASM-AND-OBJ: fli.s ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+7
# CHECK-ASM-AND-OBJ: fli.s ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 2.560000e+02
# CHECK-ASM-AND-OBJ: fli.s ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+8
# CHECK-ASM-AND-OBJ: fli.s ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 3.276800e+04
# CHECK-ASM-AND-OBJ: fli.s ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+15
# CHECK-ASM-AND-OBJ: fli.s ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 6.553600e+04
# CHECK-ASM-AND-OBJ: fli.s ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, 0x1p+16
# CHECK-ASM-AND-OBJ: fli.s ft1, inf
# CHECK-ASM: encoding: [0xd3,0x00,0x1f,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, INF
# CHECK-ASM-AND-OBJ: fli.s ft1, nan
# CHECK-ASM: encoding: [0xd3,0x80,0x1f,0xf0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.s ft1, nan
# CHECK-ASM-AND-OBJ: fli.d ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, -1.000000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, -0x1p+0
# CHECK-ASM-AND-OBJ: fli.d ft1, min
# CHECK-ASM: encoding: [0xd3,0x80,0x10,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, min
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.52587890625e-05
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-16
# CHECK-ASM-AND-OBJ: fli.d ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 3.0517578125e-05
# CHECK-ASM-AND-OBJ: fli.d ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-15
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 3.906250e-03
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-8
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 7.812500e-03
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-7
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 6.250000e-02
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-4
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.250000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-3
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 2.500000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-2
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 3.125000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.4p-2
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 3.750000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.8p-2
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 4.375000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.cp-2
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 5.000000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p-1
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 6.250000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.4p-1
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 7.500000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.8p-1
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 8.750000e-01
# CHECK-ASM-AND-OBJ: fli.d ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.cp-1
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.000000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+0
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.250000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.4p+0
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.500000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.8p+0
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.750000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.cp+0
# CHECK-ASM-AND-OBJ: fli.d ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 2.000000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+1
# CHECK-ASM-AND-OBJ: fli.d ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 2.500000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.4p+1
# CHECK-ASM-AND-OBJ: fli.d ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 3.000000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1.8p+1
# CHECK-ASM-AND-OBJ: fli.d ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 4.000000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+2
# CHECK-ASM-AND-OBJ: fli.d ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 8.000000e+00
# CHECK-ASM-AND-OBJ: fli.d ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+3
# CHECK-ASM-AND-OBJ: fli.d ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.600000e+01
# CHECK-ASM-AND-OBJ: fli.d ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+4
# CHECK-ASM-AND-OBJ: fli.d ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 1.280000e+02
# CHECK-ASM-AND-OBJ: fli.d ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+7
# CHECK-ASM-AND-OBJ: fli.d ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 2.560000e+02
# CHECK-ASM-AND-OBJ: fli.d ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+8
# CHECK-ASM-AND-OBJ: fli.d ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 3.276800e+04
# CHECK-ASM-AND-OBJ: fli.d ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+15
# CHECK-ASM-AND-OBJ: fli.d ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 6.553600e+04
# CHECK-ASM-AND-OBJ: fli.d ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, 0x1p+16
# CHECK-ASM-AND-OBJ: fli.d ft1, inf
# CHECK-ASM: encoding: [0xd3,0x00,0x1f,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, INF
# CHECK-ASM-AND-OBJ: fli.d ft1, nan
# CHECK-ASM: encoding: [0xd3,0x80,0x1f,0xf2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.d ft1, nan
# CHECK-ASM-AND-OBJ: fli.h ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, -1.000000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, -0x1p+0
# CHECK-ASM-AND-OBJ: fli.h ft1, min
# CHECK-ASM: encoding: [0xd3,0x80,0x10,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, min
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.52587890625e-05
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-16
# CHECK-ASM-AND-OBJ: fli.h ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 3.0517578125e-05
# CHECK-ASM-AND-OBJ: fli.h ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-15
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 3.906250e-03
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-8
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 7.812500e-03
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-7
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 6.250000e-02
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-4
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.250000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-3
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 2.500000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-2
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 3.125000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.4p-2
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 3.750000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.8p-2
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 4.375000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.cp-2
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 5.000000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p-1
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 6.250000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.4p-1
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 7.500000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.8p-1
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 8.750000e-01
# CHECK-ASM-AND-OBJ: fli.h ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.cp-1
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.000000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+0
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.250000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.4p+0
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.500000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.8p+0
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.750000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.cp+0
# CHECK-ASM-AND-OBJ: fli.h ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 2.000000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+1
# CHECK-ASM-AND-OBJ: fli.h ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 2.500000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.4p+1
# CHECK-ASM-AND-OBJ: fli.h ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 3.000000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1.8p+1
# CHECK-ASM-AND-OBJ: fli.h ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 4.000000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+2
# CHECK-ASM-AND-OBJ: fli.h ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 8.000000e+00
# CHECK-ASM-AND-OBJ: fli.h ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+3
# CHECK-ASM-AND-OBJ: fli.h ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.600000e+01
# CHECK-ASM-AND-OBJ: fli.h ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+4
# CHECK-ASM-AND-OBJ: fli.h ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 1.280000e+02
# CHECK-ASM-AND-OBJ: fli.h ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+7
# CHECK-ASM-AND-OBJ: fli.h ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 2.560000e+02
# CHECK-ASM-AND-OBJ: fli.h ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+8
# CHECK-ASM-AND-OBJ: fli.h ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 3.276800e+04
# CHECK-ASM-AND-OBJ: fli.h ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+15
# CHECK-ASM-AND-OBJ: fli.h ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 6.553600e+04
# CHECK-ASM-AND-OBJ: fli.h ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, 0x1p+16
# CHECK-ASM-AND-OBJ: fli.h ft1, inf
# CHECK-ASM: encoding: [0xd3,0x00,0x1f,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, INF
# CHECK-ASM-AND-OBJ: fli.h ft1, nan
# CHECK-ASM: encoding: [0xd3,0x80,0x1f,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.h ft1, nan
# CHECK-ASM-AND-OBJ: fli.q ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, -1.000000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, -0x1p+0
# CHECK-ASM-AND-OBJ: fli.q ft1, min
# CHECK-ASM: encoding: [0xd3,0x80,0x10,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, min
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.52587890625e-05
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.52587890625e-05
# CHECK-ASM: encoding: [0xd3,0x00,0x11,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-16
# CHECK-ASM-AND-OBJ: fli.q ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 3.0517578125e-05
# CHECK-ASM-AND-OBJ: fli.q ft1, 3.0517578125e-05
# CHECK-ASM: encoding: [0xd3,0x80,0x11,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-15
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 3.906250e-03
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.00390625
# CHECK-ASM: encoding: [0xd3,0x00,0x12,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-8
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 7.812500e-03
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.0078125
# CHECK-ASM: encoding: [0xd3,0x80,0x12,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-7
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 6.250000e-02
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.0625
# CHECK-ASM: encoding: [0xd3,0x00,0x13,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-4
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.250000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.125
# CHECK-ASM: encoding: [0xd3,0x80,0x13,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-3
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 2.500000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.25
# CHECK-ASM: encoding: [0xd3,0x00,0x14,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-2
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 3.125000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.3125
# CHECK-ASM: encoding: [0xd3,0x80,0x14,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.4p-2
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 3.750000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.375
# CHECK-ASM: encoding: [0xd3,0x00,0x15,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.8p-2
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 4.375000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.4375
# CHECK-ASM: encoding: [0xd3,0x80,0x15,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.cp-2
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 5.000000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.5
# CHECK-ASM: encoding: [0xd3,0x00,0x16,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p-1
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 6.250000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.625
# CHECK-ASM: encoding: [0xd3,0x80,0x16,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.4p-1
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 7.500000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.75
# CHECK-ASM: encoding: [0xd3,0x00,0x17,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.8p-1
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 8.750000e-01
# CHECK-ASM-AND-OBJ: fli.q ft1, 0.875
# CHECK-ASM: encoding: [0xd3,0x80,0x17,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.cp-1
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.000000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x18,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+0
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.250000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.25
# CHECK-ASM: encoding: [0xd3,0x80,0x18,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.4p+0
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.500000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.5
# CHECK-ASM: encoding: [0xd3,0x00,0x19,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.8p+0
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.750000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 1.75
# CHECK-ASM: encoding: [0xd3,0x80,0x19,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.cp+0
# CHECK-ASM-AND-OBJ: fli.q ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 2.000000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 2.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1a,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+1
# CHECK-ASM-AND-OBJ: fli.q ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 2.500000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 2.5
# CHECK-ASM: encoding: [0xd3,0x80,0x1a,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.4p+1
# CHECK-ASM-AND-OBJ: fli.q ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 3.000000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 3.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1b,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1.8p+1
# CHECK-ASM-AND-OBJ: fli.q ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 4.000000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 4.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1b,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+2
# CHECK-ASM-AND-OBJ: fli.q ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 8.000000e+00
# CHECK-ASM-AND-OBJ: fli.q ft1, 8.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1c,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+3
# CHECK-ASM-AND-OBJ: fli.q ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.600000e+01
# CHECK-ASM-AND-OBJ: fli.q ft1, 16.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1c,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+4
# CHECK-ASM-AND-OBJ: fli.q ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 1.280000e+02
# CHECK-ASM-AND-OBJ: fli.q ft1, 128.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1d,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+7
# CHECK-ASM-AND-OBJ: fli.q ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 2.560000e+02
# CHECK-ASM-AND-OBJ: fli.q ft1, 256.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1d,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+8
# CHECK-ASM-AND-OBJ: fli.q ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 3.276800e+04
# CHECK-ASM-AND-OBJ: fli.q ft1, 32768.0
# CHECK-ASM: encoding: [0xd3,0x00,0x1e,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+15
# CHECK-ASM-AND-OBJ: fli.q ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 6.553600e+04
# CHECK-ASM-AND-OBJ: fli.q ft1, 65536.0
# CHECK-ASM: encoding: [0xd3,0x80,0x1e,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, 0x1p+16
# CHECK-ASM-AND-OBJ: fli.q ft1, inf
# CHECK-ASM: encoding: [0xd3,0x00,0x1f,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, INF
# CHECK-ASM-AND-OBJ: fli.q ft1, nan
# CHECK-ASM: encoding: [0xd3,0x80,0x1f,0xf6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fli.q ft1, nan
# CHECK-ASM-AND-OBJ: fminm.s fa0, fa1, fa2
# CHECK-ASM: encoding: [0x53,0xa5,0xc5,0x28]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fminm.s fa0, fa1, fa2
# CHECK-ASM-AND-OBJ: fmaxm.s fs3, fs4, fs5
# CHECK-ASM: encoding: [0xd3,0x39,0x5a,0x29]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmaxm.s fs3, fs4, fs5
# CHECK-ASM-AND-OBJ: fminm.d fa0, fa1, fa2
# CHECK-ASM: encoding: [0x53,0xa5,0xc5,0x2a]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fminm.d fa0, fa1, fa2
# CHECK-ASM-AND-OBJ: fmaxm.d fs3, fs4, fs5
# CHECK-ASM: encoding: [0xd3,0x39,0x5a,0x2b]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmaxm.d fs3, fs4, fs5
# CHECK-ASM-AND-OBJ: fminm.h fa0, fa1, fa2
# CHECK-ASM: encoding: [0x53,0xa5,0xc5,0x2c]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fminm.h fa0, fa1, fa2
# CHECK-ASM-AND-OBJ: fmaxm.h fs3, fs4, fs5
# CHECK-ASM: encoding: [0xd3,0x39,0x5a,0x2d]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmaxm.h fs3, fs4, fs5
# CHECK-ASM-AND-OBJ: fminm.q fa0, fa1, fa2
# CHECK-ASM: encoding: [0x53,0xa5,0xc5,0x2e]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fminm.q fa0, fa1, fa2
# CHECK-ASM-AND-OBJ: fmaxm.q fs3, fs4, fs5
# CHECK-ASM: encoding: [0xd3,0x39,0x5a,0x2f]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fmaxm.q fs3, fs4, fs5
# CHECK-ASM-AND-OBJ: fround.s fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x49,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.s fs1, fs2
# CHECK-ASM-AND-OBJ: fround.s fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x49,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.s fs1, fs2, dyn
# CHECK-ASM-AND-OBJ: fround.s fs1, fs2, rtz
# CHECK-ASM: encoding: [0xd3,0x14,0x49,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.s fs1, fs2, rtz
# CHECK-ASM-AND-OBJ: fround.s fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x49,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.s fs1, fs2, rne
# CHECK-ASM-AND-OBJ: froundnx.s fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x59,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.s fs1, fs2
# CHECK-ASM-AND-OBJ: froundnx.s fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x59,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.s fs1, fs2, dyn
# CHECK-ASM-AND-OBJ: froundnx.s fs1, fs2, rtz
# CHECK-ASM: encoding: [0xd3,0x14,0x59,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.s fs1, fs2, rtz
# CHECK-ASM-AND-OBJ: froundnx.s fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x59,0x40]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.s fs1, fs2, rne
# CHECK-ASM-AND-OBJ: fround.d fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x49,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.d fs1, fs2
# CHECK-ASM-AND-OBJ: fround.d fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x49,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.d fs1, fs2, dyn
# CHECK-ASM-AND-OBJ: fround.d fs1, fs2, rtz
# CHECK-ASM: encoding: [0xd3,0x14,0x49,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.d fs1, fs2, rtz
# CHECK-ASM-AND-OBJ: fround.d fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x49,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.d fs1, fs2, rne
# CHECK-ASM-AND-OBJ: froundnx.d fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x59,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.d fs1, fs2
# CHECK-ASM-AND-OBJ: froundnx.d fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x59,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.d fs1, fs2, dyn
# CHECK-ASM-AND-OBJ: froundnx.d fs1, fs2, rtz
# CHECK-ASM: encoding: [0xd3,0x14,0x59,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.d fs1, fs2, rtz
# CHECK-ASM-AND-OBJ: froundnx.d fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x59,0x42]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.d fs1, fs2, rne
# CHECK-ASM-AND-OBJ: fround.h ft1, fa1, dyn
# CHECK-ASM: encoding: [0xd3,0xf0,0x45,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.h ft1, fa1
# CHECK-ASM-AND-OBJ: fround.h ft1, fa1, dyn
# CHECK-ASM: encoding: [0xd3,0xf0,0x45,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.h ft1, fa1, dyn
# CHECK-ASM-AND-OBJ: fround.h ft1, fa1, rtz
# CHECK-ASM: encoding: [0xd3,0x90,0x45,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.h ft1, fa1, rtz
# CHECK-ASM-AND-OBJ: fround.h fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x49,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.h fs1, fs2, rne
# CHECK-ASM-AND-OBJ: froundnx.h ft1, fa1, dyn
# CHECK-ASM: encoding: [0xd3,0xf0,0x55,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.h ft1, fa1
# CHECK-ASM-AND-OBJ: froundnx.h ft1, fa1, dyn
# CHECK-ASM: encoding: [0xd3,0xf0,0x55,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.h ft1, fa1, dyn
# CHECK-ASM-AND-OBJ: froundnx.h ft1, fa1, rtz
# CHECK-ASM: encoding: [0xd3,0x90,0x55,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.h ft1, fa1, rtz
# CHECK-ASM-AND-OBJ: froundnx.h fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x59,0x44]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.h fs1, fs2, rne
# CHECK-ASM-AND-OBJ: fround.q fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x49,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.q fs1, fs2
# CHECK-ASM-AND-OBJ: fround.q fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x49,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.q fs1, fs2, dyn
# CHECK-ASM-AND-OBJ: fround.q fs1, fs2, rtz
# CHECK-ASM: encoding: [0xd3,0x14,0x49,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.q fs1, fs2, rtz
# CHECK-ASM-AND-OBJ: fround.q fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x49,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fround.q fs1, fs2, rne
# CHECK-ASM-AND-OBJ: froundnx.q fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x59,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.q fs1, fs2
# CHECK-ASM-AND-OBJ: froundnx.q fs1, fs2, dyn
# CHECK-ASM: encoding: [0xd3,0x74,0x59,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.q fs1, fs2, dyn
# CHECK-ASM-AND-OBJ: froundnx.q fs1, fs2, rtz
# CHECK-ASM: encoding: [0xd3,0x14,0x59,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.q fs1, fs2, rtz
# CHECK-ASM-AND-OBJ: froundnx.q fs1, fs2, rne
# CHECK-ASM: encoding: [0xd3,0x04,0x59,0x46]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
froundnx.q fs1, fs2, rne
# CHECK-ASM-AND-OBJ: fcvtmod.w.d a1, ft1, rtz
# CHECK-ASM: encoding: [0xd3,0x95,0x80,0xc2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fcvtmod.w.d a1, ft1, rtz
# CHECK-ASM-AND-OBJ: fltq.s a1, fs1, fs2
# CHECK-ASM: encoding: [0xd3,0xd5,0x24,0xa1]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fltq.s a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.s a1, ft1, ft2
# CHECK-ASM: encoding: [0xd3,0xc5,0x20,0xa0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fleq.s a1, ft1, ft2
# CHECK-ASM-AND-OBJ: fltq.s a1, fs2, fs1
# CHECK-ASM: encoding: [0xd3,0x55,0x99,0xa0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgtq.s a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.s a1, ft2, ft1
# CHECK-ASM: encoding: [0xd3,0x45,0x11,0xa0]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgeq.s a1, ft1, ft2
# CHECK-ASM-AND-OBJ: fltq.d a1, fs1, fs2
# CHECK-ASM: encoding: [0xd3,0xd5,0x24,0xa3]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fltq.d a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.d a1, ft1, ft2
# CHECK-ASM: encoding: [0xd3,0xc5,0x20,0xa2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fleq.d a1, ft1, ft2
# CHECK-ASM-AND-OBJ: fltq.d a1, fs2, fs1
# CHECK-ASM: encoding: [0xd3,0x55,0x99,0xa2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgtq.d a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.d a1, ft2, ft1
# CHECK-ASM: encoding: [0xd3,0x45,0x11,0xa2]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgeq.d a1, ft1, ft2
# CHECK-ASM-AND-OBJ: fltq.h a1, fs1, fs2
# CHECK-ASM: encoding: [0xd3,0xd5,0x24,0xa5]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fltq.h a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.h a1, ft1, ft2
# CHECK-ASM: encoding: [0xd3,0xc5,0x20,0xa4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fleq.h a1, ft1, ft2
# CHECK-ASM-AND-OBJ: fltq.h a1, fs2, fs1
# CHECK-ASM: encoding: [0xd3,0x55,0x99,0xa4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgtq.h a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.h a1, ft2, ft1
# CHECK-ASM: encoding: [0xd3,0x45,0x11,0xa4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgeq.h a1, ft1, ft2
# CHECK-ASM-AND-OBJ: fltq.q a1, fs1, fs2
# CHECK-ASM: encoding: [0xd3,0xd5,0x24,0xa7]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fltq.q a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.q a1, ft1, ft2
# CHECK-ASM: encoding: [0xd3,0xc5,0x20,0xa6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fleq.q a1, ft1, ft2
# CHECK-ASM-AND-OBJ: fltq.q a1, fs2, fs1
# CHECK-ASM: encoding: [0xd3,0x55,0x99,0xa6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgtq.q a1, fs1, fs2
# CHECK-ASM-AND-OBJ: fleq.q a1, ft2, ft1
# CHECK-ASM: encoding: [0xd3,0x45,0x11,0xa6]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point)}}
fgeq.q a1, ft1, ft2
diff --git a/llvm/test/MC/RISCV/zfa-zfhmin-zvfh-valid.s b/llvm/test/MC/RISCV/zfa-zfhmin-zvfh-valid.s
index a7a16d5f9f682a..9bf5de635a6d7f 100644
--- a/llvm/test/MC/RISCV/zfa-zfhmin-zvfh-valid.s
+++ b/llvm/test/MC/RISCV/zfa-zfhmin-zvfh-valid.s
@@ -9,14 +9,12 @@
# RUN: | llvm-objdump --mattr=+zfa,+zfhmin,+zvfh -M no-aliases -d -r - \
# RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
#
-# RUN: not llvm-mc -triple riscv32 -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
-# RUN: not llvm-mc -triple riscv64 -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -M no-aliases -show-encoding < %s
# This test makes sure fli.h is supported with Zvfh.
# CHECK-ASM-AND-OBJ: fli.h ft1, -1.0
# CHECK-ASM: encoding: [0xd3,0x00,0x10,0xf4]
-# CHECK-NO-EXT: error: instruction requires the following: 'Zfa' (Additional Floating-Point), 'Zfh' (Half-Precision Floating-Point) or 'Zvfh' (Vector Half-Precision Floating-Point){{$}}
+# expected-error at +1 {{instruction requires the following: 'Zfa' (Additional Floating-Point), 'Zfh' (Half-Precision Floating-Point) or 'Zvfh' (Vector Half-Precision Floating-Point)}}
fli.h ft1, -1.0
diff --git a/llvm/test/MC/RISCV/zicfilp-invalid.s b/llvm/test/MC/RISCV/zicfilp-invalid.s
index 30d8be2f534a3d..4ed07642b2e07d 100644
--- a/llvm/test/MC/RISCV/zicfilp-invalid.s
+++ b/llvm/test/MC/RISCV/zicfilp-invalid.s
@@ -1,14 +1,10 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+experimental-zicfilp -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
-# RUN: not llvm-mc -triple riscv64 -mattr=+experimental-zicfilp -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+experimental-zicfilp -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -mattr=+experimental-zicfilp -M no-aliases -show-encoding < %s
#
# lpad is always available even without Zicfilp (riscv-non-isa/riscv-elf-psabi-doc#474).
#
-# RUN: not llvm-mc -triple riscv32 -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
-# RUN: not llvm-mc -triple riscv64 -M no-aliases -show-encoding < %s 2>&1 \
-# RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s
+# RUN: llvm-mc --verify -triple riscv32 -M no-aliases -show-encoding < %s
+# RUN: llvm-mc --verify -triple riscv64 -M no-aliases -show-encoding < %s
-# CHECK-NO-EXT: immediate must be an integer in the range [0, 1048575]
+# expected-error at +1 {{immediate must be an integer in the range [0, 1048575]}}
lpad 1048576
diff --git a/llvm/test/MC/RISCV/zicfiss-invalid.s b/llvm/test/MC/RISCV/zicfiss-invalid.s
index 559c8c6afc411f..5f26dd98f93740 100644
--- a/llvm/test/MC/RISCV/zicfiss-invalid.s
+++ b/llvm/test/MC/RISCV/zicfiss-invalid.s
@@ -1,19 +1,17 @@
-# RUN: not llvm-mc %s -triple=riscv32 -mattr=+zicfiss,+zcmop,+c -M no-aliases -show-encoding \
-# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-ERR %s
-# RUN: not llvm-mc %s -triple=riscv64 -mattr=+zicfiss,+zcmop,+c -M no-aliases -show-encoding \
-# RUN: 2>&1 | FileCheck -check-prefixes=CHECK-ERR %s
+# RUN: llvm-mc --verify %s -triple=riscv32 -mattr=+zicfiss,+zcmop,+c -M no-aliases -show-encoding
+# RUN: llvm-mc --verify %s -triple=riscv64 -mattr=+zicfiss,+zcmop,+c -M no-aliases -show-encoding
-# CHECK-ERR: error: register must be ra or t0 (x1 or x5)
+# expected-error at +1 {{register must be ra or t0 (x1 or x5)}}
sspopchk a1
-# CHECK-ERR: error: register must be ra (x1)
+# expected-error at +1 {{register must be ra (x1)}}
c.sspush t0
-# CHECK-ERR: error: register must be t0 (x5)
+# expected-error at +1 {{register must be t0 (x5)}}
c.sspopchk ra
-# CHECK-ERR: error: register must be ra or t0 (x1 or x5)
+# expected-error at +1 {{register must be ra or t0 (x1 or x5)}}
sspush a0
-# CHECK-ERR: error: register must be a GPR excluding zero (x0)
+# expected-error at +1 {{register must be a GPR excluding zero (x0)}}
ssrdp zero
diff --git a/llvm/test/MC/RISCV/zilx-invalid.s b/llvm/test/MC/RISCV/zilx-invalid.s
index 03a528c6c86f2f..caaf6d1ea00bd3 100644
--- a/llvm/test/MC/RISCV/zilx-invalid.s
+++ b/llvm/test/MC/RISCV/zilx-invalid.s
@@ -1,40 +1,38 @@
-# RUN: not llvm-mc -triple=riscv32 --mattr=+experimental-zilx %s 2>&1 \
-# RUN: | FileCheck %s --check-prefixes=CHECK-ERROR,CHECK-RV32-ERROR
-# RUN: not llvm-mc -triple=riscv64 --mattr=+experimental-zilx %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify=expected,rv32-error -triple=riscv32 --mattr=+experimental-zilx %s
+# RUN: llvm-mc --verify -triple=riscv64 --mattr=+experimental-zilx %s
# The base register must be written in parentheses; the bare three-register
# syntax is not accepted.
-# CHECK-ERROR: :[[@LINE+1]]:9: error: expected '(' or optional integer offset
+# expected-error at +1:9 {{expected '(' or optional integer offset}}
lxh a0, a1, a2
# Only a zero offset may precede the parenthesized base register.
-# CHECK-ERROR: :[[@LINE+1]]:10: error: expected '(' after optional integer offset
+# expected-error at +1:10 {{expected '(' after optional integer offset}}
lxh a0, 1, a2
# The base operand must be a register.
-# CHECK-ERROR: :[[@LINE+1]]:10: error: expected register
+# expected-error at +1:10 {{expected register}}
lxh a0, (1), a2
-# CHECK-ERROR: :[[@LINE+1]]:9: error: expected '(' or optional integer offset
+# expected-error at +1:9 {{expected '(' or optional integer offset}}
lxh a0, a1
# Doubleword and unsigned-word forms are RV64-only.
-# CHECK-RV32-ERROR: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# rv32-error-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lxd a0, (a1), a2
-# CHECK-RV32-ERROR: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# rv32-error-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lxwu a0, (a1), a2
-# CHECK-RV32-ERROR: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# rv32-error-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lxsd a0, (a1), a2
-# CHECK-RV32-ERROR: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# rv32-error-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lxswu a0, (a1), a2
# The scaled unsigned-word-index loads are RV64-only.
-# CHECK-RV32-ERROR: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# rv32-error-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lxsuwb a0, (a1), a2
-# CHECK-RV32-ERROR: :[[@LINE+1]]:1: error: instruction requires the following: RV64I Base Instruction Set
+# rv32-error-error at +1:1 {{instruction requires the following: RV64I Base Instruction Set}}
lxsuwwu a0, (a1), a2
diff --git a/llvm/test/MC/RISCV/zilx-valid-rv32.s b/llvm/test/MC/RISCV/zilx-valid-rv32.s
index ce60fafa5cdaae..24bf2a0ddb2ae2 100644
--- a/llvm/test/MC/RISCV/zilx-valid-rv32.s
+++ b/llvm/test/MC/RISCV/zilx-valid-rv32.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv32 -show-encoding --mattr=+experimental-zilx %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv32 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv32 -show-encoding %s
# RUN: llvm-mc -triple=riscv32 -filetype=obj --mattr=+experimental-zilx %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zilx --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -11,53 +10,53 @@
lxh a0, (a1), a2
# CHECK-INST: lxh a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x15,0xb6,0x90]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxw a0, (a1), a2
# CHECK-INST: lxw a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x25,0xb6,0x90]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxhu a0, (a1), a2
# CHECK-INST: lxhu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x55,0xb6,0x90]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
# Scaled indexed loads.
lxsb a0, (a1), a2
# CHECK-INST: lxsb a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x05,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsh a0, (a1), a2
# CHECK-INST: lxsh a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x15,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsw a0, (a1), a2
# CHECK-INST: lxsw a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x25,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsbu a0, (a1), a2
# CHECK-INST: lxsbu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x45,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxshu a0, (a1), a2
# CHECK-INST: lxshu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x55,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
# `lxb` and `lxbu` are assembler pseudoinstructions for `lxsb` and `lxsbu`.
lxb a0, (a1), a2
# CHECK-INST: lxsb a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x05,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxbu a0, (a1), a2
# CHECK-INST: lxsbu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x45,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
diff --git a/llvm/test/MC/RISCV/zilx-valid-rv64.s b/llvm/test/MC/RISCV/zilx-valid-rv64.s
index d27e7969f503fa..47a41447c6b019 100644
--- a/llvm/test/MC/RISCV/zilx-valid-rv64.s
+++ b/llvm/test/MC/RISCV/zilx-valid-rv64.s
@@ -1,7 +1,6 @@
# RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-zilx %s \
# RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST
-# RUN: not llvm-mc -triple=riscv64 -show-encoding %s 2>&1 \
-# RUN: | FileCheck %s --check-prefix=CHECK-ERROR
+# RUN: llvm-mc --verify -triple=riscv64 -show-encoding %s
# RUN: llvm-mc -triple=riscv64 -filetype=obj --mattr=+experimental-zilx %s \
# RUN: | llvm-objdump -d --mattr=+experimental-zilx --no-print-imm-hex - \
# RUN: | FileCheck %s --check-prefix=CHECK-INST
@@ -11,58 +10,58 @@
lxd a0, (a1), a2
# CHECK-INST: lxd a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x35,0xb6,0x90]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxwu a0, (a1), a2
# CHECK-INST: lxwu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x65,0xb6,0x90]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
# Scaled indexed loads (RV64-only widths).
lxsd a0, (a1), a2
# CHECK-INST: lxsd a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x35,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxswu a0, (a1), a2
# CHECK-INST: lxswu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x65,0xb6,0xd0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
# Scaled indexed loads with a zero-extended 32-bit index (RV64-only).
lxsuwb a0, (a1), a2
# CHECK-INST: lxsuwb a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x05,0xb6,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsuwh a0, (a1), a2
# CHECK-INST: lxsuwh a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x15,0xb6,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsuww a0, (a1), a2
# CHECK-INST: lxsuww a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x25,0xb6,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsuwd a0, (a1), a2
# CHECK-INST: lxsuwd a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x35,0xb6,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsuwbu a0, (a1), a2
# CHECK-INST: lxsuwbu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x45,0xb6,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsuwhu a0, (a1), a2
# CHECK-INST: lxsuwhu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x55,0xb6,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
lxsuwwu a0, (a1), a2
# CHECK-INST: lxsuwwu a0, (a1), a2
# CHECK-ENCODING: [0x2f,0x65,0xb6,0xf0]
-# CHECK-ERROR: instruction requires the following: 'Zilx' (Indexed Integer Load Instructions){{$}}
+# expected-error at -3 {{instruction requires the following: 'Zilx' (Indexed Integer Load Instructions)}}
>From 22c93383bef845b44a9cf9e1f85e193e20eba413 Mon Sep 17 00:00:00 2001
From: Alex Richardson <alexrichardson at google.com>
Date: Mon, 2 Nov 2026 23:18:52 -0800
Subject: [PATCH 2/2] [nspr] update
---
llvm/test/MC/RISCV/hilo-constaddr-expr.s | 10 +++----
llvm/test/MC/RISCV/xwchc-invalid.s | 34 ++++++++++++------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/llvm/test/MC/RISCV/hilo-constaddr-expr.s b/llvm/test/MC/RISCV/hilo-constaddr-expr.s
index 3cc10bb12e441a..d9ff85f6ca4d34 100644
--- a/llvm/test/MC/RISCV/hilo-constaddr-expr.s
+++ b/llvm/test/MC/RISCV/hilo-constaddr-expr.s
@@ -1,4 +1,4 @@
-# RUN: not llvm-mc -filetype=obj -triple=riscv32 -mattr=+relax %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -filetype=obj -triple=riscv32 -mattr=+relax %s -o /dev/null
# RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=-relax %s | llvm-objdump -d - | FileCheck %s --check-prefix=NORELAX
# Check the assembler rejects hi and lo expressions with constant expressions
@@ -12,13 +12,13 @@
tmp1:
tmp2:
-# CHECK: :[[#@LINE+1]]:[[#]]: error: expected relocatable expression
+# expected-error at +1 {{expected relocatable expression}}
lui t0, %hi(tmp3-tmp1)
-# CHECK: :[[#@LINE+1]]:[[#]]: error: expected relocatable expression
+# expected-error at +1 {{expected relocatable expression}}
lw ra, %lo(tmp3-tmp1)(t0)
tmp3:
-# CHECK: :[[#@LINE+1]]:[[#]]: error: expected relocatable expression
+# expected-error at +1 {{expected relocatable expression}}
lui t1, %hi(tmp2-tmp3)
-# CHECK: :[[#@LINE+1]]:[[#]]: error: expected relocatable expression
+# expected-error at +1 {{expected relocatable expression}}
lw sp, %lo(tmp2-tmp3)(t1)
diff --git a/llvm/test/MC/RISCV/xwchc-invalid.s b/llvm/test/MC/RISCV/xwchc-invalid.s
index a399e1cb662716..c630fdfe997c02 100644
--- a/llvm/test/MC/RISCV/xwchc-invalid.s
+++ b/llvm/test/MC/RISCV/xwchc-invalid.s
@@ -1,21 +1,21 @@
-# RUN: not llvm-mc -triple riscv32 -mattr=+xwchc < %s 2>&1 | FileCheck %s
+# RUN: llvm-mc --verify -triple riscv32 -mattr=+xwchc < %s
-qk.c.lbu x8, 32(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be an integer in the range [0, 31]
-qk.c.sb x8, 32(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be an integer in the range [0, 31]
+qk.c.lbu x8, 32(x8) # expected-error {{immediate must be an integer in the range [0, 31]}}
+qk.c.sb x8, 32(x8) # expected-error {{immediate must be an integer in the range [0, 31]}}
-qk.c.lhu x8, 1(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 62]
-qk.c.sh x8, 1(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 62]
-qk.c.lhu x8, 64(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 62]
-qk.c.sh x8, 64(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 62]
+qk.c.lhu x8, 1(x8) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 62]}}
+qk.c.sh x8, 1(x8) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 62]}}
+qk.c.lhu x8, 64(x8) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 62]}}
+qk.c.sh x8, 64(x8) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 62]}}
-qk.c.lbusp x8, 0(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: register must be sp (x2)
-qk.c.sbsp x8, 0(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: register must be sp (x2)
-qk.c.lbusp x8, 32(sp) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be an integer in the range [0, 15]
-qk.c.sbsp x8, 32(sp) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be an integer in the range [0, 15]
+qk.c.lbusp x8, 0(x8) # expected-error {{register must be sp (x2)}}
+qk.c.sbsp x8, 0(x8) # expected-error {{register must be sp (x2)}}
+qk.c.lbusp x8, 32(sp) # expected-error {{immediate must be an integer in the range [0, 15]}}
+qk.c.sbsp x8, 32(sp) # expected-error {{immediate must be an integer in the range [0, 15]}}
-qk.c.lhusp x8, 0(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: register must be sp (x2)
-qk.c.shsp x8, 0(x8) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: register must be sp (x2)
-qk.c.lhusp x8, 1(sp) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 30]
-qk.c.shsp x8, 1(sp) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 30]
-qk.c.lhusp x8, 32(sp) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 30]
-qk.c.shsp x8, 32(sp) # CHECK: :[[@LINE]]:{{[0-9]+}}: error: immediate must be a multiple of 2 bytes in the range [0, 30]
+qk.c.lhusp x8, 0(x8) # expected-error {{register must be sp (x2)}}
+qk.c.shsp x8, 0(x8) # expected-error {{register must be sp (x2)}}
+qk.c.lhusp x8, 1(sp) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 30]}}
+qk.c.shsp x8, 1(sp) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 30]}}
+qk.c.lhusp x8, 32(sp) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 30]}}
+qk.c.shsp x8, 32(sp) # expected-error {{immediate must be a multiple of 2 bytes in the range [0, 30]}}
More information about the llvm-branch-commits
mailing list