[RISCV] Fix unused check prefixes in test/MC/RISCV/

diff --git a/llvm/test/MC/RISCV/rv32a-valid.s b/llvm/test/MC/RISCV/rv32a-valid.s
index 2838b0d..1f66680 100644 (file)
--- a/llvm/test/MC/RISCV/rv32a-valid.s
+++ b/llvm/test/MC/RISCV/rv32a-valid.s
@@ -4,10 +4,10 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+a < %s \
 # RUN:     | llvm-objdump --mattr=+a -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+a < %s \
 # RUN:     | llvm-objdump --mattr=+a -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: lr.w t0, (t1)
 # CHECK-ASM: encoding: [0xaf,0x22,0x03,0x10]

diff --git a/llvm/test/MC/RISCV/rv32c-aliases-valid.s b/llvm/test/MC/RISCV/rv32c-aliases-valid.s
index 6f8da56..f2a03e7 100644 (file)
--- a/llvm/test/MC/RISCV/rv32c-aliases-valid.s
+++ b/llvm/test/MC/RISCV/rv32c-aliases-valid.s
@@ -7,6 +7,7 @@
 # The following check prefixes are used in this test:
 # CHECK-INST.....Match the canonical instr (tests alias to instr. mapping)
 # CHECK-EXPAND...Match canonical instr. unconditionally (tests alias expansion)
+# CHECK-INST: {{^}}
 
 # CHECK-EXPAND: c.li a0, 0
 li x10, 0

diff --git a/llvm/test/MC/RISCV/rv32c-only-valid.s b/llvm/test/MC/RISCV/rv32c-only-valid.s
index 71de944..b04e7b4 100644 (file)
--- a/llvm/test/MC/RISCV/rv32c-only-valid.s
+++ b/llvm/test/MC/RISCV/rv32c-only-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c < %s \
 # RUN:     | llvm-objdump --mattr=+c -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 #
 # RUN: not llvm-mc -triple riscv32 \
 # RUN:     -riscv-no-aliases -show-encoding < %s 2>&1 \

diff --git a/llvm/test/MC/RISCV/rv32c-valid.s b/llvm/test/MC/RISCV/rv32c-valid.s
index ddfd6e0..8b3108f 100644 (file)
--- a/llvm/test/MC/RISCV/rv32c-valid.s
+++ b/llvm/test/MC/RISCV/rv32c-valid.s
@@ -2,12 +2,12 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c < %s \
 # RUN:     | llvm-objdump --mattr=+c -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+c -riscv-no-aliases -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \
 # RUN:     | llvm-objdump --mattr=+c -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # TODO: more exhaustive testing of immediate encoding.
 

diff --git a/llvm/test/MC/RISCV/rv32d-valid.s b/llvm/test/MC/RISCV/rv32d-valid.s
index be3e045..f6254eb 100644 (file)
--- a/llvm/test/MC/RISCV/rv32d-valid.s
+++ b/llvm/test/MC/RISCV/rv32d-valid.s
@@ -2,12 +2,12 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+d < %s \
 # RUN:     | llvm-objdump --mattr=+d -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+d -riscv-no-aliases -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+d < %s \
 # RUN:     | llvm-objdump --mattr=+d -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # Support for the 'D' extension implies support for 'F'
 # CHECK-ASM-AND-OBJ: fadd.s fs10, fs11, ft8

diff --git a/llvm/test/MC/RISCV/rv32dc-valid.s b/llvm/test/MC/RISCV/rv32dc-valid.s
index 0260c38..f573112 100644 (file)
--- a/llvm/test/MC/RISCV/rv32dc-valid.s
+++ b/llvm/test/MC/RISCV/rv32dc-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c,+d < %s \
 # RUN:     | llvm-objdump --mattr=+c,+d -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 #
 # RUN: not llvm-mc -triple riscv32 -mattr=+c \
 # RUN:     -riscv-no-aliases -show-encoding < %s 2>&1 \

diff --git a/llvm/test/MC/RISCV/rv32f-valid.s b/llvm/test/MC/RISCV/rv32f-valid.s
index 1d1e264..d6b853a 100644 (file)
--- a/llvm/test/MC/RISCV/rv32f-valid.s
+++ b/llvm/test/MC/RISCV/rv32f-valid.s
@@ -4,10 +4,10 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+f < %s \
 # RUN:     | llvm-objdump --mattr=+f -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+f < %s \
 # RUN:     | llvm-objdump --mattr=+f -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: flw ft0, 12(a0)
 # CHECK-ASM: encoding: [0x07,0x20,0xc5,0x00]

diff --git a/llvm/test/MC/RISCV/rv32fc-valid.s b/llvm/test/MC/RISCV/rv32fc-valid.s
index fcccb23..12bccdf 100644 (file)
--- a/llvm/test/MC/RISCV/rv32fc-valid.s
+++ b/llvm/test/MC/RISCV/rv32fc-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c,+f < %s \
 # RUN:     | llvm-objdump --mattr=+c,+f -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 #
 # RUN: not llvm-mc -triple riscv32 -mattr=+c \
 # RUN:     -riscv-no-aliases -show-encoding < %s 2>&1 \

diff --git a/llvm/test/MC/RISCV/rv32m-valid.s b/llvm/test/MC/RISCV/rv32m-valid.s
index 7dd9d94..8fb54bb 100644 (file)
--- a/llvm/test/MC/RISCV/rv32m-valid.s
+++ b/llvm/test/MC/RISCV/rv32m-valid.s
@@ -4,10 +4,10 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+m < %s \
 # RUN:     | llvm-objdump --mattr=+m -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+m < %s \
 # RUN:     | llvm-objdump --mattr=+m -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: mul a4, ra, s0
 # CHECK-ASM: encoding: [0x33,0x87,0x80,0x02]

diff --git a/llvm/test/MC/RISCV/rv32zbb-valid.s b/llvm/test/MC/RISCV/rv32zbb-valid.s
index 965f1fb..993dd1b 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbb-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbb-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip base extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbb -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbb < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbb -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: slo t0, t1, t2
 # CHECK-ASM: encoding: [0xb3,0x12,0x73,0x20]

diff --git a/llvm/test/MC/RISCV/rv32zbbp-valid.s b/llvm/test/MC/RISCV/rv32zbbp-valid.s
index 2ab9da6..a855091 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbbp-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbbp-valid.s
@@ -3,21 +3,21 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip base extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbb < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbb -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip permutation extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbp -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbp < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbp -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: andn t0, t1, t2
 # CHECK-ASM: encoding: [0xb3,0x72,0x73,0x40]

diff --git a/llvm/test/MC/RISCV/rv32zbc-valid.s b/llvm/test/MC/RISCV/rv32zbc-valid.s
index c423c2e..013ae20 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbc-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbc-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip carry-less multiply extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbc -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbc < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbc -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: clmul t0, t1, t2
 # CHECK-ASM: encoding: [0xb3,0x12,0x73,0x0a]

diff --git a/llvm/test/MC/RISCV/rv32zbe-valid.s b/llvm/test/MC/RISCV/rv32zbe-valid.s
index 89e38aa..cec45e1 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbe-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbe-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip extract/deposit extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbe -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbe < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbe -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: bdep t0, t1, t2
 # CHECK-ASM: encoding: [0xb3,0x62,0x73,0x48]

diff --git a/llvm/test/MC/RISCV/rv32zbf-valid.s b/llvm/test/MC/RISCV/rv32zbf-valid.s
index 1e55e07..a6d211e 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbf-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbf-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bit-Field extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbf -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbf < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbf -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: bfp t0, t1, t2
 # CHECK-ASM: encoding: [0xb3,0x72,0x73,0x48]

diff --git a/llvm/test/MC/RISCV/rv32zbp-valid.s b/llvm/test/MC/RISCV/rv32zbp-valid.s
index 503174d..6fe7974 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbp-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbp-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip permutation extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbp -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbp < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbp -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: gorc t0, t1, t2
 # CHECK-ASM: encoding: [0xb3,0x52,0x73,0x28]

diff --git a/llvm/test/MC/RISCV/rv32zbproposedc-valid.s b/llvm/test/MC/RISCV/rv32zbproposedc-valid.s
index aa41b40..6e1107a 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbproposedc-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbproposedc-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c,+experimental-zbproposedc < %s \
 # RUN:     | llvm-objdump --mattr=+c,+experimental-zbproposedc -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: c.not s0
 # CHECK-ASM: encoding: [0x01,0x60]

diff --git a/llvm/test/MC/RISCV/rv32zbr-valid.s b/llvm/test/MC/RISCV/rv32zbr-valid.s
index e294329..cb45af8 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbr-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbr-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip CRC extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbr -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbr < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbr -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: crc32.b t0, t1
 # CHECK-ASM: encoding: [0x93,0x12,0x03,0x61]

diff --git a/llvm/test/MC/RISCV/rv32zbs-valid.s b/llvm/test/MC/RISCV/rv32zbs-valid.s
index 9c3d7ce..73f2783 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbs-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbs-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip single bit extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbs -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbs < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbs -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: sbclr t0, t1, t2
 # CHECK-ASM: encoding: [0xb3,0x12,0x73,0x48]

diff --git a/llvm/test/MC/RISCV/rv32zbt-valid.s b/llvm/test/MC/RISCV/rv32zbt-valid.s
index 16827b6..f15c2a1 100644 (file)
--- a/llvm/test/MC/RISCV/rv32zbt-valid.s
+++ b/llvm/test/MC/RISCV/rv32zbt-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip ternary extension:
 # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbt -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zbt < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbt -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: cmix t0, t1, t2, t3
 # CHECK-ASM: encoding: [0xb3,0x92,0x63,0xe6]

diff --git a/llvm/test/MC/RISCV/rv64a-valid.s b/llvm/test/MC/RISCV/rv64a-valid.s
index 7fe5d35..0dcf35b 100644 (file)
--- a/llvm/test/MC/RISCV/rv64a-valid.s
+++ b/llvm/test/MC/RISCV/rv64a-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+a < %s \
 # RUN:     | llvm-objdump --mattr=+a -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# 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

diff --git a/llvm/test/MC/RISCV/rv64c-aliases-valid.s b/llvm/test/MC/RISCV/rv64c-aliases-valid.s
index 996aa09..8d58acb 100644 (file)
--- a/llvm/test/MC/RISCV/rv64c-aliases-valid.s
+++ b/llvm/test/MC/RISCV/rv64c-aliases-valid.s
@@ -7,6 +7,7 @@
 # The following check prefixes are used in this test:
 # CHECK-INST.....Match the canonical instr (tests alias to instr. mapping)
 # CHECK-EXPAND...Match canonical instr. unconditionally (tests alias expansion)
+# CHECK-INST: {{^}}
 
 # CHECK-EXPAND: c.li a0, 0
 li x10, 0

diff --git a/llvm/test/MC/RISCV/rv64c-hints-valid.s b/llvm/test/MC/RISCV/rv64c-hints-valid.s
index 5a273ac..db1fcfe 100644 (file)
--- a/llvm/test/MC/RISCV/rv64c-hints-valid.s
+++ b/llvm/test/MC/RISCV/rv64c-hints-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \
 # RUN:     | llvm-objdump -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: c.slli zero, 63
 # CHECK-ASM: encoding: [0x7e,0x10]

diff --git a/llvm/test/MC/RISCV/rv64c-valid.s b/llvm/test/MC/RISCV/rv64c-valid.s
index b186879..36bd353 100644 (file)
--- a/llvm/test/MC/RISCV/rv64c-valid.s
+++ b/llvm/test/MC/RISCV/rv64c-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \
 # RUN:     | llvm-objdump --mattr=+c -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 #
 #
 # RUN: not llvm-mc -triple riscv64 \

diff --git a/llvm/test/MC/RISCV/rv64d-valid.s b/llvm/test/MC/RISCV/rv64d-valid.s
index a8858ab..92c5205 100644 (file)
--- a/llvm/test/MC/RISCV/rv64d-valid.s
+++ b/llvm/test/MC/RISCV/rv64d-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+d < %s \
 # RUN:     | llvm-objdump --mattr=+d -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# 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

diff --git a/llvm/test/MC/RISCV/rv64dc-valid.s b/llvm/test/MC/RISCV/rv64dc-valid.s
index 4a8aac9..0e237e8 100644 (file)
--- a/llvm/test/MC/RISCV/rv64dc-valid.s
+++ b/llvm/test/MC/RISCV/rv64dc-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c,+d < %s \
 # RUN:     | llvm-objdump --mattr=+c,+d -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 #
 # RUN: not llvm-mc -triple riscv64 -mattr=+c \
 # RUN:     -riscv-no-aliases -show-encoding < %s 2>&1 \

diff --git a/llvm/test/MC/RISCV/rv64f-valid.s b/llvm/test/MC/RISCV/rv64f-valid.s
index 24e99a9..5a6551f 100644 (file)
--- a/llvm/test/MC/RISCV/rv64f-valid.s
+++ b/llvm/test/MC/RISCV/rv64f-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+f < %s \
 # RUN:     | llvm-objdump --mattr=+f -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# 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

diff --git a/llvm/test/MC/RISCV/rv64i-valid.s b/llvm/test/MC/RISCV/rv64i-valid.s
index 4642db5..b3df45e 100644 (file)
--- a/llvm/test/MC/RISCV/rv64i-valid.s
+++ b/llvm/test/MC/RISCV/rv64i-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 < %s \
 # RUN:     | llvm-objdump -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 .equ CONST, 31
 

diff --git a/llvm/test/MC/RISCV/rv64m-valid.s b/llvm/test/MC/RISCV/rv64m-valid.s
index ea99732..246f74f 100644 (file)
--- a/llvm/test/MC/RISCV/rv64m-valid.s
+++ b/llvm/test/MC/RISCV/rv64m-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+m < %s \
 # RUN:     | llvm-objdump --mattr=+m -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: mulw ra, sp, gp
 # CHECK-ASM: encoding: [0xbb,0x00,0x31,0x02]

diff --git a/llvm/test/MC/RISCV/rv64zbb-valid.s b/llvm/test/MC/RISCV/rv64zbb-valid.s
index a6be8ae..f15ccd2 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbb-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbb-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip base extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbb < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbb -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: addiwu t0, t1, 0
 # CHECK-ASM: encoding: [0x9b,0x42,0x03,0x00]

diff --git a/llvm/test/MC/RISCV/rv64zbbp-valid.s b/llvm/test/MC/RISCV/rv64zbbp-valid.s
index 5c27472..c117e20 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbbp-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbbp-valid.s
@@ -3,21 +3,21 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip base extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbb < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbb -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip permutation extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbp -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbp < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbp -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: rolw t0, t1, t2
 # CHECK-ASM: encoding: [0xbb,0x12,0x73,0x60]

diff --git a/llvm/test/MC/RISCV/rv64zbc-valid.s b/llvm/test/MC/RISCV/rv64zbc-valid.s
index 7259dc2..eda838c 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbc-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbc-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip carry-less multiply extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbc -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbc < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbc -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: clmulw t0, t1, t2
 # CHECK-ASM: encoding: [0xbb,0x12,0x73,0x0a]

diff --git a/llvm/test/MC/RISCV/rv64zbe-valid.s b/llvm/test/MC/RISCV/rv64zbe-valid.s
index 1c9d1ce..5d5fb3b 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbe-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbe-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip extract/deposit extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbe -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbe < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbe -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: bdepw t0, t1, t2
 # CHECK-ASM: encoding: [0xbb,0x62,0x73,0x48]

diff --git a/llvm/test/MC/RISCV/rv64zbf-valid.s b/llvm/test/MC/RISCV/rv64zbf-valid.s
index 2e02a86..1a2a41a 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbf-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbf-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bit-Field extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbf -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbf < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbf -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: bfpw t0, t1, t2
 # CHECK-ASM: encoding: [0xbb,0x72,0x73,0x48]

diff --git a/llvm/test/MC/RISCV/rv64zbm-valid.s b/llvm/test/MC/RISCV/rv64zbm-valid.s
index dc095cf..c1d1410 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbm-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbm-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip matix extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbm -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbm < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbm -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: bmatflip t0, t1
 # CHECK-ASM: encoding: [0x93,0x12,0x33,0x60]

diff --git a/llvm/test/MC/RISCV/rv64zbp-valid.s b/llvm/test/MC/RISCV/rv64zbp-valid.s
index 47d9002..79c99c5 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbp-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbp-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip permutation extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbp -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbp < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbp -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: gorcw t0, t1, t2
 # CHECK-ASM: encoding: [0xbb,0x52,0x73,0x28]

diff --git a/llvm/test/MC/RISCV/rv64zbproposedc-valid.s b/llvm/test/MC/RISCV/rv64zbproposedc-valid.s
index 68d9329..a30f3bb 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbproposedc-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbproposedc-valid.s
@@ -2,7 +2,7 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+c,+experimental-zbproposedc,+experimental-b -M no-aliases -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 
 # CHECK-ASM-AND-OBJ: c.zext.w s0

diff --git a/llvm/test/MC/RISCV/rv64zbr-valid.s b/llvm/test/MC/RISCV/rv64zbr-valid.s
index 497c8ec..15aa900 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbr-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbr-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip CRC extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbr -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbr < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbr -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: crc32.d t0, t1
 # CHECK-ASM: encoding: [0x93,0x12,0x33,0x61]

diff --git a/llvm/test/MC/RISCV/rv64zbs-valid.s b/llvm/test/MC/RISCV/rv64zbs-valid.s
index aa010a2..ebeaa4e 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbs-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbs-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip single bit extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbs -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbs < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbs -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: sbclrw t0, t1, t2
 # CHECK-ASM: encoding: [0xbb,0x12,0x73,0x48]

diff --git a/llvm/test/MC/RISCV/rv64zbt-valid.s b/llvm/test/MC/RISCV/rv64zbt-valid.s
index ba0daac..7db0c8d 100644 (file)
--- a/llvm/test/MC/RISCV/rv64zbt-valid.s
+++ b/llvm/test/MC/RISCV/rv64zbt-valid.s
@@ -3,14 +3,14 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-b < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-b -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # With Bitmanip ternary extension:
 # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbt -show-encoding \
 # RUN:     | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zbt < %s \
 # RUN:     | llvm-objdump --mattr=+experimental-zbt -d -r - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s
 
 # CHECK-ASM-AND-OBJ: fslw t0, t1, t2, t3
 # CHECK-ASM: encoding: [0xbb,0x12,0xc3,0x3d]

diff --git a/llvm/test/MC/RISCV/rva-aliases-valid.s b/llvm/test/MC/RISCV/rva-aliases-valid.s
index a33b9ff..57d96b5 100644 (file)
--- a/llvm/test/MC/RISCV/rva-aliases-valid.s
+++ b/llvm/test/MC/RISCV/rva-aliases-valid.s
@@ -11,13 +11,13 @@
 # RUN:     | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-S-OBJ-NOALIAS %s
 # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+a < %s \
 # RUN:     | llvm-objdump -d --mattr=+a - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-S-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-S-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+a < %s \
 # RUN:     | llvm-objdump -d --mattr=+a -M no-aliases - \
 # RUN:     | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-S-OBJ-NOALIAS %s
 # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+a < %s \
 # RUN:     | llvm-objdump -d --mattr=+a - \
-# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-S-OBJ %s
+# RUN:     | FileCheck --check-prefix=CHECK-S-OBJ %s
 
 # The following check prefixes are used in this test:
 # CHECK-S                 Match the .s output with aliases enabled
@@ -31,267 +31,182 @@
 
 # The below tests for lr.w, sc.w and amo*.w, using `0(reg)` are actually
 # implemented using a custom parser, but we test them as if they're aliases.
+# CHECK-S: {{^}}
+# CHECK-S-NOALIAS: {{^}}
+# CHECK-OBJ-NOALIAS: {{^}}
 
-# CHECK-S: lr.w a1, (a0)
-# CHECK-S-NOALIAS: lr.w a1, (a0)
-# CHECK-OBJ: lr.w a1, (a0)
-# CHECK-OBJ-NOALIAS: lr.w a1, (a0)
+# CHECK-S-OBJ: lr.w a1, (a0)
+# CHECK-S-OBJ-NOALIAS: lr.w a1, (a0)
 lr.w a1, 0(a0)
 
-# CHECK-S: lr.w.aq a1, (a0)
-# CHECK-S-NOALIAS: lr.w.aq a1, (a0)
-# CHECK-OBJ: lr.w.aq a1, (a0)
-# CHECK-OBJ-NOALIAS: lr.w.aq a1, (a0)
+# CHECK-S-OBJ: lr.w.aq a1, (a0)
+# CHECK-S-OBJ-NOALIAS: lr.w.aq a1, (a0)
 lr.w.aq a1, 0(a0)
 
-# CHECK-S: lr.w.rl a1, (a0)
-# CHECK-S-NOALIAS: lr.w.rl a1, (a0)
-# CHECK-OBJ: lr.w.rl a1, (a0)
-# CHECK-OBJ-NOALIAS: lr.w.rl a1, (a0)
+# CHECK-S-OBJ: lr.w.rl a1, (a0)
+# CHECK-S-OBJ-NOALIAS: lr.w.rl a1, (a0)
 lr.w.rl a1, 0(a0)
 
-# CHECK-S: lr.w.aqrl a1, (a0)
-# CHECK-S-NOALIAS: lr.w.aqrl a1, (a0)
-# CHECK-OBJ: lr.w.aqrl a1, (a0)
-# CHECK-OBJ-NOALIAS: lr.w.aqrl a1, (a0)
+# CHECK-S-OBJ: lr.w.aqrl a1, (a0)
+# CHECK-S-OBJ-NOALIAS: lr.w.aqrl a1, (a0)
 lr.w.aqrl a1, 0(a0)
 
-# CHECK-S: sc.w a2, a1, (a0)
-# CHECK-S-NOALIAS: sc.w a2, a1, (a0)
-# CHECK-OBJ: sc.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: sc.w a2, a1, (a0)
+# CHECK-S-OBJ: sc.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: sc.w a2, a1, (a0)
 sc.w a2, a1, 0(a0)
 
-# CHECK-S: sc.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: sc.w.aq a2, a1, (a0)
-# CHECK-OBJ: sc.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: sc.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: sc.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: sc.w.aq a2, a1, (a0)
 sc.w.aq a2, a1, 0(a0)
 
-# CHECK-S: sc.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: sc.w.rl a2, a1, (a0)
-# CHECK-OBJ: sc.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: sc.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: sc.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: sc.w.rl a2, a1, (a0)
 sc.w.rl a2, a1, 0(a0)
 
-# CHECK-S: sc.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: sc.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: sc.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: sc.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: sc.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: sc.w.aqrl a2, a1, (a0)
 sc.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amoswap.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amoswap.w a2, a1, (a0)
-# CHECK-OBJ: amoswap.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoswap.w a2, a1, (a0)
+# CHECK-S-OBJ: amoswap.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoswap.w a2, a1, (a0)
 amoswap.w a2, a1, 0(a0)
 
-# CHECK-S: amoswap.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amoswap.w.aq a2, a1, (a0)
-# CHECK-OBJ: amoswap.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoswap.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amoswap.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoswap.w.aq a2, a1, (a0)
 amoswap.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amoswap.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoswap.w.rl a2, a1, (a0)
-# CHECK-OBJ: amoswap.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoswap.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amoswap.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoswap.w.rl a2, a1, (a0)
 amoswap.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amoswap.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoswap.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amoswap.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoswap.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amoswap.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoswap.w.aqrl a2, a1, (a0)
 amoswap.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amoadd.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amoadd.w a2, a1, (a0)
-# CHECK-OBJ: amoadd.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoadd.w a2, a1, (a0)
+# CHECK-S-OBJ: amoadd.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoadd.w a2, a1, (a0)
 amoadd.w a2, a1, 0(a0)
 
-# CHECK-S: amoadd.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amoadd.w.aq a2, a1, (a0)
-# CHECK-OBJ: amoadd.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoadd.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amoadd.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoadd.w.aq a2, a1, (a0)
 amoadd.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amoadd.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoadd.w.rl a2, a1, (a0)
-# CHECK-OBJ: amoadd.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoadd.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amoadd.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoadd.w.rl a2, a1, (a0)
 amoadd.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amoadd.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoadd.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amoadd.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoadd.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amoadd.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoadd.w.aqrl a2, a1, (a0)
 amoadd.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amoxor.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amoxor.w a2, a1, (a0)
-# CHECK-OBJ: amoxor.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoxor.w a2, a1, (a0)
+# CHECK-S-OBJ: amoxor.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoxor.w a2, a1, (a0)
 amoxor.w a2, a1, 0(a0)
 
-# CHECK-S: amoxor.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amoxor.w.aq a2, a1, (a0)
-# CHECK-OBJ: amoxor.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoxor.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amoxor.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoxor.w.aq a2, a1, (a0)
 amoxor.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amoxor.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoxor.w.rl a2, a1, (a0)
-# CHECK-OBJ: amoxor.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoxor.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amoxor.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoxor.w.rl a2, a1, (a0)
 amoxor.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amoxor.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoxor.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amoxor.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoxor.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amoxor.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoxor.w.aqrl a2, a1, (a0)
 amoxor.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amoand.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amoand.w a2, a1, (a0)
-# CHECK-OBJ: amoand.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoand.w a2, a1, (a0)
+# CHECK-S-OBJ: amoand.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoand.w a2, a1, (a0)
 amoand.w a2, a1, 0(a0)
 
-# CHECK-S: amoand.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amoand.w.aq a2, a1, (a0)
-# CHECK-OBJ: amoand.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoand.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amoand.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoand.w.aq a2, a1, (a0)
 amoand.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amoand.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoand.w.rl a2, a1, (a0)
-# CHECK-OBJ: amoand.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoand.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amoand.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoand.w.rl a2, a1, (a0)
 amoand.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amoand.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoand.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amoand.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoand.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amoand.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoand.w.aqrl a2, a1, (a0)
 amoand.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amoor.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amoor.w a2, a1, (a0)
-# CHECK-OBJ: amoor.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoor.w a2, a1, (a0)
+# CHECK-S-OBJ: amoor.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoor.w a2, a1, (a0)
 amoor.w a2, a1, 0(a0)
 
-# CHECK-S: amoor.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amoor.w.aq a2, a1, (a0)
-# CHECK-OBJ: amoor.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoor.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amoor.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoor.w.aq a2, a1, (a0)
 amoor.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amoor.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoor.w.rl a2, a1, (a0)
-# CHECK-OBJ: amoor.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoor.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amoor.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoor.w.rl a2, a1, (a0)
 amoor.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amoor.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amoor.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amoor.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amoor.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amoor.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amoor.w.aqrl a2, a1, (a0)
 amoor.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amomin.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amomin.w a2, a1, (a0)
-# CHECK-OBJ: amomin.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomin.w a2, a1, (a0)
+# CHECK-S-OBJ: amomin.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomin.w a2, a1, (a0)
 amomin.w a2, a1, 0(a0)
 
-# CHECK-S: amomin.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amomin.w.aq a2, a1, (a0)
-# CHECK-OBJ: amomin.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomin.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amomin.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomin.w.aq a2, a1, (a0)
 amomin.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amomin.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amomin.w.rl a2, a1, (a0)
-# CHECK-OBJ: amomin.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomin.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amomin.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomin.w.rl a2, a1, (a0)
 amomin.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amomin.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amomin.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amomin.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomin.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amomin.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomin.w.aqrl a2, a1, (a0)
 amomin.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amomax.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amomax.w a2, a1, (a0)
-# CHECK-OBJ: amomax.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomax.w a2, a1, (a0)
+# CHECK-S-OBJ: amomax.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomax.w a2, a1, (a0)
 amomax.w a2, a1, 0(a0)
 
-# CHECK-S: amomax.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amomax.w.aq a2, a1, (a0)
-# CHECK-OBJ: amomax.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomax.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amomax.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomax.w.aq a2, a1, (a0)
 amomax.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amomax.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amomax.w.rl a2, a1, (a0)
-# CHECK-OBJ: amomax.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomax.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amomax.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomax.w.rl a2, a1, (a0)
 amomax.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amomax.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amomax.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amomax.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomax.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amomax.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomax.w.aqrl a2, a1, (a0)
 amomax.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amominu.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amominu.w a2, a1, (a0)
-# CHECK-OBJ: amominu.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amominu.w a2, a1, (a0)
+# CHECK-S-OBJ: amominu.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amominu.w a2, a1, (a0)
 amominu.w a2, a1, 0(a0)
 
-# CHECK-S: amominu.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amominu.w.aq a2, a1, (a0)
-# CHECK-OBJ: amominu.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amominu.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amominu.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amominu.w.aq a2, a1, (a0)
 amominu.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amominu.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amominu.w.rl a2, a1, (a0)
-# CHECK-OBJ: amominu.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amominu.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amominu.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amominu.w.rl a2, a1, (a0)
 amominu.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amominu.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amominu.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amominu.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amominu.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amominu.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amominu.w.aqrl a2, a1, (a0)
 amominu.w.aqrl a2, a1, 0(a0)
 
-# CHECK-S: amomaxu.w a2, a1, (a0)
-# CHECK-S-NOALIAS: amomaxu.w a2, a1, (a0)
-# CHECK-OBJ: amomaxu.w a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomaxu.w a2, a1, (a0)
+# CHECK-S-OBJ: amomaxu.w a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomaxu.w a2, a1, (a0)
 amomaxu.w a2, a1, 0(a0)
 
-# CHECK-S: amomaxu.w.aq a2, a1, (a0)
-# CHECK-S-NOALIAS: amomaxu.w.aq a2, a1, (a0)
-# CHECK-OBJ: amomaxu.w.aq a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomaxu.w.aq a2, a1, (a0)
+# CHECK-S-OBJ: amomaxu.w.aq a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomaxu.w.aq a2, a1, (a0)
 amomaxu.w.aq a2, a1, 0(a0)
 
-# CHECK-S: amomaxu.w.rl a2, a1, (a0)
-# CHECK-S-NOALIAS: amomaxu.w.rl a2, a1, (a0)
-# CHECK-OBJ: amomaxu.w.rl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomaxu.w.rl a2, a1, (a0)
+# CHECK-S-OBJ: amomaxu.w.rl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomaxu.w.rl a2, a1, (a0)
 amomaxu.w.rl a2, a1, 0(a0)
 
-# CHECK-S: amomaxu.w.aqrl a2, a1, (a0)
-# CHECK-S-NOALIAS: amomaxu.w.aqrl a2, a1, (a0)
-# CHECK-OBJ: amomaxu.w.aqrl a2, a1, (a0)
-# CHECK-OBJ-NOALIAS: amomaxu.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ: amomaxu.w.aqrl a2, a1, (a0)
+# CHECK-S-OBJ-NOALIAS: amomaxu.w.aqrl a2, a1, (a0)
 amomaxu.w.aqrl a2, a1, 0(a0)