diff options
58 files changed, 100 insertions, 80 deletions
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp index aa383f32e05..8b5fe6dd825 100644 --- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp +++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.cpp @@ -45,6 +45,24 @@ static cl::opt<bool> "ABI names (such as x2 instead of sp)"), cl::init(false), cl::Hidden); +// The command-line flags above are used by llvm-mc and llc. They can be used by +// `llvm-objdump`, but we override their values here to handle options passed to +// `llvm-objdump` with `-M` (which matches GNU objdump). There did not seem to +// be an easier way to allow these options in all these tools, without doing it +// this way. +bool RISCVInstPrinter::applyTargetSpecificCLOption(StringRef Opt) { + if (Opt == "no-aliases") { + NoAliases = true; + return true; + } + if (Opt == "numeric") { + ArchRegNames = true; + return true; + } + + return false; +} + void RISCVInstPrinter::printInst(const MCInst *MI, raw_ostream &O, StringRef Annot, const MCSubtargetInfo &STI) { bool Res = false; diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h index de4dd464ae3..189d72626f3 100644 --- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h +++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVInstPrinter.h @@ -25,6 +25,8 @@ public: const MCRegisterInfo &MRI) : MCInstPrinter(MAI, MII, MRI) {} + bool applyTargetSpecificCLOption(StringRef Opt) override; + void printInst(const MCInst *MI, raw_ostream &O, StringRef Annot, const MCSubtargetInfo &STI) override; void printRegName(raw_ostream &O, unsigned RegNo) const override; diff --git a/llvm/test/CodeGen/RISCV/compress-inline-asm.ll b/llvm/test/CodeGen/RISCV/compress-inline-asm.ll index 9b84bdeaf5d..fca4d6d1c70 100644 --- a/llvm/test/CodeGen/RISCV/compress-inline-asm.ll +++ b/llvm/test/CodeGen/RISCV/compress-inline-asm.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=riscv32 -mattr=+c -filetype=obj < %s\ -; RUN: | llvm-objdump -triple=riscv32 -mattr=+c -d -riscv-no-aliases -\ +; RUN: | llvm-objdump -triple=riscv32 -mattr=+c -d -M no-aliases -\ ; RUN: | FileCheck -check-prefix=CHECK %s @ext = external global i32 diff --git a/llvm/test/CodeGen/RISCV/compress.ll b/llvm/test/CodeGen/RISCV/compress.ll index 2f0d4e9f257..6ee215dad42 100644 --- a/llvm/test/CodeGen/RISCV/compress.ll +++ b/llvm/test/CodeGen/RISCV/compress.ll @@ -1,6 +1,6 @@ ; RUN: llc -mtriple=riscv32 -mattr=+c -filetype=obj \ ; RUN: -disable-block-placement < %s \ -; RUN: | llvm-objdump -d -triple=riscv32 -mattr=+c -riscv-no-aliases - \ +; RUN: | llvm-objdump -d -triple=riscv32 -mattr=+c -M no-aliases - \ ; RUN: | FileCheck -check-prefix=RV32IC %s ; This acts as a sanity check for the codegen instruction compression path, diff --git a/llvm/test/CodeGen/RISCV/option-norvc.ll b/llvm/test/CodeGen/RISCV/option-norvc.ll index 381fb37735d..db96a1106bb 100644 --- a/llvm/test/CodeGen/RISCV/option-norvc.ll +++ b/llvm/test/CodeGen/RISCV/option-norvc.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=riscv32 -mattr=+c -filetype=obj < %s\ -; RUN: | llvm-objdump -triple=riscv32 -mattr=+c -d -riscv-no-aliases -\ +; RUN: | llvm-objdump -triple=riscv32 -mattr=+c -d -M no-aliases -\ ; RUN: | FileCheck -check-prefix=CHECK %s ; This test demonstrates that .option norvc has no effect on codegen when diff --git a/llvm/test/CodeGen/RISCV/option-rvc.ll b/llvm/test/CodeGen/RISCV/option-rvc.ll index a0f09c052a4..9d7f1940097 100644 --- a/llvm/test/CodeGen/RISCV/option-rvc.ll +++ b/llvm/test/CodeGen/RISCV/option-rvc.ll @@ -1,5 +1,5 @@ ; RUN: llc -mtriple=riscv32 -filetype=obj < %s\ -; RUN: | llvm-objdump -triple=riscv32 -mattr=+c -d -riscv-no-aliases -\ +; RUN: | llvm-objdump -triple=riscv32 -mattr=+c -d -M no-aliases -\ ; RUN: | FileCheck -check-prefix=CHECK %s ; This test demonstrates that .option norvc has no effect on codegen when diff --git a/llvm/test/MC/RISCV/align.s b/llvm/test/MC/RISCV/align.s index b4b3e6aa778..c24df2621d2 100644 --- a/llvm/test/MC/RISCV/align.s +++ b/llvm/test/MC/RISCV/align.s @@ -2,28 +2,28 @@ # Relaxation enabled: # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+relax < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefix=RELAX-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+relax < %s \ # RUN: | llvm-readobj -r | FileCheck -check-prefix=RELAX-RELOC %s # Relaxation disabled: # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=-relax < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefix=NORELAX-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=-relax < %s \ # RUN: | llvm-readobj -r | FileCheck -check-prefix=NORELAX-RELOC %s # Relaxation enabled with C extension: # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,+relax < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefix=C-EXT-RELAX-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,+relax < %s \ # RUN: | llvm-readobj -r | FileCheck -check-prefix=C-EXT-RELAX-RELOC %s # Relaxation disabled with C extension: # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,-relax < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefix=C-EXT-NORELAX-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,-relax < %s \ # RUN: | llvm-readobj -r | FileCheck -check-prefix=C-EXT-NORELAX-RELOC %s diff --git a/llvm/test/MC/RISCV/cnop.s b/llvm/test/MC/RISCV/cnop.s index 1ac75ec7892..20cd3724fe0 100644 --- a/llvm/test/MC/RISCV/cnop.s +++ b/llvm/test/MC/RISCV/cnop.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=CHECK-INST %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=CHECK-INST %s # alpha and main are 8 byte alignment # but the alpha function's size is 6 diff --git a/llvm/test/MC/RISCV/compress-cjal.s b/llvm/test/MC/RISCV/compress-cjal.s index a77297f6947..2313c3ef04a 100644 --- a/llvm/test/MC/RISCV/compress-cjal.s +++ b/llvm/test/MC/RISCV/compress-cjal.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 riscv32 -mattr=+c -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv32 -mattr=+c -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv32 -mattr=+c -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # c.jal is an rv32 only instruction. diff --git a/llvm/test/MC/RISCV/compress-rv32d.s b/llvm/test/MC/RISCV/compress-rv32d.s index eac0321778e..8cb11309715 100644 --- a/llvm/test/MC/RISCV/compress-rv32d.s +++ b/llvm/test/MC/RISCV/compress-rv32d.s @@ -6,7 +6,7 @@ # RUN: | llvm-objdump -triple riscv32 -mattr=+c,+d -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+d -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv32 -mattr=+c,+d -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv32 -mattr=+c,+d -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+d -show-encoding < %s \ @@ -17,7 +17,7 @@ # RUN: | llvm-objdump -triple riscv64 -mattr=+c,+d -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -mattr=+c,+d -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv64 -mattr=+c,+d -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv64 -mattr=+c,+d -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # Tests double precision floating point instructions available in rv32 and in rv64. diff --git a/llvm/test/MC/RISCV/compress-rv32f.s b/llvm/test/MC/RISCV/compress-rv32f.s index 482e528c9ee..69fc4f31693 100644 --- a/llvm/test/MC/RISCV/compress-rv32f.s +++ b/llvm/test/MC/RISCV/compress-rv32f.s @@ -6,7 +6,7 @@ # RUN: | llvm-objdump -triple riscv32 -mattr=+c,+f -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv32 -mattr=+c,+f -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv32 -mattr=+c,+f -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv32 -mattr=+c,+f -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # Instructions that are 32 bit only. diff --git a/llvm/test/MC/RISCV/compress-rv32i.s b/llvm/test/MC/RISCV/compress-rv32i.s index 1f8835faf35..909e4925420 100644 --- a/llvm/test/MC/RISCV/compress-rv32i.s +++ b/llvm/test/MC/RISCV/compress-rv32i.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 riscv32 -mattr=+c -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv32 -mattr=+c -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv32 -mattr=+c -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # RUN: llvm-mc -triple riscv64 -mattr=+c -show-encoding < %s \ @@ -17,7 +17,7 @@ # RUN: | llvm-objdump -triple riscv64 -mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -mattr=+c -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv64 -mattr=+c -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv64 -mattr=+c -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # CHECK-BYTES: 2e 85 diff --git a/llvm/test/MC/RISCV/compress-rv64i.s b/llvm/test/MC/RISCV/compress-rv64i.s index 7e887ff80d6..53cf7155a4e 100644 --- a/llvm/test/MC/RISCV/compress-rv64i.s +++ b/llvm/test/MC/RISCV/compress-rv64i.s @@ -6,7 +6,7 @@ # RUN: | llvm-objdump -triple riscv64 -mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -mattr=+c -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv64 -mattr=+c -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv64 -mattr=+c -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # Tests compressed instructions available in rv64 and not in rv32. diff --git a/llvm/test/MC/RISCV/csr-aliases.s b/llvm/test/MC/RISCV/csr-aliases.s index 3c25c575e0a..185448de6a6 100644 --- a/llvm/test/MC/RISCV/csr-aliases.s +++ b/llvm/test/MC/RISCV/csr-aliases.s @@ -1,5 +1,5 @@ # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+f < %s \ -# RUN: | llvm-objdump -d -mattr=+f -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+f -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+f < %s \ # RUN: | llvm-objdump -d -mattr=+f - \ @@ -18,7 +18,7 @@ # RUN: | FileCheck -check-prefix=CHECK-EXT-F-OFF %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+f < %s \ -# RUN: | llvm-objdump -d -mattr=+f -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+f -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+f < %s \ # RUN: | llvm-objdump -d -mattr=+f - \ diff --git a/llvm/test/MC/RISCV/fixups-compressed.s b/llvm/test/MC/RISCV/fixups-compressed.s index 7ae6274bf27..3c39bf31952 100644 --- a/llvm/test/MC/RISCV/fixups-compressed.s +++ b/llvm/test/MC/RISCV/fixups-compressed.s @@ -1,7 +1,7 @@ # RUN: llvm-mc %s -triple riscv32 -mattr=+c -show-encoding \ # RUN: | FileCheck -check-prefix=CHECK-FIXUP %s # RUN: llvm-mc -triple riscv32 -filetype=obj -mattr=+c < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=CHECK-INSTR %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=CHECK-INSTR %s # RUN: llvm-mc -filetype=obj -mattr=+c -triple=riscv32 %s \ # RUN: | llvm-readobj -r | FileCheck %s -check-prefix=CHECK-REL diff --git a/llvm/test/MC/RISCV/fixups.s b/llvm/test/MC/RISCV/fixups.s index ca0ee131fb8..1ec70485734 100644 --- a/llvm/test/MC/RISCV/fixups.s +++ b/llvm/test/MC/RISCV/fixups.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -M no-aliases -d - \ # RUN: | FileCheck -check-prefix=CHECK-INSTR %s # RUN: llvm-mc -filetype=obj -triple=riscv32 %s \ # RUN: | llvm-readobj -r | FileCheck %s -check-prefix=CHECK-REL diff --git a/llvm/test/MC/RISCV/numeric-reg-names-d.s b/llvm/test/MC/RISCV/numeric-reg-names-d.s index 968d3f07490..97d3b58add9 100644 --- a/llvm/test/MC/RISCV/numeric-reg-names-d.s +++ b/llvm/test/MC/RISCV/numeric-reg-names-d.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -mattr=+f,+d < %s -riscv-arch-reg-names \ # RUN: | FileCheck -check-prefix=CHECK-NUMERIC %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+f,+d < %s \ -# RUN: | llvm-objdump -mattr=+f,+d -d -riscv-arch-reg-names - \ +# RUN: | llvm-objdump -mattr=+f,+d -d -M numeric - \ # RUN: | FileCheck -check-prefix=CHECK-NUMERIC %s # CHECK-NUMERIC: fsqrt.d f10, f0 diff --git a/llvm/test/MC/RISCV/numeric-reg-names-f.s b/llvm/test/MC/RISCV/numeric-reg-names-f.s index 5a5fc020d52..2f79648839e 100644 --- a/llvm/test/MC/RISCV/numeric-reg-names-f.s +++ b/llvm/test/MC/RISCV/numeric-reg-names-f.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 -mattr=+f < %s -riscv-arch-reg-names \ # RUN: | FileCheck -check-prefix=CHECK-NUMERIC %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+f < %s \ -# RUN: | llvm-objdump -mattr=+f -d -riscv-arch-reg-names - \ +# RUN: | llvm-objdump -mattr=+f -d -M numeric - \ # RUN: | FileCheck -check-prefix=CHECK-NUMERIC %s # CHECK-NUMERIC: fsqrt.s f10, f0 diff --git a/llvm/test/MC/RISCV/numeric-reg-names.s b/llvm/test/MC/RISCV/numeric-reg-names.s index 89dafeb5ded..e7a2d889d31 100644 --- a/llvm/test/MC/RISCV/numeric-reg-names.s +++ b/llvm/test/MC/RISCV/numeric-reg-names.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -triple riscv32 < %s -riscv-arch-reg-names \ # RUN: | FileCheck -check-prefix=CHECK-NUMERIC %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ -# RUN: | llvm-objdump -d -riscv-arch-reg-names - \ +# RUN: | llvm-objdump -d -M numeric - \ # RUN: | FileCheck -check-prefix=CHECK-NUMERIC %s # CHECK-NUMERIC: addi x10, x0, 1 diff --git a/llvm/test/MC/RISCV/option-mix.s b/llvm/test/MC/RISCV/option-mix.s index eccbfe0ce57..633b85dd326 100644 --- a/llvm/test/MC/RISCV/option-mix.s +++ b/llvm/test/MC/RISCV/option-mix.s @@ -1,9 +1,9 @@ # RUN: llvm-mc %s -triple=riscv32 | FileCheck -check-prefix=ASM %s # RUN: llvm-mc %s -triple=riscv64 | FileCheck -check-prefix=ASM %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=DISASM %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=DISASM %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=DISASM %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=DISASM %s # Checks change of options does not cause error: could not find corresponding %pcrel_hi # when assembling pseudoinstruction and its extended form. diff --git a/llvm/test/MC/RISCV/option-rvc.s b/llvm/test/MC/RISCV/option-rvc.s index 129eae5bf79..e1762e7f2f1 100644 --- a/llvm/test/MC/RISCV/option-rvc.s +++ b/llvm/test/MC/RISCV/option-rvc.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 riscv32 -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv32 -mattr=+c -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv32 -mattr=+c -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # RUN: llvm-mc -triple riscv64 -show-encoding < %s \ @@ -17,7 +17,7 @@ # RUN: | llvm-objdump -triple riscv64 -mattr=+c -d - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-ALIAS %s # RUN: llvm-mc -triple riscv64 -filetype=obj < %s \ -# RUN: | llvm-objdump -triple riscv64 -mattr=+c -d -riscv-no-aliases - \ +# RUN: | llvm-objdump -triple riscv64 -mattr=+c -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-BYTES,CHECK-INST %s # CHECK-BYTES: 13 85 05 00 diff --git a/llvm/test/MC/RISCV/priv-valid.s b/llvm/test/MC/RISCV/priv-valid.s index 88d35f2f9ff..4c79dc41a46 100644 --- a/llvm/test/MC/RISCV/priv-valid.s +++ b/llvm/test/MC/RISCV/priv-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -M no-aliases -d - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ -# RUN: | llvm-objdump -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -M no-aliases -d - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # CHECK-INST: uret diff --git a/llvm/test/MC/RISCV/rv32-relaxation.s b/llvm/test/MC/RISCV/rv32-relaxation.s index 09a833a790f..5a54312ee67 100644 --- a/llvm/test/MC/RISCV/rv32-relaxation.s +++ b/llvm/test/MC/RISCV/rv32-relaxation.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=INSTR %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=INSTR %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,+relax < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=RELAX-INSTR %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=RELAX-INSTR %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+c,+relax < %s \ # RUN: | llvm-readobj -r | FileCheck -check-prefix=RELAX-RELOC %s diff --git a/llvm/test/MC/RISCV/rv32a-valid.s b/llvm/test/MC/RISCV/rv32a-valid.s index 9b1b9f92c4c..55b11b2a33a 100644 --- a/llvm/test/MC/RISCV/rv32a-valid.s +++ b/llvm/test/MC/RISCV/rv32a-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+a -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+a < %s \ -# RUN: | llvm-objdump -mattr=+a -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+a -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: lr.w t0, (t1) diff --git a/llvm/test/MC/RISCV/rv32c-aliases-valid.s b/llvm/test/MC/RISCV/rv32c-aliases-valid.s index f9c07e23a84..6f8da5684b1 100644 --- a/llvm/test/MC/RISCV/rv32c-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv32c-aliases-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # The following check prefixes are used in this test: diff --git a/llvm/test/MC/RISCV/rv32c-only-valid.s b/llvm/test/MC/RISCV/rv32c-only-valid.s index b2fc4152594..e75fa92feef 100644 --- a/llvm/test/MC/RISCV/rv32c-only-valid.s +++ b/llvm/test/MC/RISCV/rv32c-only-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+c -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 \ diff --git a/llvm/test/MC/RISCV/rv32c-valid.s b/llvm/test/MC/RISCV/rv32c-valid.s index b72e4922a57..a13e0d27943 100644 --- a/llvm/test/MC/RISCV/rv32c-valid.s +++ b/llvm/test/MC/RISCV/rv32c-valid.s @@ -1,12 +1,12 @@ # 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 -riscv-no-aliases -d -r - \ +# 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 -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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+c -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,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 551a51500dd..317e6211663 100644 --- a/llvm/test/MC/RISCV/rv32d-valid.s +++ b/llvm/test/MC/RISCV/rv32d-valid.s @@ -1,12 +1,12 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+d -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+d -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/RISCV/rv32dc-valid.s b/llvm/test/MC/RISCV/rv32dc-valid.s index 1a9ea317a35..9e419f0ba82 100644 --- a/llvm/test/MC/RISCV/rv32dc-valid.s +++ b/llvm/test/MC/RISCV/rv32dc-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+c,+d -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+c \ diff --git a/llvm/test/MC/RISCV/rv32e-invalid.s b/llvm/test/MC/RISCV/rv32e-invalid.s index 7403499eeda..efc5528904f 100644 --- a/llvm/test/MC/RISCV/rv32e-invalid.s +++ b/llvm/test/MC/RISCV/rv32e-invalid.s @@ -1,6 +1,6 @@ # RUN: not llvm-mc -triple riscv32 -mattr=+e < %s 2>&1 | FileCheck %s # RUN: llvm-mc -filetype=obj -triple=riscv32 < %s \ -# RUN: | llvm-objdump -mattr=+e -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+e -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefix=CHECK-DIS %s # Perform a simple sanity check that registers x16-x31 (and the equivalent diff --git a/llvm/test/MC/RISCV/rv32e-valid.s b/llvm/test/MC/RISCV/rv32e-valid.s index 42b85fb0535..128e42bdd21 100644 --- a/llvm/test/MC/RISCV/rv32e-valid.s +++ b/llvm/test/MC/RISCV/rv32e-valid.s @@ -1,7 +1,7 @@ # RUN: llvm-mc %s -triple=riscv32 -riscv-no-aliases -mattr=+e -show-encoding \ # RUN: | FileCheck -check-prefix=CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv32 -mattr=+e < %s \ -# RUN: | llvm-objdump -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefix=CHECK-ASM-AND-OBJ %s # This file provides a basic sanity check for RV32E, checking that the expected diff --git a/llvm/test/MC/RISCV/rv32f-valid.s b/llvm/test/MC/RISCV/rv32f-valid.s index 9cf9164f0ab..64edbafdbd4 100644 --- a/llvm/test/MC/RISCV/rv32f-valid.s +++ b/llvm/test/MC/RISCV/rv32f-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+f -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+f < %s \ -# RUN: | llvm-objdump -mattr=+f -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+f -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: flw ft0, 12(a0) diff --git a/llvm/test/MC/RISCV/rv32fc-aliases-valid.s b/llvm/test/MC/RISCV/rv32fc-aliases-valid.s index 19661d7056e..c26b1de69b9 100644 --- a/llvm/test/MC/RISCV/rv32fc-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv32fc-aliases-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -mattr=+c,+f -M no-aliases -d - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s # CHECK-EXPAND: c.flw fs0, 0(s1) diff --git a/llvm/test/MC/RISCV/rv32fc-valid.s b/llvm/test/MC/RISCV/rv32fc-valid.s index 3e29a5c9485..ffb4273b117 100644 --- a/llvm/test/MC/RISCV/rv32fc-valid.s +++ b/llvm/test/MC/RISCV/rv32fc-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+c,+f -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+c \ diff --git a/llvm/test/MC/RISCV/rv32i-aliases-valid.s b/llvm/test/MC/RISCV/rv32i-aliases-valid.s index e5adc3d047c..d2e142efcfc 100644 --- a/llvm/test/MC/RISCV/rv32i-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv32i-aliases-valid.s @@ -3,7 +3,7 @@ # RUN: llvm-mc %s -triple=riscv32 \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ -# RUN: | llvm-objdump -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-EXPAND,CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -d -r - \ diff --git a/llvm/test/MC/RISCV/rv32i-valid.s b/llvm/test/MC/RISCV/rv32i-valid.s index 23ed9a2b4e8..bbcfa5feac4 100644 --- a/llvm/test/MC/RISCV/rv32i-valid.s +++ b/llvm/test/MC/RISCV/rv32i-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 < %s \ -# RUN: | llvm-objdump -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s .equ CONST, 30 diff --git a/llvm/test/MC/RISCV/rv32m-valid.s b/llvm/test/MC/RISCV/rv32m-valid.s index 2b410f2c80c..fcefdda034d 100644 --- a/llvm/test/MC/RISCV/rv32m-valid.s +++ b/llvm/test/MC/RISCV/rv32m-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+m -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+m < %s \ -# RUN: | llvm-objdump -mattr=+m -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+m -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: mul a4, ra, s0 diff --git a/llvm/test/MC/RISCV/rv64-relaxation.s b/llvm/test/MC/RISCV/rv64-relaxation.s index 202cbafa785..71ff34916d5 100644 --- a/llvm/test/MC/RISCV/rv64-relaxation.s +++ b/llvm/test/MC/RISCV/rv64-relaxation.s @@ -1,7 +1,7 @@ # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+c < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=INSTR %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=INSTR %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+c,+relax < %s \ -# RUN: | llvm-objdump -d -riscv-no-aliases - | FileCheck -check-prefix=RELAX-INSTR %s +# RUN: | llvm-objdump -d -M no-aliases - | FileCheck -check-prefix=RELAX-INSTR %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+c,+relax < %s \ # RUN: | llvm-readobj -r | FileCheck -check-prefix=RELAX-RELOC %s diff --git a/llvm/test/MC/RISCV/rv64a-aliases-valid.s b/llvm/test/MC/RISCV/rv64a-aliases-valid.s index 84f911506ec..fc14093a6a7 100644 --- a/llvm/test/MC/RISCV/rv64a-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv64a-aliases-valid.s @@ -3,7 +3,7 @@ # RUN: llvm-mc %s -triple=riscv64 -mattr=+a \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+a < %s \ -# RUN: | llvm-objdump -d -mattr=+a -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+a -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+a < %s \ # RUN: | llvm-objdump -d -mattr=+a - \ diff --git a/llvm/test/MC/RISCV/rv64a-valid.s b/llvm/test/MC/RISCV/rv64a-valid.s index 2112727a8f2..c660f1b517a 100644 --- a/llvm/test/MC/RISCV/rv64a-valid.s +++ b/llvm/test/MC/RISCV/rv64a-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+a -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+a < %s 2>&1 \ diff --git a/llvm/test/MC/RISCV/rv64c-aliases-valid.s b/llvm/test/MC/RISCV/rv64c-aliases-valid.s index a39527bd0e2..996aa096059 100644 --- a/llvm/test/MC/RISCV/rv64c-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv64c-aliases-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-INST %s # The following check prefixes are used in this test: diff --git a/llvm/test/MC/RISCV/rv64c-hints-valid.s b/llvm/test/MC/RISCV/rv64c-hints-valid.s index 5bb773af503..5a273ac0fdf 100644 --- a/llvm/test/MC/RISCV/rv64c-hints-valid.s +++ b/llvm/test/MC/RISCV/rv64c-hints-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: c.slli zero, 63 diff --git a/llvm/test/MC/RISCV/rv64c-valid.s b/llvm/test/MC/RISCV/rv64c-valid.s index 959aaf34fa5..277a6b26d88 100644 --- a/llvm/test/MC/RISCV/rv64c-valid.s +++ b/llvm/test/MC/RISCV/rv64c-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+c -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # diff --git a/llvm/test/MC/RISCV/rv64d-aliases-valid.s b/llvm/test/MC/RISCV/rv64d-aliases-valid.s index f6c5663eac7..fdadee87d47 100644 --- a/llvm/test/MC/RISCV/rv64d-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv64d-aliases-valid.s @@ -3,7 +3,7 @@ # RUN: llvm-mc %s -triple=riscv64 -mattr=+d \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+d < %s \ -# RUN: | llvm-objdump -d -mattr=+d -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+d -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+d < %s \ # RUN: | llvm-objdump -d -mattr=+d - \ diff --git a/llvm/test/MC/RISCV/rv64d-valid.s b/llvm/test/MC/RISCV/rv64d-valid.s index 06ce1d36460..58ff08f3b24 100644 --- a/llvm/test/MC/RISCV/rv64d-valid.s +++ b/llvm/test/MC/RISCV/rv64d-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+d -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+d < %s 2>&1 \ diff --git a/llvm/test/MC/RISCV/rv64dc-valid.s b/llvm/test/MC/RISCV/rv64dc-valid.s index 18f1a68df60..a6507e90baf 100644 --- a/llvm/test/MC/RISCV/rv64dc-valid.s +++ b/llvm/test/MC/RISCV/rv64dc-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+c,+d -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv64 -mattr=+c \ diff --git a/llvm/test/MC/RISCV/rv64f-aliases-valid.s b/llvm/test/MC/RISCV/rv64f-aliases-valid.s index c9c2a4b6d74..6076a19b241 100644 --- a/llvm/test/MC/RISCV/rv64f-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv64f-aliases-valid.s @@ -3,7 +3,7 @@ # RUN: llvm-mc %s -triple=riscv64 -mattr=+f \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+f < %s \ -# RUN: | llvm-objdump -d -mattr=+f -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+f -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+f < %s \ # RUN: | llvm-objdump -d -mattr=+f - \ diff --git a/llvm/test/MC/RISCV/rv64f-valid.s b/llvm/test/MC/RISCV/rv64f-valid.s index caf6d081151..7cc36ec745e 100644 --- a/llvm/test/MC/RISCV/rv64f-valid.s +++ b/llvm/test/MC/RISCV/rv64f-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+f -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # # RUN: not llvm-mc -triple riscv32 -mattr=+f < %s 2>&1 \ diff --git a/llvm/test/MC/RISCV/rv64i-aliases-valid.s b/llvm/test/MC/RISCV/rv64i-aliases-valid.s index a53d3456d17..551e46f8530 100644 --- a/llvm/test/MC/RISCV/rv64i-aliases-valid.s +++ b/llvm/test/MC/RISCV/rv64i-aliases-valid.s @@ -3,7 +3,7 @@ # RUN: llvm-mc %s -triple=riscv64 \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND,CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ -# RUN: | llvm-objdump -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -M no-aliases -d - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-EXPAND,CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-objdump -d - \ diff --git a/llvm/test/MC/RISCV/rv64i-valid.s b/llvm/test/MC/RISCV/rv64i-valid.s index dab502c92b9..4642db5e5c3 100644 --- a/llvm/test/MC/RISCV/rv64i-valid.s +++ b/llvm/test/MC/RISCV/rv64i-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,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 f1a98bf8f11..4117a56ded5 100644 --- a/llvm/test/MC/RISCV/rv64m-valid.s +++ b/llvm/test/MC/RISCV/rv64m-valid.s @@ -1,7 +1,7 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -mattr=+m -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: mulw ra, sp, gp diff --git a/llvm/test/MC/RISCV/rva-aliases-valid.s b/llvm/test/MC/RISCV/rva-aliases-valid.s index f6b17325812..705def56037 100644 --- a/llvm/test/MC/RISCV/rva-aliases-valid.s +++ b/llvm/test/MC/RISCV/rva-aliases-valid.s @@ -7,13 +7,13 @@ # RUN: llvm-mc %s -triple=riscv64 -mattr=+a \ # RUN: | FileCheck -check-prefixes=CHECK-S,CHECK-S-OBJ %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+a < %s \ -# RUN: | llvm-objdump -d -mattr=+a -riscv-no-aliases - \ +# 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 riscv32 -mattr=+a < %s \ # RUN: | llvm-objdump -d -mattr=+a - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-S-OBJ %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+a < %s \ -# RUN: | llvm-objdump -d -mattr=+a -riscv-no-aliases - \ +# 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 - \ diff --git a/llvm/test/MC/RISCV/rvc-aliases-valid.s b/llvm/test/MC/RISCV/rvc-aliases-valid.s index dfafd2f5be4..e6fd05435ec 100644 --- a/llvm/test/MC/RISCV/rvc-aliases-valid.s +++ b/llvm/test/MC/RISCV/rvc-aliases-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -M no-aliases -d - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+c < %s \ -# RUN: | llvm-objdump -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -M no-aliases -d - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s # CHECK-EXPAND: c.lw s0, 0(s1) diff --git a/llvm/test/MC/RISCV/rvc-hints-valid.s b/llvm/test/MC/RISCV/rvc-hints-valid.s index 1302dd8bb4c..d75c9d019a2 100644 --- a/llvm/test/MC/RISCV/rvc-hints-valid.s +++ b/llvm/test/MC/RISCV/rvc-hints-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # RUN: llvm-mc -filetype=obj -triple=riscv64 -mattr=+c < %s \ -# RUN: | llvm-objdump -riscv-no-aliases -d -r - \ +# RUN: | llvm-objdump -M no-aliases -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-ASM-AND-OBJ %s # CHECK-ASM-AND-OBJ: c.nop 8 diff --git a/llvm/test/MC/RISCV/rvd-aliases-valid.s b/llvm/test/MC/RISCV/rvd-aliases-valid.s index c1ad787bfb1..4eab069507c 100644 --- a/llvm/test/MC/RISCV/rvd-aliases-valid.s +++ b/llvm/test/MC/RISCV/rvd-aliases-valid.s @@ -7,13 +7,13 @@ # RUN: llvm-mc %s -triple=riscv64 -mattr=+d \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+d < %s \ -# RUN: | llvm-objdump -d -mattr=+d -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+d -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+d < %s \ # RUN: | llvm-objdump -d -mattr=+d - \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+d < %s \ -# RUN: | llvm-objdump -d -mattr=+d -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+d -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+d < %s \ # RUN: | llvm-objdump -d -mattr=+d - \ diff --git a/llvm/test/MC/RISCV/rvdc-aliases-valid.s b/llvm/test/MC/RISCV/rvdc-aliases-valid.s index 5638f274b9b..be3c3d9a2a0 100644 --- a/llvm/test/MC/RISCV/rvdc-aliases-valid.s +++ b/llvm/test/MC/RISCV/rvdc-aliases-valid.s @@ -3,10 +3,10 @@ # 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 -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -mattr=+c,+d -M no-aliases -d - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+c,+d < %s \ -# RUN: | llvm-objdump -mattr=+c,+d -riscv-no-aliases -d - \ +# RUN: | llvm-objdump -mattr=+c,+d -M no-aliases -d - \ # RUN: | FileCheck -check-prefixes=CHECK-EXPAND %s c.fld f8, (x9) diff --git a/llvm/test/MC/RISCV/rvf-aliases-valid.s b/llvm/test/MC/RISCV/rvf-aliases-valid.s index 1d782e9ceda..725dbe6d6a2 100644 --- a/llvm/test/MC/RISCV/rvf-aliases-valid.s +++ b/llvm/test/MC/RISCV/rvf-aliases-valid.s @@ -7,13 +7,13 @@ # RUN: llvm-mc %s -triple=riscv64 -mattr=+f \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+f < %s \ -# RUN: | llvm-objdump -d -mattr=+f -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+f -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv32 -mattr=+f < %s \ # RUN: | llvm-objdump -d -mattr=+f - \ # RUN: | FileCheck -check-prefix=CHECK-ALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+f < %s \ -# RUN: | llvm-objdump -d -mattr=+f -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -mattr=+f -M no-aliases - \ # RUN: | FileCheck -check-prefix=CHECK-INST %s # RUN: llvm-mc -filetype=obj -triple riscv64 -mattr=+f < %s \ # RUN: | llvm-objdump -d -mattr=+f - \ diff --git a/llvm/test/MC/RISCV/rvi-aliases-valid.s b/llvm/test/MC/RISCV/rvi-aliases-valid.s index 71a50ec95aa..a78efd48fb3 100644 --- a/llvm/test/MC/RISCV/rvi-aliases-valid.s +++ b/llvm/test/MC/RISCV/rvi-aliases-valid.s @@ -7,13 +7,13 @@ # RUN: llvm-mc %s -triple=riscv64 \ # RUN: | FileCheck -check-prefixes=CHECK-S,CHECK-S-OBJ %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ -# RUN: | llvm-objdump -d -r -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -r -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-S-OBJ-NOALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv32 < %s \ # RUN: | llvm-objdump -d -r - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ,CHECK-S-OBJ %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ -# RUN: | llvm-objdump -d -r -riscv-no-aliases - \ +# RUN: | llvm-objdump -d -r -M no-aliases - \ # RUN: | FileCheck -check-prefixes=CHECK-OBJ-NOALIAS,CHECK-S-OBJ-NOALIAS %s # RUN: llvm-mc -filetype=obj -triple riscv64 < %s \ # RUN: | llvm-objdump -d -r - \ |
