diff --git a/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp b/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp index 1730620dc5e..d1979b5456c 100644 --- a/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp +++ b/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp @@ -34,6 +34,11 @@ using namespace llvm; #define GEN_UNCOMPRESS_INSTR #include "RISCVGenCompressInstEmitter.inc" +static cl::opt + NoAliases("riscv-no-aliases", + cl::desc("Disable the emission of assembler pseudo instructions"), + cl::init(false), cl::Hidden); + // Print architectural register names rather than the ABI names (such as x2 // instead of sp). // TODO: Make RISCVInstPrinter::getRegisterName non-static so that this can a @@ -64,11 +69,11 @@ void RISCVInstPrinter::printInst(const MCInst *MI, uint64_t Address, bool Res = false; const MCInst *NewMI = MI; MCInst UncompressedMI; - if (PrintAliases) + if (PrintAliases && !NoAliases) Res = uncompressInst(UncompressedMI, *MI, MRI, STI); if (Res) NewMI = const_cast(&UncompressedMI); - if (!PrintAliases || !printAliasInstr(NewMI, Address, STI, O)) + if (!PrintAliases || NoAliases || !printAliasInstr(NewMI, Address, STI, O)) printInstruction(NewMI, Address, STI, O); printAnnotation(O, Annot); } diff --git a/test/CodeGen/RISCV/patchable-function-entry.ll b/test/CodeGen/RISCV/patchable-function-entry.ll index 89f34eb579d..9c4eb2c414d 100644 --- a/test/CodeGen/RISCV/patchable-function-entry.ll +++ b/test/CodeGen/RISCV/patchable-function-entry.ll @@ -1,8 +1,8 @@ ;; Test the function attribute "patchable-function-entry". -; RUN: llc -mtriple=riscv32 -M no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV32,NORVC -; RUN: llc -mtriple=riscv64 -M no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV64,NORVC -; RUN: llc -mtriple=riscv32 -mattr=+c -M no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV32,RVC -; RUN: llc -mtriple=riscv64 -mattr=+c -M no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV64,RVC +; RUN: llc -mtriple=riscv32 --riscv-no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV32,NORVC +; RUN: llc -mtriple=riscv64 --riscv-no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV64,NORVC +; RUN: llc -mtriple=riscv32 -mattr=+c --riscv-no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV32,RVC +; RUN: llc -mtriple=riscv64 -mattr=+c --riscv-no-aliases < %s | FileCheck %s --check-prefixes=CHECK,RV64,RVC define void @f0() "patchable-function-entry"="0" { ; CHECK-LABEL: f0: diff --git a/test/MC/RISCV/compress-cjal.s b/test/MC/RISCV/compress-cjal.s index 178d7d6bc34..31b9c30c2b0 100644 --- a/test/MC/RISCV/compress-cjal.s +++ b/test/MC/RISCV/compress-cjal.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -mattr=+c -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv32 -mattr=+c -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s # RUN: llvm-mc -triple riscv32 -mattr=+c -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIASOBJ %s diff --git a/test/MC/RISCV/compress-debug-info.s b/test/MC/RISCV/compress-debug-info.s index 8e218618202..b7ad2ff3e2a 100644 --- a/test/MC/RISCV/compress-debug-info.s +++ b/test/MC/RISCV/compress-debug-info.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc -triple riscv32 -mattr=+c -g -M no-aliases %s \ +# RUN: llvm-mc -triple riscv32 -mattr=+c %s -g -o - -riscv-no-aliases \ # RUN: | FileCheck %s -check-prefixes=COMPRESS,BOTH -# RUN: llvm-mc -triple riscv32 -g -M no-aliases %s \ +# RUN: llvm-mc -triple riscv32 %s -g -o - -riscv-no-aliases \ # RUN: | FileCheck %s -check-prefixes=UNCOMPRESS,BOTH diff --git a/test/MC/RISCV/compress-rv32b.s b/test/MC/RISCV/compress-rv32b.s index 07a3794bbb6..339ae5c2d03 100644 --- a/test/MC/RISCV/compress-rv32b.s +++ b/test/MC/RISCV/compress-rv32b.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -mattr=+c,+experimental-zbproposedc -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+experimental-zbproposedc -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+experimental-zbproposedc -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c,+experimental-zbproposedc -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s @@ -12,7 +12,7 @@ # RUN: llvm-mc -triple riscv64 -mattr=+c,+experimental-zbproposedc -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+experimental-zbproposedc -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+experimental-zbproposedc -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv64 --mattr=+c,+experimental-zbproposedc -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s diff --git a/test/MC/RISCV/compress-rv32d.s b/test/MC/RISCV/compress-rv32d.s index ea9f729b7b4..029cea7a227 100644 --- a/test/MC/RISCV/compress-rv32d.s +++ b/test/MC/RISCV/compress-rv32d.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -mattr=+c,+d -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+d -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+d -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c,+d -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s @@ -12,7 +12,7 @@ # RUN: llvm-mc -triple riscv64 -mattr=+c,+d -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+d -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+d -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv64 --mattr=+c,+d -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s diff --git a/test/MC/RISCV/compress-rv32f.s b/test/MC/RISCV/compress-rv32f.s index 8509de1335e..916d086354d 100644 --- a/test/MC/RISCV/compress-rv32f.s +++ b/test/MC/RISCV/compress-rv32f.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -mattr=+c,+f -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+f -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+f -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c,+f -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s diff --git a/test/MC/RISCV/compress-rv32i.s b/test/MC/RISCV/compress-rv32i.s index dc8e0c7328c..d64c1c9e0d3 100644 --- a/test/MC/RISCV/compress-rv32i.s +++ b/test/MC/RISCV/compress-rv32i.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -mattr=+c -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS,CHECK-ALIASASM %s # RUN: llvm-mc -triple riscv32 -mattr=+c -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST,CHECK-INSTASM %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST,CHECK-INSTASM %s # RUN: llvm-mc -triple riscv32 -mattr=+c -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS,CHECK-ALIASOBJ32 %s @@ -12,7 +12,7 @@ # RUN: llvm-mc -triple riscv64 -mattr=+c -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK-ALIAS,CHECK-ALIASASM %s # RUN: llvm-mc -triple riscv64 -mattr=+c -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK-INST,CHECK-INSTASM %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK-INST,CHECK-INSTASM %s # RUN: llvm-mc -triple riscv64 -mattr=+c -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv64 --mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS,CHECK-ALIASOBJ64 %s diff --git a/test/MC/RISCV/compress-rv64b.s b/test/MC/RISCV/compress-rv64b.s index 5c6437f7427..43900d404e0 100644 --- a/test/MC/RISCV/compress-rv64b.s +++ b/test/MC/RISCV/compress-rv64b.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv64 --mattr=+c,+experimental-zbproposedc,+experimental-b -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s diff --git a/test/MC/RISCV/compress-rv64i.s b/test/MC/RISCV/compress-rv64i.s index 28a7444a825..3bf8bc6b2d2 100644 --- a/test/MC/RISCV/compress-rv64i.s +++ b/test/MC/RISCV/compress-rv64i.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv64 -mattr=+c -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -mattr=+c -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s # RUN: llvm-mc -triple riscv64 -mattr=+c -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv64 --mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s diff --git a/test/MC/RISCV/compressed-relocations.s b/test/MC/RISCV/compressed-relocations.s index 6544ba5a027..03b9993f986 100644 --- a/test/MC/RISCV/compressed-relocations.s +++ b/test/MC/RISCV/compressed-relocations.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple riscv32 -mattr=+c -M no-aliases < %s -show-encoding \ +# RUN: llvm-mc -triple riscv32 -mattr=+c -riscv-no-aliases < %s -show-encoding \ # RUN: | FileCheck -check-prefix=INSTR -check-prefix=FIXUP %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=RELOC %s diff --git a/test/MC/RISCV/debug-valid.s b/test/MC/RISCV/debug-valid.s index 44dd47d25b4..89b8f001b2c 100644 --- a/test/MC/RISCV/debug-valid.s +++ b/test/MC/RISCV/debug-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-INST %s -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -M no-aliases -d - \ diff --git a/test/MC/RISCV/deprecated-csr-names.s b/test/MC/RISCV/deprecated-csr-names.s index 90f2991a1ff..f3c475d5469 100644 --- a/test/MC/RISCV/deprecated-csr-names.s +++ b/test/MC/RISCV/deprecated-csr-names.s @@ -1,10 +1,10 @@ -# RUN: llvm-mc -triple riscv32 -M no-aliases -show-encoding %s \ +# RUN: llvm-mc -triple riscv32 -riscv-no-aliases -show-encoding %s \ # RUN: | FileCheck -check-prefixes CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype obj -triple riscv32 %s \ # RUN: | llvm-objdump -d - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS %s -# RUN: llvm-mc -triple riscv64 -M no-aliases -show-encoding %s \ +# RUN: llvm-mc -triple riscv64 -riscv-no-aliases -show-encoding %s \ # RUN: | FileCheck -check-prefixes CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype obj -triple riscv64 %s \ # RUN: | llvm-objdump -d - \ diff --git a/test/MC/RISCV/fixups.s b/test/MC/RISCV/fixups.s index dd90b5fb7a4..ccfbb2512ab 100644 --- a/test/MC/RISCV/fixups.s +++ b/test/MC/RISCV/fixups.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple riscv32 -M no-aliases < %s -show-encoding \ +# RUN: llvm-mc -triple riscv32 -riscv-no-aliases < %s -show-encoding \ # RUN: | FileCheck -check-prefix=CHECK-FIXUP %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -M no-aliases -d - \ diff --git a/test/MC/RISCV/machine-csr-names.s b/test/MC/RISCV/machine-csr-names.s index 0c1655982df..dbc4f5fcb82 100644 --- a/test/MC/RISCV/machine-csr-names.s +++ b/test/MC/RISCV/machine-csr-names.s @@ -1,10 +1,10 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -d - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS %s # -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-objdump -d - \ diff --git a/test/MC/RISCV/option-nopic.s b/test/MC/RISCV/option-nopic.s index 20203f65e7d..db0cf1db8e1 100644 --- a/test/MC/RISCV/option-nopic.s +++ b/test/MC/RISCV/option-nopic.s @@ -1,19 +1,19 @@ -# RUN: llvm-mc -triple riscv32 -mattr=-relax -M no-aliases < %s \ +# RUN: llvm-mc -triple riscv32 -mattr=-relax -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s -# RUN: llvm-mc -triple riscv32 -mattr=-relax -M no-aliases \ +# RUN: llvm-mc -triple riscv32 -mattr=-relax -riscv-no-aliases \ # RUN: -position-independent < %s | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -position-independent < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s -# RUN: llvm-mc -triple riscv64 -mattr=-relax -M no-aliases < %s \ +# RUN: llvm-mc -triple riscv64 -mattr=-relax -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s -# RUN: llvm-mc -triple riscv64 -mattr=-relax -M no-aliases \ +# RUN: llvm-mc -triple riscv64 -mattr=-relax -riscv-no-aliases \ # RUN: -position-independent < %s | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -position-independent < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s diff --git a/test/MC/RISCV/option-pic.s b/test/MC/RISCV/option-pic.s index 9c9381cb948..ef456e01c4b 100644 --- a/test/MC/RISCV/option-pic.s +++ b/test/MC/RISCV/option-pic.s @@ -1,19 +1,19 @@ -# RUN: llvm-mc -triple riscv32 -mattr=-relax -M no-aliases < %s \ +# RUN: llvm-mc -triple riscv32 -mattr=-relax -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s -# RUN: llvm-mc -triple riscv32 -mattr=-relax -M no-aliases \ +# RUN: llvm-mc -triple riscv32 -mattr=-relax -riscv-no-aliases \ # RUN: -position-independent < %s | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -position-independent < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s -# RUN: llvm-mc -triple riscv64 -mattr=-relax -M no-aliases < %s \ +# RUN: llvm-mc -triple riscv64 -mattr=-relax -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s -# RUN: llvm-mc -triple riscv64 -mattr=-relax -M no-aliases \ +# RUN: llvm-mc -triple riscv64 -mattr=-relax -riscv-no-aliases \ # RUN: -position-independent < %s | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -position-independent < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s diff --git a/test/MC/RISCV/option-pushpop.s b/test/MC/RISCV/option-pushpop.s index 25b0878da7e..909f3d027b8 100644 --- a/test/MC/RISCV/option-pushpop.s +++ b/test/MC/RISCV/option-pushpop.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple riscv32 -mattr=-relax -M no-aliases < %s \ +# RUN: llvm-mc -triple riscv32 -mattr=-relax -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s @@ -6,7 +6,7 @@ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s -# RUN: llvm-mc -triple riscv64 -mattr=-relax -M no-aliases < %s \ +# RUN: llvm-mc -triple riscv64 -mattr=-relax -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=CHECK-RELOC %s diff --git a/test/MC/RISCV/option-rvc.s b/test/MC/RISCV/option-rvc.s index d6a337de83c..6ff9f1587c1 100644 --- a/test/MC/RISCV/option-rvc.s +++ b/test/MC/RISCV/option-rvc.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv32 -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK,CHECK-INST %s # RUN: llvm-mc -triple riscv32 -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv32 --mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s @@ -12,7 +12,7 @@ # RUN: llvm-mc -triple riscv64 -show-encoding < %s \ # RUN: | FileCheck -check-prefixes=CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -show-encoding \ -# RUN: -M no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s +# RUN: -riscv-no-aliases < %s | FileCheck -check-prefixes=CHECK-INST %s # RUN: llvm-mc -triple riscv64 -filetype=obj < %s \ # RUN: | llvm-objdump --triple=riscv64 --mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s diff --git a/test/MC/RISCV/priv-valid.s b/test/MC/RISCV/priv-valid.s index 2b0c3982914..4c79dc41a46 100644 --- a/test/MC/RISCV/priv-valid.s +++ b/test/MC/RISCV/priv-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-INST %s -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK,CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -M no-aliases -d - \ diff --git a/test/MC/RISCV/relocations.s b/test/MC/RISCV/relocations.s index efea6ebd81a..d35bdc887e9 100644 --- a/test/MC/RISCV/relocations.s +++ b/test/MC/RISCV/relocations.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple riscv32 -M no-aliases < %s -show-encoding \ +# RUN: llvm-mc -triple riscv32 -riscv-no-aliases < %s -show-encoding \ # RUN: | FileCheck -check-prefix=INSTR -check-prefix=FIXUP %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \ # RUN: | llvm-readobj -r - | FileCheck -check-prefix=RELOC %s diff --git a/test/MC/RISCV/rv32-machine-csr-names.s b/test/MC/RISCV/rv32-machine-csr-names.s index 2f0f80ce125..0f43088ab63 100644 --- a/test/MC/RISCV/rv32-machine-csr-names.s +++ b/test/MC/RISCV/rv32-machine-csr-names.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -d - \ diff --git a/test/MC/RISCV/rv32-user-csr-names.s b/test/MC/RISCV/rv32-user-csr-names.s index 6fb98610347..acd66467bfe 100644 --- a/test/MC/RISCV/rv32-user-csr-names.s +++ b/test/MC/RISCV/rv32-user-csr-names.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -d - \ diff --git a/test/MC/RISCV/rv32a-valid.s b/test/MC/RISCV/rv32a-valid.s index d5662b2f720..1f66680c271 100644 --- a/test/MC/RISCV/rv32a-valid.s +++ b/test/MC/RISCV/rv32a-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+a -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+a -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv32b-aliases-valid.s b/test/MC/RISCV/rv32b-aliases-valid.s index 5ab0885d9fd..a5e4c92ee06 100644 --- a/test/MC/RISCV/rv32b-aliases-valid.s +++ b/test/MC/RISCV/rv32b-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-S-OBJ-NOALIAS %s # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-b \ # RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s diff --git a/test/MC/RISCV/rv32c-aliases-valid.s b/test/MC/RISCV/rv32c-aliases-valid.s index 75d795d059c..f2a03e7664e 100644 --- a/test/MC/RISCV/rv32c-aliases-valid.s +++ b/test/MC/RISCV/rv32c-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=riscv32 -mattr=+c -M no-aliases < %s \ +# RUN: llvm-mc -triple=riscv32 -mattr=+c -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \ # RUN: | llvm-objdump -d -M no-aliases - \ diff --git a/test/MC/RISCV/rv32c-only-valid.s b/test/MC/RISCV/rv32c-only-valid.s index 40f1b0f4835..0b10b3f0e90 100644 --- a/test/MC/RISCV/rv32c-only-valid.s +++ b/test/MC/RISCV/rv32c-only-valid.s @@ -1,17 +1,17 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -riscv-no-aliases -show-encoding \ # RUN: | FileCheck --check-prefix=CHECK-ASM %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+c < %s \ # RUN: | llvm-objdump --mattr=+c -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-OBJ %s # # RUN: not llvm-mc -triple riscv32 \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck --check-prefix=CHECK-NO-EXT %s # RUN: not llvm-mc -triple riscv64 -mattr=+c \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck --check-prefix=CHECK-NO-RV32 %s # RUN: not llvm-mc -triple riscv64 \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck --check-prefix=CHECK-NO-RV32-AND-EXT %s # CHECK-OBJ: c.jal 0x7fe diff --git a/test/MC/RISCV/rv32c-valid.s b/test/MC/RISCV/rv32c-valid.s index 0ce5f4489ca..07c935f0721 100644 --- a/test/MC/RISCV/rv32c-valid.s +++ b/test/MC/RISCV/rv32c-valid.s @@ -1,9 +1,9 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -riscv-no-aliases -show-encoding \ # 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: llvm-mc %s -triple=riscv64 -mattr=+c -M no-aliases -show-encoding \ +# 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 - \ diff --git a/test/MC/RISCV/rv32d-valid.s b/test/MC/RISCV/rv32d-valid.s index 5b8c0a8225d..f6254ebfff1 100644 --- a/test/MC/RISCV/rv32d-valid.s +++ b/test/MC/RISCV/rv32d-valid.s @@ -1,9 +1,9 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+d -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+d -riscv-no-aliases -show-encoding \ # 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-prefix=CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+d -M no-aliases -show-encoding \ +# 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 - \ diff --git a/test/MC/RISCV/rv32dc-valid.s b/test/MC/RISCV/rv32dc-valid.s index f049bfa6c34..f57311240f0 100644 --- a/test/MC/RISCV/rv32dc-valid.s +++ b/test/MC/RISCV/rv32dc-valid.s @@ -1,13 +1,13 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+d -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+d -riscv-no-aliases -show-encoding \ # 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-prefix=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+c \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-D %s -# RUN: not llvm-mc -triple riscv32 -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: not llvm-mc -triple riscv32 -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-DC %s # CHECK-ASM-AND-OBJ: c.fldsp fs0, 504(sp) diff --git a/test/MC/RISCV/rv32e-valid.s b/test/MC/RISCV/rv32e-valid.s index 5bf32b87f19..7befe83f72e 100644 --- a/test/MC/RISCV/rv32e-valid.s +++ b/test/MC/RISCV/rv32e-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -mattr=+e -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -mattr=+e -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+e < %s \ # RUN: | llvm-objdump -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv32f-valid.s b/test/MC/RISCV/rv32f-valid.s index 221f35b74d7..d6b853a4e53 100644 --- a/test/MC/RISCV/rv32f-valid.s +++ b/test/MC/RISCV/rv32f-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+f -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+f -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv32fc-aliases-valid.s b/test/MC/RISCV/rv32fc-aliases-valid.s index cbc15e90c35..44e4153901d 100644 --- a/test/MC/RISCV/rv32fc-aliases-valid.s +++ b/test/MC/RISCV/rv32fc-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+f -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+f -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,+f < %s \ # RUN: | llvm-objdump --mattr=+c,+f -M no-aliases -d - \ diff --git a/test/MC/RISCV/rv32fc-valid.s b/test/MC/RISCV/rv32fc-valid.s index 05cada669df..12bccdfbbdd 100644 --- a/test/MC/RISCV/rv32fc-valid.s +++ b/test/MC/RISCV/rv32fc-valid.s @@ -1,17 +1,17 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+f -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+f -riscv-no-aliases -show-encoding \ # 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-prefix=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+c \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-F %s # RUN: not llvm-mc -triple riscv32 \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-FC %s # RUN: not llvm-mc -triple riscv64 -mattr=+c,+f \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-RV32 %s # FIXME: error messages for rv64fc are misleading diff --git a/test/MC/RISCV/rv32i-aliases-invalid.s b/test/MC/RISCV/rv32i-aliases-invalid.s index 4f00f6c2036..3c1e232d937 100644 --- a/test/MC/RISCV/rv32i-aliases-invalid.s +++ b/test/MC/RISCV/rv32i-aliases-invalid.s @@ -1,5 +1,5 @@ # UNSUPPORTED: windows -# RUN: not llvm-mc -triple=riscv32 -M no-aliases < %s -o /dev/null 2>&1 | FileCheck %s +# RUN: not llvm-mc -triple=riscv32 -riscv-no-aliases < %s -o /dev/null 2>&1 | FileCheck %s # RUN: not llvm-mc -triple=riscv32 < %s -o /dev/null 2>&1 | FileCheck %s # TODO ld diff --git a/test/MC/RISCV/rv32i-aliases-valid.s b/test/MC/RISCV/rv32i-aliases-valid.s index 499accac7be..566680d754f 100644 --- a/test/MC/RISCV/rv32i-aliases-valid.s +++ b/test/MC/RISCV/rv32i-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # RUN: llvm-mc %s -triple=riscv32 \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s diff --git a/test/MC/RISCV/rv32i-valid.s b/test/MC/RISCV/rv32i-valid.s index c2a88415c72..64883e8b5ba 100644 --- a/test/MC/RISCV/rv32i-valid.s +++ b/test/MC/RISCV/rv32i-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 < %s \ # RUN: | llvm-objdump -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv32m-valid.s b/test/MC/RISCV/rv32m-valid.s index d0612c4ed30..8fb54bba120 100644 --- a/test/MC/RISCV/rv32m-valid.s +++ b/test/MC/RISCV/rv32m-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+m -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+m -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+m -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+m -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv32zbb-valid.s b/test/MC/RISCV/rv32zbb-valid.s index 8075869c2c8..27f5f04662c 100644 --- a/test/MC/RISCV/rv32zbb-valid.s +++ b/test/MC/RISCV/rv32zbb-valid.s @@ -11,9 +11,9 @@ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # With Bitmanip base extension: -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbb -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbb -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -riscv-no-aliases -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 -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv32zbbp-only-valid.s b/test/MC/RISCV/rv32zbbp-only-valid.s index e9d5c5fa4b8..68f8337b219 100644 --- a/test/MC/RISCV/rv32zbbp-only-valid.s +++ b/test/MC/RISCV/rv32zbbp-only-valid.s @@ -6,7 +6,7 @@ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # With Bitmanip base extension: -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbb -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zbb -riscv-no-aliases -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 -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv32zbproposedc-valid.s b/test/MC/RISCV/rv32zbproposedc-valid.s index e635d3ab252..dd911d26139 100644 --- a/test/MC/RISCV/rv32zbproposedc-valid.s +++ b/test/MC/RISCV/rv32zbproposedc-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+experimental-zbproposedc -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+experimental-zbproposedc -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv32zfh-valid.s b/test/MC/RISCV/rv32zfh-valid.s index 21ded289dce..f257ad0d91f 100644 --- a/test/MC/RISCV/rv32zfh-valid.s +++ b/test/MC/RISCV/rv32zfh-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zfh -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+experimental-zfh < %s \ # RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv64-machine-csr-names.s b/test/MC/RISCV/rv64-machine-csr-names.s index a2c53dbcc43..bf0d1b68898 100644 --- a/test/MC/RISCV/rv64-machine-csr-names.s +++ b/test/MC/RISCV/rv64-machine-csr-names.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-objdump -d - \ diff --git a/test/MC/RISCV/rv64-user-csr-names.s b/test/MC/RISCV/rv64-user-csr-names.s index cf30b3bd7e2..6f54c7f2eed 100644 --- a/test/MC/RISCV/rv64-user-csr-names.s +++ b/test/MC/RISCV/rv64-user-csr-names.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-objdump -d - \ diff --git a/test/MC/RISCV/rv64a-aliases-valid.s b/test/MC/RISCV/rv64a-aliases-valid.s index 577010f97c2..09999536af5 100644 --- a/test/MC/RISCV/rv64a-aliases-valid.s +++ b/test/MC/RISCV/rv64a-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+a \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s diff --git a/test/MC/RISCV/rv64a-valid.s b/test/MC/RISCV/rv64a-valid.s index 1336128588f..0dcf35be261 100644 --- a/test/MC/RISCV/rv64a-valid.s +++ b/test/MC/RISCV/rv64a-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv64b-aliases-valid.s b/test/MC/RISCV/rv64b-aliases-valid.s index 267efcf5b7f..ab9521dd592 100644 --- a/test/MC/RISCV/rv64b-aliases-valid.s +++ b/test/MC/RISCV/rv64b-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-S-OBJ-NOALIAS %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-b \ # RUN: | FileCheck -check-prefixes=CHECK-S-OBJ %s diff --git a/test/MC/RISCV/rv64c-aliases-valid.s b/test/MC/RISCV/rv64c-aliases-valid.s index 16d9dfeecfa..db6ea5ec5ac 100644 --- a/test/MC/RISCV/rv64c-aliases-valid.s +++ b/test/MC/RISCV/rv64c-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -triple=riscv64 -mattr=+c -M no-aliases < %s \ +# RUN: llvm-mc -triple=riscv64 -mattr=+c -riscv-no-aliases < %s \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+c < %s \ # RUN: | llvm-objdump -d -M no-aliases - \ diff --git a/test/MC/RISCV/rv64c-hints-valid.s b/test/MC/RISCV/rv64c-hints-valid.s index 66a7fd1fa39..db1fcfec8db 100644 --- a/test/MC/RISCV/rv64c-hints-valid.s +++ b/test/MC/RISCV/rv64c-hints-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple riscv64 -mattr=+c -M no-aliases -show-encoding \ +# 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 -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv64c-valid.s b/test/MC/RISCV/rv64c-valid.s index 9c7ba5de8ed..36bd3531732 100644 --- a/test/MC/RISCV/rv64c-valid.s +++ b/test/MC/RISCV/rv64c-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+c -M no-aliases -show-encoding \ +# 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 - \ @@ -6,10 +6,10 @@ # # # RUN: not llvm-mc -triple riscv64 \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT %s # RUN: not llvm-mc -triple riscv32 -mattr=+c \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-RV64 %s # TODO: more exhaustive testing of immediate encoding. diff --git a/test/MC/RISCV/rv64d-aliases-valid.s b/test/MC/RISCV/rv64d-aliases-valid.s index c23aa84ddea..17a44b4f537 100644 --- a/test/MC/RISCV/rv64d-aliases-valid.s +++ b/test/MC/RISCV/rv64d-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+d -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+d -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+d \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s diff --git a/test/MC/RISCV/rv64d-valid.s b/test/MC/RISCV/rv64d-valid.s index 312ab8a9450..92c5205f21c 100644 --- a/test/MC/RISCV/rv64d-valid.s +++ b/test/MC/RISCV/rv64d-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+d -M no-aliases -show-encoding \ +# 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 - \ diff --git a/test/MC/RISCV/rv64dc-valid.s b/test/MC/RISCV/rv64dc-valid.s index 26966df1e9d..0e237e8224e 100644 --- a/test/MC/RISCV/rv64dc-valid.s +++ b/test/MC/RISCV/rv64dc-valid.s @@ -1,13 +1,13 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+d -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+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=+c,+d < %s \ # RUN: | llvm-objdump --mattr=+c,+d -M no-aliases -d -r - \ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv64 -mattr=+c \ -# RUN: -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-D %s -# RUN: not llvm-mc -triple riscv64 -M no-aliases -show-encoding < %s 2>&1 \ +# RUN: not llvm-mc -triple riscv64 -riscv-no-aliases -show-encoding < %s 2>&1 \ # RUN: | FileCheck -check-prefixes=CHECK-NO-EXT-DC %s # CHECK-ASM-AND-OBJ: c.fldsp fs0, 504(sp) diff --git a/test/MC/RISCV/rv64f-aliases-valid.s b/test/MC/RISCV/rv64f-aliases-valid.s index d04b0b53af0..488d52fbb7f 100644 --- a/test/MC/RISCV/rv64f-aliases-valid.s +++ b/test/MC/RISCV/rv64f-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+f \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s diff --git a/test/MC/RISCV/rv64f-valid.s b/test/MC/RISCV/rv64f-valid.s index 1f805a11dc1..5a6551f602c 100644 --- a/test/MC/RISCV/rv64f-valid.s +++ b/test/MC/RISCV/rv64f-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv64i-aliases-invalid.s b/test/MC/RISCV/rv64i-aliases-invalid.s index cdae692c1cd..10c2857e983 100644 --- a/test/MC/RISCV/rv64i-aliases-invalid.s +++ b/test/MC/RISCV/rv64i-aliases-invalid.s @@ -1,5 +1,5 @@ # UNSUPPORTED: windows -# RUN: not llvm-mc -triple=riscv64 -M no-aliases < %s -o /dev/null 2>&1 | FileCheck %s +# RUN: not llvm-mc -triple=riscv64 -riscv-no-aliases < %s -o /dev/null 2>&1 | FileCheck %s # RUN: not llvm-mc -triple=riscv64 < %s 2>&1 -o /dev/null | FileCheck %s li t5, 0x10000000000000000 # CHECK: :[[@LINE]]:8: error: unknown operand diff --git a/test/MC/RISCV/rv64i-aliases-valid.s b/test/MC/RISCV/rv64i-aliases-valid.s index 38049e4daa5..a51a87b23c5 100644 --- a/test/MC/RISCV/rv64i-aliases-valid.s +++ b/test/MC/RISCV/rv64i-aliases-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # RUN: llvm-mc %s -triple=riscv64 \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s diff --git a/test/MC/RISCV/rv64i-valid.s b/test/MC/RISCV/rv64i-valid.s index 57d4da25268..b3df45e22eb 100644 --- a/test/MC/RISCV/rv64i-valid.s +++ b/test/MC/RISCV/rv64i-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv64m-valid.s b/test/MC/RISCV/rv64m-valid.s index 21db06485f2..246f74fe9eb 100644 --- a/test/MC/RISCV/rv64m-valid.s +++ b/test/MC/RISCV/rv64m-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+m -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+m -riscv-no-aliases -show-encoding \ # 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 - \ diff --git a/test/MC/RISCV/rv64zbb-valid.s b/test/MC/RISCV/rv64zbb-valid.s index 666a065e0c1..6cd61d53841 100644 --- a/test/MC/RISCV/rv64zbb-valid.s +++ b/test/MC/RISCV/rv64zbb-valid.s @@ -6,7 +6,7 @@ # RUN: | FileCheck --check-prefix=CHECK-ASM-AND-OBJ %s # With Bitmanip base extension: -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zbb -riscv-no-aliases -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 -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv64zbproposedc-valid.s b/test/MC/RISCV/rv64zbproposedc-valid.s index bde37de285e..a30f3bb8547 100644 --- a/test/MC/RISCV/rv64zbproposedc-valid.s +++ b/test/MC/RISCV/rv64zbproposedc-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+experimental-zbproposedc,+experimental-b -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,+experimental-zbproposedc,+experimental-b < %s \ # RUN: | llvm-objdump --mattr=+c,+experimental-zbproposedc,+experimental-b -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rv64zfh-valid.s b/test/MC/RISCV/rv64zfh-valid.s index 83eec092ac5..49aa4e7aaae 100644 --- a/test/MC/RISCV/rv64zfh-valid.s +++ b/test/MC/RISCV/rv64zfh-valid.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+experimental-zfh < %s \ # RUN: | llvm-objdump --mattr=+experimental-zfh -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rva-aliases-valid.s b/test/MC/RISCV/rva-aliases-valid.s index 7b33407a3b3..57d96b537de 100644 --- a/test/MC/RISCV/rva-aliases-valid.s +++ b/test/MC/RISCV/rva-aliases-valid.s @@ -1,8 +1,8 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+a -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+a -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-S-NOALIAS,CHECK-S-OBJ-NOALIAS %s # RUN: llvm-mc %s -triple=riscv32 -mattr=+a \ # RUN: | FileCheck -check-prefixes=CHECK-S,CHECK-S-OBJ %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -M no-aliases\ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+a -riscv-no-aliases\ # RUN: | FileCheck -check-prefixes=CHECK-S-NOALIAS,CHECK-S-OBJ-NOALIAS %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+a \ # RUN: | FileCheck -check-prefixes=CHECK-S,CHECK-S-OBJ %s diff --git a/test/MC/RISCV/rvc-aliases-valid.s b/test/MC/RISCV/rvc-aliases-valid.s index c0909d0b463..e6fd05435ec 100644 --- a/test/MC/RISCV/rvc-aliases-valid.s +++ b/test/MC/RISCV/rvc-aliases-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+c -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+c -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \ # RUN: | llvm-objdump -M no-aliases -d - \ diff --git a/test/MC/RISCV/rvc-hints-valid.s b/test/MC/RISCV/rvc-hints-valid.s index ffa5947c0b4..d75c9d019a2 100644 --- a/test/MC/RISCV/rvc-hints-valid.s +++ b/test/MC/RISCV/rvc-hints-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-ASM,CHECK-ASM-AND-OBJ %s -# RUN: llvm-mc %s -triple riscv64 -mattr=+c -M no-aliases -show-encoding \ +# 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=riscv32 -mattr=+c < %s \ # RUN: | llvm-objdump -M no-aliases -d -r - \ diff --git a/test/MC/RISCV/rvd-aliases-valid.s b/test/MC/RISCV/rvd-aliases-valid.s index 434ee04b9f7..c46c0e3e2df 100644 --- a/test/MC/RISCV/rvd-aliases-valid.s +++ b/test/MC/RISCV/rvd-aliases-valid.s @@ -1,8 +1,8 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+d -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+d -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv32 -mattr=+d \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+d -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+d -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+d \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s diff --git a/test/MC/RISCV/rvdc-aliases-valid.s b/test/MC/RISCV/rvdc-aliases-valid.s index 63cead1716d..a1e0cc27877 100644 --- a/test/MC/RISCV/rvdc-aliases-valid.s +++ b/test/MC/RISCV/rvdc-aliases-valid.s @@ -1,6 +1,6 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+d -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+c,+d -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+d -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+c,+d -riscv-no-aliases \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,+d < %s \ # RUN: | llvm-objdump --mattr=+c,+d -M no-aliases -d - \ diff --git a/test/MC/RISCV/rvf-aliases-valid.s b/test/MC/RISCV/rvf-aliases-valid.s index 55948415b13..3e34d88dc7b 100644 --- a/test/MC/RISCV/rvf-aliases-valid.s +++ b/test/MC/RISCV/rvf-aliases-valid.s @@ -1,8 +1,8 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+f -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+f -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv32 -mattr=+f \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+f -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+f \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s diff --git a/test/MC/RISCV/rvf-user-csr-names.s b/test/MC/RISCV/rvf-user-csr-names.s index 697c3334d62..7b7569d4c6c 100644 --- a/test/MC/RISCV/rvf-user-csr-names.s +++ b/test/MC/RISCV/rvf-user-csr-names.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -mattr=+f -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -mattr=+f -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+f < %s \ # RUN: | llvm-objdump -d --mattr=+f - \ @@ -7,7 +7,7 @@ # RUN: | llvm-objdump -d - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS-NO-F %s # -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -mattr=+f -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -mattr=+f -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+f < %s \ # RUN: | llvm-objdump -d --mattr=+f - \ diff --git a/test/MC/RISCV/rvv-user-csr-names.s b/test/MC/RISCV/rvv-user-csr-names.s index 05b1a918d40..35651c540ec 100644 --- a/test/MC/RISCV/rvv-user-csr-names.s +++ b/test/MC/RISCV/rvv-user-csr-names.s @@ -1,10 +1,10 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -mattr=+f -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -mattr=+f -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+v < %s \ # RUN: | llvm-objdump -d --mattr=+v - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS %s # -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -mattr=+f -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -mattr=+f -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+v < %s \ # RUN: | llvm-objdump -d --mattr=+v - \ diff --git a/test/MC/RISCV/rvv/aliases.s b/test/MC/RISCV/rvv/aliases.s index 9a7314fa72b..ba41594baa7 100644 --- a/test/MC/RISCV/rvv/aliases.s +++ b/test/MC/RISCV/rvv/aliases.s @@ -1,6 +1,6 @@ # RUN: llvm-mc --triple=riscv64 -mattr +experimental-v < %s --show-encoding 2>&1 \ # RUN: -mattr +d | FileCheck --check-prefix=ALIAS %s -# RUN: llvm-mc --triple=riscv64 -mattr=+experimental-v -M no-aliases < %s \ +# RUN: llvm-mc --triple=riscv64 -mattr=+experimental-v --riscv-no-aliases < %s \ # RUN: -mattr +d --show-encoding 2>&1 | FileCheck --check-prefix=NO-ALIAS %s # ALIAS: vwcvt.x.x.v v2, v1, v0.t # encoding: [0x57,0x61,0x10,0xc4] diff --git a/test/MC/RISCV/rvv/fothers.s b/test/MC/RISCV/rvv/fothers.s index 87f1c0f2298..dfd49d5cc4c 100644 --- a/test/MC/RISCV/rvv/fothers.s +++ b/test/MC/RISCV/rvv/fothers.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-v %s \ -# RUN: --mattr=+f -M no-aliases \ +# RUN: --mattr=+f --riscv-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 diff --git a/test/MC/RISCV/rvv/load.s b/test/MC/RISCV/rvv/load.s index c167f088115..8b1c46599b7 100644 --- a/test/MC/RISCV/rvv/load.s +++ b/test/MC/RISCV/rvv/load.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-v %s \ -# RUN: -M no-aliases | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST +# RUN: --riscv-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 -triple=riscv64 -filetype=obj --mattr=+experimental-v %s \ diff --git a/test/MC/RISCV/rvv/others.s b/test/MC/RISCV/rvv/others.s index 8dd77dbc4eb..8e7c6ac3478 100644 --- a/test/MC/RISCV/rvv/others.s +++ b/test/MC/RISCV/rvv/others.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-v %s \ -# RUN: -M no-aliases | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST +# RUN: --riscv-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 -triple=riscv64 -filetype=obj --mattr=+experimental-v %s \ diff --git a/test/MC/RISCV/rvv/store.s b/test/MC/RISCV/rvv/store.s index 1b6768ccc3f..e22f6b4efe8 100644 --- a/test/MC/RISCV/rvv/store.s +++ b/test/MC/RISCV/rvv/store.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-v %s \ -# RUN: -M no-aliases | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST +# RUN: --riscv-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 -triple=riscv64 -filetype=obj --mattr=+experimental-v %s \ diff --git a/test/MC/RISCV/rvv/zvlsseg.s b/test/MC/RISCV/rvv/zvlsseg.s index a867828a82f..99f5e157131 100644 --- a/test/MC/RISCV/rvv/zvlsseg.s +++ b/test/MC/RISCV/rvv/zvlsseg.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -triple=riscv64 -show-encoding --mattr=+experimental-v %s \ -# RUN: --mattr=+experimental-zvlsseg -M no-aliases \ +# RUN: --mattr=+experimental-zvlsseg --riscv-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 diff --git a/test/MC/RISCV/rvzfh-aliases-valid.s b/test/MC/RISCV/rvzfh-aliases-valid.s index 2c15701c934..32ebda68fc2 100644 --- a/test/MC/RISCV/rvzfh-aliases-valid.s +++ b/test/MC/RISCV/rvzfh-aliases-valid.s @@ -1,8 +1,8 @@ -# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zfh -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zfh -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv32 -mattr=+experimental-zfh \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s -# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -M no-aliases \ +# RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh -riscv-no-aliases \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc %s -triple=riscv64 -mattr=+experimental-zfh \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s diff --git a/test/MC/RISCV/supervisor-csr-names.s b/test/MC/RISCV/supervisor-csr-names.s index 5c474378739..fa6dc6abff3 100644 --- a/test/MC/RISCV/supervisor-csr-names.s +++ b/test/MC/RISCV/supervisor-csr-names.s @@ -1,10 +1,10 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -d - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS %s # -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-objdump -d - \ diff --git a/test/MC/RISCV/user-csr-names.s b/test/MC/RISCV/user-csr-names.s index 37eeae901d7..f2759d277ce 100644 --- a/test/MC/RISCV/user-csr-names.s +++ b/test/MC/RISCV/user-csr-names.s @@ -1,10 +1,10 @@ -# RUN: llvm-mc %s -triple=riscv32 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -d - \ # RUN: | FileCheck -check-prefix=CHECK-INST-ALIAS %s # -# RUN: llvm-mc %s -triple=riscv64 -M no-aliases -show-encoding \ +# RUN: llvm-mc %s -triple=riscv64 -riscv-no-aliases -show-encoding \ # RUN: | FileCheck -check-prefixes=CHECK-INST,CHECK-ENC %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-objdump -d - \