[RISCV][NFC] Rework CHECK lines in rvi-aliases-valid.s

Previously CHECK prefixes weren't defined that can be used to check _only_ the 
InstPrinter output when generating .s from llvm-mc, or that check _only_ the 
output after passing the generated object through objdump. This means we can't 
write useful checks for instructions that reference symbols.

Instead, use:
CHECK-S                 Match the .s output with aliases enabled
CHECK-S-NOALIAS         Match the .s output with aliases disabled
CHECK-OBJ               Match the objdumped object output with aliases enabled
CHECK-OBJ-NOALIAS       Match the objdumped object output with aliases enabled
CHECK-S-OBJ             Match both the .s and objdumped object output with
                        aliases enabled
CHECK-S-OBJ-NOALIAS     Match both the .s and objdumped object output with
                        aliases disabled

While we're at it, use whitespace consistently within this file.

llvm-svn: 341050

1 files changed, 129 insertions, 129 deletions

diff --git a/llvm/test/MC/RISCV/rvi-aliases-valid.s b/llvm/test/MC/RISCV/rvi-aliases-valid.s
index 6e402b18c62..b750921d728 100644
--- a/llvm/test/MC/RISCV/rvi-aliases-valid.s
+++ b/llvm/test/MC/RISCV/rvi-aliases-valid.s
@@ -1,206 +1,206 @@
 # RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases \
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s
+# RUN:     | FileCheck -check-prefixes=CHECK-S-NOALIAS,CHECK-S-OBJ-NOALIAS %s
 # RUN: llvm-mc %s -triple=riscv32 \
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s
+# RUN:     | FileCheck -check-prefixes=CHECK-S,CHECK-S-OBJ %s
 # RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases\
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s
+# RUN:     | FileCheck -check-prefixes=CHECK-S-NOALIAS,CHECK-S-OBJ-NOALIAS %s
 # RUN: llvm-mc %s -triple=riscv64 \
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s
+# RUN:     | FileCheck -check-prefixes=CHECK-S,CHECK-S-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \
 # RUN:     | llvm-objdump -d -riscv-no-aliases - \
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s
+# RUN:     | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-S-OBJ-NOALIAS %s
 # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \
 # RUN:     | llvm-objdump -d - \
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s
+# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-S-OBJ %s
 # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \
 # RUN:     | llvm-objdump -d -riscv-no-aliases - \
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s
+# RUN:     | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-S-OBJ-NOALIAS %s
 # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \
 # RUN:     | llvm-objdump -d - \
-# RUN:     | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s
+# RUN:     | FileCheck -check-prefixes=CHECK-OBJ,CHECK-S-OBJ %s
 
 # The following check prefixes are used in this test:
-# CHECK-INST.....Match the canonical instr (tests alias to instr. mapping)
-# CHECK-ALIAS....Match the alias (tests instr. to alias mapping)
-# CHECK-EXPAND...Match canonical instr. unconditionally (tests alias expansion)
+# CHECK-S                 Match the .s output with aliases enabled
+# CHECK-S-NOALIAS         Match the .s output with aliases disabled
+# CHECK-OBJ               Match the objdumped object output with aliases enabled
+# CHECK-OBJ-NOALIAS       Match the objdumped object output with aliases enabled
+# CHECK-S-OBJ             Match both the .s and objdumped object output with
+#                         aliases enabled
+# CHECK-S-OBJ-NOALIAS     Match both the .s and objdumped object output with
+#                         aliases disabled
 
 # TODO la
 # TODO lb lh lw
 # TODO sb sh sw
 
-# CHECK-INST: addi zero, zero, 0
-# CHECK-ALIAS: nop
+# CHECK-S-OBJ-NOALIAS: addi zero, zero, 0
+# CHECK-S-OBJ: nop
 nop
 
-# CHECK-INST: addi t6, zero, 0
-# CHECK-ALIAS: mv t6, zero
+# CHECK-S-OBJ-NOALIAS: addi t6, zero, 0
+# CHECK-S-OBJ: mv t6, zero
 mv x31, zero
-# CHECK-INST: addi a2, a3, 0
-# CHECK-ALIAS: mv a2, a3
+# CHECK-S-OBJ-NOALIAS: addi a2, a3, 0
+# CHECK-S-OBJ: mv a2, a3
 move a2,a3
-# CHECK-INST: xori t6, ra, -1
-# CHECK-ALIAS: not t6, ra
+# CHECK-S-OBJ-NOALIAS: xori t6, ra, -1
+# CHECK-S-OBJ: not t6, ra
 not x31, x1
-# CHECK-INST: sub t6, zero, ra
-# CHECK-ALIAS: neg t6, ra
+# CHECK-S-OBJ-NOALIAS: sub t6, zero, ra
+# CHECK-S-OBJ: neg t6, ra
 neg x31, x1
-# CHECK-INST: sltiu t6, ra, 1
-# CHECK-ALIAS: seqz t6, ra
+# CHECK-S-OBJ-NOALIAS: sltiu t6, ra, 1
+# CHECK-S-OBJ: seqz t6, ra
 seqz x31, x1
-# CHECK-INST: sltu t6, zero, ra
-# CHECK-ALIAS: snez t6, ra
+# CHECK-S-OBJ-NOALIAS: sltu t6, zero, ra
+# CHECK-S-OBJ: snez t6, ra
 snez x31, x1
-# CHECK-INST: slt t6, ra, zero
-# CHECK-ALIAS: sltz t6, ra
+# CHECK-S-OBJ-NOALIAS: slt t6, ra, zero
+# CHECK-S-OBJ: sltz t6, ra
 sltz x31, x1
-# CHECK-INST: slt t6, zero, ra
-# CHECK-ALIAS: sgtz t6, ra
+# CHECK-S-OBJ-NOALIAS: slt t6, zero, ra
+# CHECK-S-OBJ: sgtz t6, ra
 sgtz x31, x1
 
-# CHECK-INST: slt ra, gp, sp
-# CHECK-ALIAS: slt ra, gp, sp
+# CHECK-S-OBJ-NOALIAS: slt ra, gp, sp
+# CHECK-S-OBJ: slt ra, gp, sp
 sgt x1, x2, x3
-# CHECK-INST: sltu tp, t1, t0
-# CHECK-ALIAS: sltu tp, t1, t0
+# CHECK-S-OBJ-NOALIAS: sltu tp, t1, t0
+# CHECK-S-OBJ: sltu tp, t1, t0
 sgtu x4, x5, x6
 
-# CHECK-INST: beq a0, zero, 512
-# CHECK-ALIAS: beqz a0, 512
+# CHECK-S-OBJ-NOALIAS: beq a0, zero, 512
+# CHECK-S-OBJ: beqz a0, 512
 beqz x10, 512
-# CHECK-INST: bne a1, zero, 1024
-# CHECK-ALIAS: bnez a1, 1024
+# CHECK-S-OBJ-NOALIAS: bne a1, zero, 1024
+# CHECK-S-OBJ: bnez a1, 1024
 bnez x11, 1024
-# CHECK-INST: bge zero, a2, 4
-# CHECK-ALIAS: blez a2, 4
+# CHECK-S-OBJ-NOALIAS: bge zero, a2, 4
+# CHECK-S-OBJ: blez a2, 4
 blez x12, 4
-# CHECK-INST: bge a3, zero, 8
-# CHECK-ALIAS: bgez a3, 8
+# CHECK-S-OBJ-NOALIAS: bge a3, zero, 8
+# CHECK-S-OBJ: bgez a3, 8
 bgez x13, 8
-# CHECK-INST: blt a4, zero, 12
-# CHECK-ALIAS: bltz a4, 12
+# CHECK-S-OBJ-NOALIAS: blt a4, zero, 12
+# CHECK-S-OBJ: bltz a4, 12
 bltz x14, 12
-# CHECK-INST: blt zero, a5, 16
-# CHECK-ALIAS: bgtz a5, 16
+# CHECK-S-OBJ-NOALIAS: blt zero, a5, 16
+# CHECK-S-OBJ: bgtz a5, 16
 bgtz x15, 16
 
 # Always output the canonical mnemonic for the pseudo branch instructions.
-# CHECK-INST: blt a6, a5, 20
-# CHECK-ALIAS: blt a6, a5, 20
+# CHECK-S-OBJ-NOALIAS: blt a6, a5, 20
+# CHECK-S-OBJ: blt a6, a5, 20
 bgt x15, x16, 20
-# CHECK-INST: bge a7, a6, 24
-# CHECK-ALIAS: bge a7, a6, 24
+# CHECK-S-OBJ-NOALIAS: bge a7, a6, 24
+# CHECK-S-OBJ: bge a7, a6, 24
 ble x16, x17, 24
-# CHECK-INST: bltu s2, a7, 28
-# CHECK-ALIAS: bltu s2, a7, 28
+# CHECK-S-OBJ-NOALIAS: bltu s2, a7, 28
+# CHECK-S-OBJ: bltu s2, a7, 28
 bgtu x17, x18, 28
-# CHECK-INST: bgeu s3, s2, 32
-# CHECK-ALIAS: bgeu s3, s2, 32
+# CHECK-S-OBJ-NOALIAS: bgeu s3, s2, 32
+# CHECK-S-OBJ: bgeu s3, s2, 32
 bleu x18, x19, 32
 
-# CHECK-INST: jal zero, 2044
-# CHECK-ALIAS: j 2044
+# CHECK-S-OBJ-NOALIAS: jal zero, 2044
+# CHECK-S-OBJ: j 2044
 j 2044
-# CHECK-INST: jal ra, 2040
-# CHECK-ALIAS: jal 2040
+# CHECK-S-NOALIAS: jal zero, foo
+# CHECK-S: jl zero
+j zero
+# CHECK-S-OBJ-NOALIAS: jal ra, 2040
+# CHECK-S-OBJ: jal 2040
 jal 2040
-# CHECK-INST: jalr zero, s4, 0
-# CHECK-ALIAS: jr s4
+# CHECK-S-OBJ-NOALIAS: jalr zero, s4, 0
+# CHECK-S-OBJ: jr s4
 jr x20
-# CHECK-INST: jalr ra, s5, 0
-# CHECK-ALIAS: jalr s5
+# CHECK-S-OBJ-NOALIAS: jalr ra, s5, 0
+# CHECK-S-OBJ: jalr s5
 jalr x21
-# CHECK-INST: jalr zero, ra, 0
-# CHECK-ALIAS: ret
+# CHECK-S-OBJ-NOALIAS: jalr zero, ra, 0
+# CHECK-S-OBJ: ret
 ret
 # TODO call
 # TODO tail
 
-# CHECK-INST: fence iorw, iorw
-# CHECK-ALIAS: fence
+# CHECK-S-OBJ-NOALIAS: fence iorw, iorw
+# CHECK-S-OBJ: fence
 fence
 
-# CHECK-INST: csrrs s10, 3074, zero
-# CHECK-ALIAS: rdinstret s10
+# CHECK-S-OBJ-NOALIAS: csrrs s10, 3074, zero
+# CHECK-S-OBJ: rdinstret s10
 rdinstret x26
-# CHECK-INST: csrrs s8, 3072, zero
-# CHECK-ALIAS: rdcycle s8
+# CHECK-S-OBJ-NOALIAS: csrrs s8, 3072, zero
+# CHECK-S-OBJ: rdcycle s8
 rdcycle x24
-# CHECK-INST: csrrs s9, 3073, zero
-# CHECK-ALIAS: rdtime s9
+# CHECK-S-OBJ-NOALIAS: csrrs s9, 3073, zero
+# CHECK-S-OBJ: rdtime s9
 rdtime x25
 
-# CHECK-INST: csrrs  s0, 336, zero
-# CHECK-ALIAS: csrr s0, 336
+# CHECK-S-OBJ-NOALIAS: csrrs  s0, 336, zero
+# CHECK-S-OBJ: csrr s0, 336
 csrr x8, 0x150
-# CHECK-INST: csrrw zero, 320, s1
-# CHECK-ALIAS: csrw 320, s1
+# CHECK-S-OBJ-NOALIAS: csrrw zero, 320, s1
+# CHECK-S-OBJ: csrw 320, s1
 csrw 0x140, x9
-# CHECK-INST: csrrs zero, 4095, s6
-# CHECK-ALIAS: csrs 4095, s6
+# CHECK-S-OBJ-NOALIAS: csrrs zero, 4095, s6
+# CHECK-S-OBJ: csrs 4095, s6
 csrs 0xfff, x22
-# CHECK-INST: csrrc zero, 4095, s7
-# CHECK-ALIAS: csrc 4095, s7
+# CHECK-S-OBJ-NOALIAS: csrrc zero, 4095, s7
+# CHECK-S-OBJ: csrc 4095, s7
 csrc 0xfff, x23
 
-# CHECK-INST: csrrwi zero, 336, 15
-# CHECK-ALIAS: csrwi 336, 15
+# CHECK-S-OBJ-NOALIAS: csrrwi zero, 336, 15
+# CHECK-S-OBJ: csrwi 336, 15
 csrwi 0x150, 0xf
-# CHECK-INST: csrrsi zero, 4095, 16
-# CHECK-ALIAS: csrsi 4095, 16
+# CHECK-S-OBJ-NOALIAS: csrrsi zero, 4095, 16
+# CHECK-S-OBJ: csrsi 4095, 16
 csrsi 0xfff, 0x10
-# CHECK-INST: csrrci zero, 320, 17
-# CHECK-ALIAS: csrci 320, 17
+# CHECK-S-OBJ-NOALIAS: csrrci zero, 320, 17
+# CHECK-S-OBJ: csrci 320, 17
 csrci 0x140, 0x11
 
-# CHECK-INST: sfence.vma zero, zero
-# CHECK-ALIAS: sfence.vma
+# CHECK-S-OBJ-NOALIAS: sfence.vma zero, zero
+# CHECK-S-OBJ: sfence.vma
 sfence.vma
-# CHECK-INST: sfence.vma a0, zero
-# CHECK-ALIAS: sfence.vma a0
+# CHECK-S-OBJ-NOALIAS: sfence.vma a0, zero
+# CHECK-S-OBJ: sfence.vma a0
 sfence.vma a0
 
 # The following aliases are accepted as input but the canonical form
 # of the instruction will always be printed.
-# CHECK-INST: addi a2, a3, 4
-# CHECK-ALIAS: addi a2, a3, 4
-add a2,a3,4
-
-# CHECK-INST: andi a2, a3, 4
-# CHECK-ALIAS: andi a2, a3, 4
-and a2,a3,4
-
-# CHECK-INST: xori a2, a3, 4
-# CHECK-ALIAS: xori a2, a3, 4
-xor a2,a3,4
-
-# CHECK-INST: ori a2, a3, 4
-# CHECK-ALIAS: ori a2, a3, 4
-or a2,a3,4
-
-# CHECK-INST: slli a2, a3, 4
-# CHECK-ALIAS: slli a2, a3, 4
-sll a2,a3,4
-
-# CHECK-INST: srli a2, a3, 4
-# CHECK-ALIAS: srli a2, a3, 4
-srl a2,a3,4
-
-# CHECK-INST: srai a2, a3, 4
-# CHECK-ALIAS: srai a2, a3, 4
-sra a2,a3,4
-
-# CHECK-INST: slti a2, a3, 4
-# CHECK-ALIAS: slti a2, a3, 4
-slt a2,a3,4
-
-# CHECK-INST: sltiu a2, a3, 4
-# CHECK-ALIAS: sltiu a2, a3, 4
-sltu a2,a3,4
-
-# CHECK-INST: ebreak
-# CHECK-ALIAS: ebreak
+# CHECK-S-OBJ-NOALIAS: addi a2, a3, 4
+# CHECK-S-OBJ: addi a2, a3, 4
+add a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: andi a2, a3, 4
+# CHECK-S-OBJ: andi a2, a3, 4
+and a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: xori a2, a3, 4
+# CHECK-S-OBJ: xori a2, a3, 4
+xor a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: ori a2, a3, 4
+# CHECK-S-OBJ: ori a2, a3, 4
+or a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: slli a2, a3, 4
+# CHECK-S-OBJ: slli a2, a3, 4
+sll a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: srli a2, a3, 4
+# CHECK-S-OBJ: srli a2, a3, 4
+srl a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: srai a2, a3, 4
+# CHECK-S-OBJ: srai a2, a3, 4
+sra a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: slti a2, a3, 4
+# CHECK-S-OBJ: slti a2, a3, 4
+slt a2, a3, 4
+# CHECK-S-OBJ-NOALIAS: sltiu a2, a3, 4
+# CHECK-S-OBJ: sltiu a2, a3, 4
+sltu a2, a3, 4
+
+# CHECK-S-OBJ-NOALIAS: ebreak
+# CHECK-S-OBJ: ebreak
 sbreak
 
-# CHECK-INST: ecall
-# CHECK-ALIAS: ecall
+# CHECK-S-OBJ-NOALIAS: ecall
+# CHECK-S-OBJ: ecall
 scall