[llvm-branch-commits] [llvm] [RISC-V][MC] Convert priv-invalid.s to llvm-mc -verify (PR #227571)

[Alexander Richardson via llvm-branch-commits]

https://github.com/arichardson created https://github.com/llvm/llvm-project/pull/227571

Convert `llvm/test/MC/RISCV/priv-invalid.s` from `not llvm-mc ... 2>&1 | FileCheck`
to `llvm-mc -verify` as an example of inline diagnostic verification with
explicit column checks.

This commit was created with the help of AI tools

>From 1dac5e735717fac29c2a113eba1726aff6f8a17c Mon Sep 17 00:00:00 2001
From: Alex Richardson <alexrichardson at google.com>
Date: Tue, 29 Sep 2026 22:49:14 -0700
Subject: [PATCH] [RISC-V][MC] Convert priv-invalid.s to llvm-mc -verify

Convert `llvm/test/MC/RISCV/priv-invalid.s` from `not llvm-mc ... 2>&1 | FileCheck`
to `llvm-mc -verify` as an example of inline diagnostic verification with
explicit column checks.

This commit was created with the help of AI tools
---
 llvm/test/MC/RISCV/priv-invalid.s | 100 +++++++++++++++---------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/llvm/test/MC/RISCV/priv-invalid.s b/llvm/test/MC/RISCV/priv-invalid.s
index c4bd1e8d74135..6c368c5fa7aaa 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 -triple riscv32 -verify < %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, a1 # CHECK: :[[@LINE]]:13: error: expected '(' or optional integer offset
-    
-hlvx.hu a0, 1(a1) # CHECK: :[[@LINE]]:13: error: optional integer offset must be 0
+hlvx.hu a0, 0x10 # expected-error:18 {{expected '(' after optional integer offset}}
 
-hlv.w a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hlvx.hu a0, a1 # expected-error:13 {{expected '(' or optional integer offset}}
 
-hlv.w a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hlvx.hu a0, 1(a1) # expected-error:13 {{optional integer offset must be 0}}
 
-hlv.w a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hlv.w a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
 
-hlvx.wu a0, 0x10 # CHECK: :[[@LINE]]:18: error: expected '(' after optional integer offset
+hlv.w a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
 
-hlvx.wu a0, a1 # CHECK: :[[@LINE]]:13: error: expected '(' or optional integer offset
+hlv.w a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
 
-hlvx.wu a0, 1(a1) # CHECK: :[[@LINE]]:13: error: optional integer offset must be 0
+hlvx.wu a0, 0x10 # expected-error:18 {{expected '(' after optional integer offset}}
 
-hsv.b a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hlvx.wu a0, a1 # expected-error:13 {{expected '(' or optional integer offset}}
 
-hsv.b a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hlvx.wu a0, 1(a1) # expected-error:13 {{optional integer offset must be 0}}
 
-hsv.b a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hsv.b a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
 
-hsv.h a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hsv.b a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
 
-hsv.h a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hsv.b a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
 
-hsv.h a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hsv.h a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
 
-hsv.w a0, 0x10 # CHECK: :[[@LINE]]:16: error: expected '(' after optional integer offset
+hsv.h a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
 
-hsv.w a0, a1 # CHECK: :[[@LINE]]:11: error: expected '(' or optional integer offset
+hsv.h a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}
 
-hsv.w a0, 1(a1) # CHECK: :[[@LINE]]:11: error: optional integer offset must be 0
+hsv.w a0, 0x10 # expected-error:16 {{expected '(' after optional integer offset}}
+
+hsv.w a0, a1 # expected-error:11 {{expected '(' or optional integer offset}}
+
+hsv.w a0, 1(a1) # expected-error:11 {{optional integer offset must be 0}}