diff options
| author | Simon Atanasyan <simon@atanasyan.com> | 2018-12-12 07:03:04 +0000 |
|---|---|---|
| committer | Simon Atanasyan <simon@atanasyan.com> | 2018-12-12 07:03:04 +0000 |
| commit | 9098a8b5eff0f524a922c21ef4f35aec8f416091 (patch) | |
| tree | 8541213bcaf758a9d6ea5592d7188effb7c42e8f | |
| parent | c06b01cb22109b28aed82dae3df0f3354483dd9e (diff) | |
| download | bcm5719-llvm-9098a8b5eff0f524a922c21ef4f35aec8f416091.tar.gz bcm5719-llvm-9098a8b5eff0f524a922c21ef4f35aec8f416091.zip | |
[mips] Use llvm-mc -triple option instead of combination of arch,target-abi,mcpu. NFC
llvm-svn: 348914
29 files changed, 142 insertions, 122 deletions
diff --git a/llvm/test/MC/Mips/cpload.s b/llvm/test/MC/Mips/cpload.s index 3bbad60e578..2c09fa2bbec 100644 --- a/llvm/test/MC/Mips/cpload.s +++ b/llvm/test/MC/Mips/cpload.s @@ -1,13 +1,17 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 | FileCheck %s -check-prefix=ASM +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 \ +# RUN: | FileCheck %s -check-prefix=ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o -| \ -# RUN: llvm-objdump -d -r - | FileCheck %s -check-prefix=OBJ-O32 +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 \ +# RUN: -filetype=obj -o - \ +# RUN: | llvm-objdump -d -r - | FileCheck %s -check-prefix=OBJ-O32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -target-abi n32 -filetype=obj -o -| \ -# RUN: llvm-objdump -d -r - | FileCheck %s -check-prefix=OBJ-N32 +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -mcpu=mips64r2 \ +# RUN: -filetype=obj -o - \ +# RUN: | llvm-objdump -d -r - | FileCheck %s -check-prefix=OBJ-N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -filetype=obj -o -| \ -# RUN: llvm-objdump -d -r - | FileCheck %s -check-prefix=OBJ-N64 +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu -mcpu=mips64r2 \ +# RUN: -filetype=obj -o - \ +# RUN: | llvm-objdump -d -r - | FileCheck %s -check-prefix=OBJ-N64 # ASM: .text # ASM: .option pic2 diff --git a/llvm/test/MC/Mips/cprestore-noreorder-noat.s b/llvm/test/MC/Mips/cprestore-noreorder-noat.s index 07c4dd2ea35..24c99d43e0c 100644 --- a/llvm/test/MC/Mips/cprestore-noreorder-noat.s +++ b/llvm/test/MC/Mips/cprestore-noreorder-noat.s @@ -1,18 +1,20 @@ -# RUN: not llvm-mc %s -arch=mips -mcpu=mips32 --position-independent -filetype=obj \ -# RUN: -o /dev/null 2>&1 | FileCheck %s -check-prefix=O32 +# RUN: not llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32 \ +# RUN: --position-independent -filetype=obj -o /dev/null 2>&1 \ +# RUN; | FileCheck %s -check-prefix=O32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 \ -# RUN: -filetype=obj -o /dev/null 2>&1 | FileCheck %s -allow-empty -check-prefix=N32 +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu -filetype=obj \ +# RUN: -o /dev/null 2>&1 \ +# RUN: | FileCheck %s -allow-empty -check-prefix=N64 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi=n32 \ -# RUN: -filetype=obj -o /dev/null 2>&1 | FileCheck %s -allow-empty -check-prefix=N64 +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -filetype=obj \ +# RUN: -o /dev/null 2>&1 \ +# RUN: | FileCheck %s -allow-empty -check-prefix=N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi=n32 \ -# RUN: -filetype=obj -o - | llvm-objdump -d -r - | \ -# RUN: FileCheck %s -check-prefix=NO-STORE +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -filetype=obj -o - \ +# RUN: | llvm-objdump -d -r - | FileCheck %s -check-prefix=NO-STORE -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \ -# RUN: llvm-objdump -d -r - | FileCheck %s -check-prefix=NO-STORE +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu -filetype=obj -o - \ +# RUN: | llvm-objdump -d -r - | FileCheck %s -check-prefix=NO-STORE .text .ent foo diff --git a/llvm/test/MC/Mips/cprestore-noreorder.s b/llvm/test/MC/Mips/cprestore-noreorder.s index cce43d333fa..cd7a8c0b84e 100644 --- a/llvm/test/MC/Mips/cprestore-noreorder.s +++ b/llvm/test/MC/Mips/cprestore-noreorder.s @@ -1,20 +1,24 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 --position-independent -show-encoding | \ -# RUN: FileCheck %s +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu --position-independent \ +# RUN: -show-encoding | FileCheck %s -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 --position-independent -filetype=obj -o -| \ -# RUN: llvm-objdump -d -r - | FileCheck %s -check-prefix=CHECK-FOR-STORE +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu --position-independent \ +# RUN: -filetype=obj -o - \ +# RUN: | llvm-objdump -d -r - | FileCheck %s -check-prefix=CHECK-FOR-STORE -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+micromips --position-independent -show-encoding | \ -# RUN: FileCheck %s -check-prefix=MICROMIPS +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+micromips \ +# RUN: --position-independent -show-encoding \ +# RUN: | FileCheck %s -check-prefix=MICROMIPS -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -show-encoding | \ -# RUN: FileCheck %s -check-prefix=NO-PIC +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -show-encoding \ +# RUN: | FileCheck %s -check-prefix=NO-PIC -# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n32 --position-independent -show-encoding | \ -# RUN: FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N32 +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 \ +# RUN: --position-independent -show-encoding \ +# RUN: | FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 --position-independent -show-encoding | \ -# RUN: FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N64 +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu --position-independent \ +# RUN: -show-encoding \ +# RUN: | FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N64 .text .ent foo diff --git a/llvm/test/MC/Mips/cprestore-reorder.s b/llvm/test/MC/Mips/cprestore-reorder.s index 88597799297..9666969b015 100644 --- a/llvm/test/MC/Mips/cprestore-reorder.s +++ b/llvm/test/MC/Mips/cprestore-reorder.s @@ -1,19 +1,19 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 --position-independent -show-encoding | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu --position-independent -show-encoding | \ # RUN: FileCheck %s -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 --position-independent -filetype=obj -o -| \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu --position-independent -filetype=obj -o -| \ # RUN: llvm-objdump -d -r - | FileCheck %s -check-prefix=CHECK-FOR-STORE -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+micromips --position-independent -show-encoding | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+micromips --position-independent -show-encoding | \ # RUN: FileCheck %s -check-prefix=MICROMIPS -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -show-encoding | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -show-encoding | \ # RUN: FileCheck %s -check-prefix=NO-PIC -# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n32 --position-independent -show-encoding | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 --position-independent -show-encoding | \ # RUN: FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 --position-independent -show-encoding | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu --position-independent -show-encoding | \ # RUN: FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N64 .text diff --git a/llvm/test/MC/Mips/cprestore-warning-unused.s b/llvm/test/MC/Mips/cprestore-warning-unused.s index e4999b48fb9..5a809708362 100644 --- a/llvm/test/MC/Mips/cprestore-warning-unused.s +++ b/llvm/test/MC/Mips/cprestore-warning-unused.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 --position-independent 2>%t1 +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu --position-independent 2>%t1 # RUN: FileCheck %s < %t1 .text diff --git a/llvm/test/MC/Mips/eh-frame.s b/llvm/test/MC/Mips/eh-frame.s index 91032572fb1..e03027a20a4 100644 --- a/llvm/test/MC/Mips/eh-frame.s +++ b/llvm/test/MC/Mips/eh-frame.s @@ -1,18 +1,18 @@ // Test the bits of .eh_frame on mips that are already implemented correctly. -// RUN: llvm-mc -filetype=obj %s -o %t.o -arch=mips +// RUN: llvm-mc -filetype=obj %s -o %t.o -triple mips-unknown-linux-gnu // RUN: llvm-objdump -r -section=.rel.eh_frame %t.o | FileCheck --check-prefix=REL32 %s // RUN: llvm-dwarfdump -eh-frame %t.o | FileCheck --check-prefix=DWARF32 %s -// RUN: llvm-mc -filetype=obj %s -o %t.o -arch=mipsel +// RUN: llvm-mc -filetype=obj %s -o %t.o -triple mipsel-unknown-linux-gnu // RUN: llvm-objdump -r -section=.rel.eh_frame %t.o | FileCheck --check-prefix=REL32 %s // RUN: llvm-dwarfdump -eh-frame %t.o | FileCheck --check-prefix=DWARF32 %s -// RUN: llvm-mc -filetype=obj %s -o %t.o -arch=mips64 +// RUN: llvm-mc -filetype=obj %s -o %t.o -triple mips64-unknown-linux-gnu // RUN: llvm-objdump -r -section=.rela.eh_frame %t.o | FileCheck --check-prefix=REL64 %s // RUN: llvm-dwarfdump -eh-frame %t.o | FileCheck --check-prefix=DWARF64 %s -// RUN: llvm-mc -filetype=obj %s -o %t.o -arch=mips64el +// RUN: llvm-mc -filetype=obj %s -o %t.o -triple mips64el-unknown-linux-gnu // RUN: llvm-objdump -r -section=.rela.eh_frame %t.o | FileCheck --check-prefix=REL64 %s // RUN: llvm-dwarfdump -eh-frame %t.o | FileCheck --check-prefix=DWARF64 %s diff --git a/llvm/test/MC/Mips/expansion-j-sym-pic.s b/llvm/test/MC/Mips/expansion-j-sym-pic.s index 6bb67a87eda..b04355593c6 100644 --- a/llvm/test/MC/Mips/expansion-j-sym-pic.s +++ b/llvm/test/MC/Mips/expansion-j-sym-pic.s @@ -1,22 +1,22 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -show-encoding |\ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -show-encoding |\ # RUN: FileCheck %s -check-prefix=NORMAL -# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n32 -show-encoding |\ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -show-encoding |\ # RUN: FileCheck %s -check-prefix=NORMAL -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 -show-encoding |\ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu -show-encoding |\ # RUN: FileCheck %s -check-prefix=NORMAL -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=micromips -show-encoding |\ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=micromips -show-encoding |\ # RUN: FileCheck %s -check-prefix=MICRO # Repeat the tests using ELF output. -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj | \ # RUN: llvm-objdump -d -r - | FileCheck %s -check-prefixes=ELF-O32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 -filetype=obj | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -filetype=obj | \ # RUN: llvm-objdump -d -r - | FileCheck %s -check-prefixes=ELF-NXX,ELF-N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 -filetype=obj | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu -filetype=obj | \ # RUN: llvm-objdump -d -r - | FileCheck %s -check-prefixes=ELF-NXX,ELF-N64 .weak weak_label diff --git a/llvm/test/MC/Mips/expansion-jal-sym-pic.s b/llvm/test/MC/Mips/expansion-jal-sym-pic.s index 81584d4941a..e20562a88a5 100644 --- a/llvm/test/MC/Mips/expansion-jal-sym-pic.s +++ b/llvm/test/MC/Mips/expansion-jal-sym-pic.s @@ -1,13 +1,13 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -show-encoding |\ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,MIPS,O32 -# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n32 -show-encoding |\ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,MIPS,N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 -show-encoding |\ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,MIPS,N64 -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=micromips -show-encoding |\ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=micromips -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,MM,O32-MM # Repeat the tests but using ELF output. An initial version of this patch did @@ -15,11 +15,11 @@ # MCAsmStreamer or MCELFStreamer. This ensures that the assembly expansion and # direct objection emission match. -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj | \ # RUN: llvm-objdump -d -r - | FileCheck %s -check-prefixes=ELF-O32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 -filetype=obj | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -filetype=obj | \ # RUN: llvm-objdump -d -r - | FileCheck %s -check-prefixes=ELF-N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 -filetype=obj | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu -filetype=obj | \ # RUN: llvm-objdump -d -r - | FileCheck %s -check-prefixes=ELF-N64 .weak weak_label @@ -51,7 +51,7 @@ local_label: # N32: lw $25, %got_disp(local_label)($gp) # encoding: [0x8f,0x99,A,A] # N32: # fixup A - offset: 0, value: %got_disp(local_label), kind: fixup_Mips_GOT_DISP -# N32-NEXT: .reloc ($tmp0), R_MIPS_JALR, local_label +# N32-NEXT: .reloc .Ltmp0, R_MIPS_JALR, local_label # ELF-N32: 8f 99 00 00 lw $25, 0($gp) # ELF-N32-NEXT: R_MIPS_GOT_DISP local_label @@ -92,7 +92,7 @@ local_label: # N32: lw $25, %call16(weak_label)($gp) # encoding: [0x8f,0x99,A,A] # N32: # fixup A - offset: 0, value: %call16(weak_label), kind: fixup_Mips_CALL16 -# N32-NEXT: .reloc ($tmp1), R_MIPS_JALR, weak_label +# N32-NEXT: .reloc .Ltmp1, R_MIPS_JALR, weak_label # ELF-N32: 8f 99 00 00 lw $25, 0($gp) # ELF-N32-NEXT: R_MIPS_CALL16 weak_label @@ -131,7 +131,7 @@ local_label: # N32: lw $25, %call16(global_label)($gp) # encoding: [0x8f,0x99,A,A] # N32: # fixup A - offset: 0, value: %call16(global_label), kind: fixup_Mips_CALL16 -# N32-NEXT: .reloc ($tmp2), R_MIPS_JALR, global_label +# N32-NEXT: .reloc .Ltmp2, R_MIPS_JALR, global_label # ELF-N32: 8f 99 00 00 lw $25, 0($gp) # ELF-N32-NEXT: R_MIPS_CALL16 global_label @@ -205,8 +205,8 @@ local_label: # ELF-O32-NEXT: 03 20 f8 09 jalr $25 # ELF-O32-NEXT: R_MIPS_JALR $tmp0 -# N32: lw $25, %got_disp($tmp4)($gp) # encoding: [0x8f,0x99,A,A] -# N32: # fixup A - offset: 0, value: %got_disp($tmp4), kind: fixup_Mips_GOT_DISP +# N32: lw $25, %got_disp(.Ltmp4)($gp) # encoding: [0x8f,0x99,A,A] +# N32: # fixup A - offset: 0, value: %got_disp(.Ltmp4), kind: fixup_Mips_GOT_DISP # ELF-N32: 8f 99 00 00 lw $25, 0($gp) # ELF-N32-NEXT: R_MIPS_GOT_DISP .Ltmp0 diff --git a/llvm/test/MC/Mips/ginv/invalid.s b/llvm/test/MC/Mips/ginv/invalid.s index 4bc77891c4c..aa02ac182f4 100644 --- a/llvm/test/MC/Mips/ginv/invalid.s +++ b/llvm/test/MC/Mips/ginv/invalid.s @@ -1,11 +1,13 @@ # Instructions that are invalid. # -# RUN: not llvm-mc %s -arch=mips -mcpu=mips32r6 -mattr=+ginv 2>%t1 +# RUN: not llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r6 \ +# RUN: -mattr=+ginv 2>%t1 # RUN: FileCheck %s < %t1 -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64r6 -mattr=+ginv 2>%t1 +# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnu -mcpu=mips64r6 \ +# RUN: -mattr=+ginv 2>%t1 # RUN: FileCheck %s < %t1 -# RUN: not llvm-mc %s -arch=mips -mcpu=mips32r6 \ -# RUN: -mattr=+micromips,+ginv 2>%t1 +# RUN: not llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r6 \ +# RUN: -mattr=+micromips,+ginv 2>%t1 # RUN: FileCheck %s < %t1 ginvi # CHECK: :[[@LINE]]:3: error: too few operands for instruction diff --git a/llvm/test/MC/Mips/invalid-instructions-spellcheck.s b/llvm/test/MC/Mips/invalid-instructions-spellcheck.s index c242fd05b7a..459e71c8912 100644 --- a/llvm/test/MC/Mips/invalid-instructions-spellcheck.s +++ b/llvm/test/MC/Mips/invalid-instructions-spellcheck.s @@ -1,8 +1,10 @@ -# RUN: not llvm-mc -arch mips -mcpu=mips32r2 -mattr=+micromips %s 2>&1 \ +# RUN: not llvm-mc -triple mips-unknown-linux-gnu -mcpu=mips32r2 \ +# RUN: -mattr=+micromips %s 2>&1 \ # RUN: | FileCheck --check-prefixes=ALL,MMR2 %s -# RUN: not llvm-mc -arch mips -mcpu=mips32r6 -mattr=+micromips %s 2>&1 \ +# RUN: not llvm-mc -triple mips-unknown-linux-gnu -mcpu=mips32r6 \ +# RUN: -mattr=+micromips %s 2>&1 \ # RUN: | FileCheck --check-prefixes=ALL,MMR6 %s -# RUN: not llvm-mc -arch mips -mcpu=mips32r6 %s 2>&1 \ +# RUN: not llvm-mc -triple mips-unknown-linux-gnu -mcpu=mips32r6 %s 2>&1 \ # RUN: | FileCheck --check-prefixes=ALL,MIPS32R6 %s # This tests the mnemonic spell checker. diff --git a/llvm/test/MC/Mips/j-macro-insn.s b/llvm/test/MC/Mips/j-macro-insn.s index cffcc97242f..555e468626e 100644 --- a/llvm/test/MC/Mips/j-macro-insn.s +++ b/llvm/test/MC/Mips/j-macro-insn.s @@ -1,7 +1,12 @@ -# RUN: llvm-mc -arch=mips -show-inst %s | FileCheck --check-prefix=STATIC %s -# RUN: llvm-mc -arch=mips -position-independent -show-inst %s | FileCheck --check-prefix=PIC %s -# RUN: llvm-mc -arch=mips -mattr=+micromips -show-inst %s | FileCheck --check-prefix=STATIC-MM %s -# RUN: llvm-mc -arch=mips -mattr=+micromips -position-independent -show-inst %s | FileCheck --check-prefix=PIC-MM %s +# RUN: llvm-mc -triple mips-unknown-linux-gnu -show-inst %s \ +# RUN: | FileCheck --check-prefix=STATIC %s +# RUN: llvm-mc -triple mips-unknown-linux-gnu -position-independent \ +# RUN: -show-inst %s | FileCheck --check-prefix=PIC %s +# RUN: llvm-mc -triple mips-unknown-linux-gnu -mattr=+micromips -show-inst %s \ +# RUN: | FileCheck --check-prefix=STATIC-MM %s +# RUN: llvm-mc -triple mips-unknown-linux-gnu -mattr=+micromips \ +# RUN: -position-independent -show-inst %s \ +# RUN: | FileCheck --check-prefix=PIC-MM %s .text j foo diff --git a/llvm/test/MC/Mips/macro-aliases-invalid-wrong-error.s b/llvm/test/MC/Mips/macro-aliases-invalid-wrong-error.s index b87646d0b09..39c12725336 100644 --- a/llvm/test/MC/Mips/macro-aliases-invalid-wrong-error.s +++ b/llvm/test/MC/Mips/macro-aliases-invalid-wrong-error.s @@ -1,7 +1,7 @@ -# RUN: not llvm-mc -arch=mips %s 2>%t1 +# RUN: not llvm-mc -triple mips-unknown-linux-gnu %s 2>%t1 # RUN: FileCheck --check-prefix=O32 %s < %t1 -# RUN: not llvm-mc -arch=mips64 %s 2>%t1 +# RUN: not llvm-mc -triple mips64-unknown-linux-gnu %s 2>%t1 # RUN: FileCheck --check-prefix=N64 %s < %t1 # Check that subu only rejects any non-constant values. diff --git a/llvm/test/MC/Mips/micromips/valid-fp64.s b/llvm/test/MC/Mips/micromips/valid-fp64.s index d825b48a70f..300e3565b45 100644 --- a/llvm/test/MC/Mips/micromips/valid-fp64.s +++ b/llvm/test/MC/Mips/micromips/valid-fp64.s @@ -1,4 +1,5 @@ -# RUN: llvm-mc -arch=mips -mcpu=mips32r3 -mattr=+micromips,+fp64 -show-encoding -show-inst %s \ +# RUN: llvm-mc -triple mips-unknown-linux-gnu -mcpu=mips32r3 \ +# RUN: -mattr=+micromips,+fp64 -show-encoding -show-inst %s \ # RUN: | FileCheck %s abs.d $f0, $f12 # CHECK: abs.d $f0, $f12 # encoding: [0x54,0x0c,0x23,0x7b] diff --git a/llvm/test/MC/Mips/mips-cop0-reginfo.s b/llvm/test/MC/Mips/mips-cop0-reginfo.s index baa3681594c..b75b0171fa3 100644 --- a/llvm/test/MC/Mips/mips-cop0-reginfo.s +++ b/llvm/test/MC/Mips/mips-cop0-reginfo.s @@ -1,6 +1,5 @@ -# RUN: llvm-mc -arch=mips -mcpu=mips32r2 -filetype=obj %s -o - | \ -# RUN: llvm-readobj -sections -section-data - | \ -# RUN: FileCheck %s +# RUN: llvm-mc -triple mips-unknown-linux-gnu -mcpu=mips32r2 -filetype=obj %s -o - \ +# RUN: | llvm-readobj -sections -section-data - | FileCheck %s mfc0 $16, $15, 1 mfc0 $16, $16, 1 diff --git a/llvm/test/MC/Mips/mips32/abiflags.s b/llvm/test/MC/Mips/mips32/abiflags.s index dd772c0ba5a..c8d74c1b703 100644 --- a/llvm/test/MC/Mips/mips32/abiflags.s +++ b/llvm/test/MC/Mips/mips32/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ diff --git a/llvm/test/MC/Mips/mips32r2/abiflags.s b/llvm/test/MC/Mips/mips32r2/abiflags.s index e3bb15bddde..200a8025e8d 100644 --- a/llvm/test/MC/Mips/mips32r2/abiflags.s +++ b/llvm/test/MC/Mips/mips32r2/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ diff --git a/llvm/test/MC/Mips/mips32r3/abiflags.s b/llvm/test/MC/Mips/mips32r3/abiflags.s index a6c7057809f..4d691453262 100644 --- a/llvm/test/MC/Mips/mips32r3/abiflags.s +++ b/llvm/test/MC/Mips/mips32r3/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r3 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r3 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r3 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r3 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ diff --git a/llvm/test/MC/Mips/mips32r5/abiflags.s b/llvm/test/MC/Mips/mips32r5/abiflags.s index fa5befeaddb..ab2a8579043 100644 --- a/llvm/test/MC/Mips/mips32r5/abiflags.s +++ b/llvm/test/MC/Mips/mips32r5/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r5 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r5 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r5 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r5 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx.s b/llvm/test/MC/Mips/mips_abi_flags_xx.s index 9c8754193e1..fb27192b2a9 100644 --- a/llvm/test/MC/Mips/mips_abi_flags_xx.s +++ b/llvm/test/MC/Mips/mips_abi_flags_xx.s @@ -1,19 +1,19 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS -# RUN: llvm-mc /dev/null -arch=mips -mcpu=mips32 -mattr=fpxx -filetype=obj -o - | \ +# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mattr=fpxx -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R1,CHECK-OBJ-MIPS -# RUN: llvm-mc /dev/null -arch=mips -mcpu=mips32r6 -mattr=fpxx -filetype=obj -o - | \ +# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mcpu=mips32r6 -mattr=fpxx -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-32R6,CHECK-OBJ-MIPS -# RUN: llvm-mc /dev/null -arch=mips -mcpu=octeon -target-abi n64 -filetype=obj -o - | \ +# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -mcpu=octeon -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ,CHECK-OBJ-64R2,CHECK-OBJ-OCTEON diff --git a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s index b31e295f635..b38d1b9a49d 100644 --- a/llvm/test/MC/Mips/mips_abi_flags_xx_set.s +++ b/llvm/test/MC/Mips/mips_abi_flags_xx_set.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations -mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ diff --git a/llvm/test/MC/Mips/module-hardfloat.s b/llvm/test/MC/Mips/module-hardfloat.s index 51f72487b39..8a54fa69dd6 100644 --- a/llvm/test/MC/Mips/module-hardfloat.s +++ b/llvm/test/MC/Mips/module-hardfloat.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -filetype=obj -o - | \ # RUN: llvm-readobj -mips-abi-flags - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ diff --git a/llvm/test/MC/Mips/msa/abiflags.s b/llvm/test/MC/Mips/msa/abiflags.s index 136c035593e..d4d8cadb8f2 100644 --- a/llvm/test/MC/Mips/msa/abiflags.s +++ b/llvm/test/MC/Mips/msa/abiflags.s @@ -1,9 +1,10 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -mattr=+msa | \ -# RUN: FileCheck %s -check-prefix=CHECK-ASM +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 -mattr=+msa \ +# RUN: | FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32r2 -mattr=+msa -filetype=obj -o - | \ -# RUN: llvm-readobj -sections -section-data -section-relocations - | \ -# RUN: FileCheck %s -check-prefix=CHECK-OBJ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r2 -mattr=+msa \ +# RUN: -filetype=obj -o - \ +# RUN: | llvm-readobj -sections -section-data -section-relocations - \ +# RUN: | FileCheck %s -check-prefix=CHECK-OBJ # CHECK-ASM: .module fp=32 # CHECK-ASM: .set fp=64 diff --git a/llvm/test/MC/Mips/nooddspreg-cmdarg.s b/llvm/test/MC/Mips/nooddspreg-cmdarg.s index 28ac7b72334..3bbb8e893e6 100644 --- a/llvm/test/MC/Mips/nooddspreg-cmdarg.s +++ b/llvm/test/MC/Mips/nooddspreg-cmdarg.s @@ -1,14 +1,14 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64,+nooddspreg | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64,+nooddspreg | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64,+nooddspreg -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64,+nooddspreg -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ -# RUN: not llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n32 -mattr=+nooddspreg 2> %t0 +# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -mattr=+nooddspreg 2> %t0 # RUN: FileCheck %s -check-prefix=INVALID < %t0 # -# RUN: not llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n64 -mattr=+nooddspreg 2> %t0 +# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnu -mattr=+nooddspreg 2> %t0 # RUN: FileCheck %s -check-prefix=INVALID < %t0 # # CHECK-ASM-NOT: .module nooddspreg diff --git a/llvm/test/MC/Mips/nooddspreg-error.s b/llvm/test/MC/Mips/nooddspreg-error.s index b4aabbef728..9044485812e 100644 --- a/llvm/test/MC/Mips/nooddspreg-error.s +++ b/llvm/test/MC/Mips/nooddspreg-error.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64 2> %t0 | \ +# RUN: not llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 2> %t0 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # RUN: FileCheck %s -check-prefix=CHECK-ERROR < %t0 # diff --git a/llvm/test/MC/Mips/nooddspreg.s b/llvm/test/MC/Mips/nooddspreg.s index 2b5154d427b..a5530ef8f52 100644 --- a/llvm/test/MC/Mips/nooddspreg.s +++ b/llvm/test/MC/Mips/nooddspreg.s @@ -1,14 +1,14 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ -# RUN: not llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n32 2> %t1 +# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnuabin32 2> %t1 # RUN: FileCheck %s -check-prefix=INVALID < %t1 # -# RUN: not llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n64 2> %t2 +# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnu 2> %t2 # RUN: FileCheck %s -check-prefix=INVALID < %t2 # # CHECK-ASM: .module nooddspreg diff --git a/llvm/test/MC/Mips/oddspreg.s b/llvm/test/MC/Mips/oddspreg.s index 3b9aaeecddd..c65a27d0828 100644 --- a/llvm/test/MC/Mips/oddspreg.s +++ b/llvm/test/MC/Mips/oddspreg.s @@ -1,35 +1,35 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64 | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-O32 # -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 -filetype=obj -o - | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnuabin32 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 | \ +# RUN: llvm-mc %s -triple mips64-unknown-linux-gnu | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # # Repeat the -filetype=obj tests but this time use an empty assembly file. The # output should be unchanged. -# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \ +# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N64 -# RUN: llvm-mc /dev/null -arch=mips -mcpu=mips32 -mattr=+fp64 -filetype=obj -o - | \ +# RUN: llvm-mc /dev/null -triple mips-unknown-linux-gnu -mattr=+fp64 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-O32 # -# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -target-abi n32 -filetype=obj -o - | \ +# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnuabin32 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32 -# RUN: llvm-mc /dev/null -arch=mips64 -mcpu=mips64 -filetype=obj -o - | \ +# RUN: llvm-mc /dev/null -triple mips64-unknown-linux-gnu -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N64 diff --git a/llvm/test/MC/Mips/set-nomacro-micromips.s b/llvm/test/MC/Mips/set-nomacro-micromips.s index c4d8b7c2d3e..e1f49141e5f 100644 --- a/llvm/test/MC/Mips/set-nomacro-micromips.s +++ b/llvm/test/MC/Mips/set-nomacro-micromips.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=micromips 2>&1 | FileCheck %s +# RUN: llvm-mc %s -triple mips-unknown-linux-gnu -mattr=micromips 2>&1 | FileCheck %s .text .type main, @function diff --git a/llvm/test/MC/Mips/update-module-level-options.s b/llvm/test/MC/Mips/update-module-level-options.s index 3d6e97cb597..f83bf22b5d0 100644 --- a/llvm/test/MC/Mips/update-module-level-options.s +++ b/llvm/test/MC/Mips/update-module-level-options.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc %s -arch=mips -mcpu=mips32 -mattr=+fp64,-nooddspreg 2>&1 | \ +# RUN: not llvm-mc %s -triple mips-unknown-linux-gnu -mattr=+fp64,-nooddspreg 2>&1 | \ # RUN: FileCheck %s .module nooddspreg diff --git a/llvm/test/MC/Mips/virt/invalid.s b/llvm/test/MC/Mips/virt/invalid.s index 9cf664e2dd6..cfd3ce030fa 100644 --- a/llvm/test/MC/Mips/virt/invalid.s +++ b/llvm/test/MC/Mips/virt/invalid.s @@ -1,10 +1,10 @@ # Instructions that are invalid. # -# RUN: not llvm-mc %s -arch=mips -mcpu=mips32r5 -mattr=+virt 2>%t1 +# RUN: not llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r5 -mattr=+virt 2>%t1 # RUN: FileCheck %s < %t1 -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64r5 -mattr=+virt 2>%t1 +# RUN: not llvm-mc %s -triple mips64-unknown-linux-gnu -mcpu=mips64r5 -mattr=+virt 2>%t1 # RUN: FileCheck %s < %t1 -# RUN: not llvm-mc %s -arch=mips -mcpu=mips32r5 -mattr=+micromips,+virt 2>%t1 +# RUN: not llvm-mc %s -triple mips-unknown-linux-gnu -mcpu=mips32r5 -mattr=+micromips,+virt 2>%t1 # RUN: FileCheck %s < %t1 mfgc0 # CHECK: :[[@LINE]]:3: error: too few operands for instruction |
