Index: include/llvm/MC/MCTargetOptionsCommandFlags.h =================================================================== --- include/llvm/MC/MCTargetOptionsCommandFlags.h +++ include/llvm/MC/MCTargetOptionsCommandFlags.h @@ -53,11 +53,6 @@ cl::opt NoWarn("no-warn", cl::desc("Suppress all warnings")); cl::alias NoWarnW("W", cl::desc("Alias for --no-warn"), cl::aliasopt(NoWarn)); -cl::opt -ABIName("target-abi", cl::Hidden, - cl::desc("The name of the ABI to be targeted from the backend."), - cl::init("")); - static inline MCTargetOptions InitMCTargetOptionsFromFlags() { MCTargetOptions Options; Options.SanitizeAddress = @@ -67,7 +62,6 @@ Options.MCPIECopyRelocations = PIECopyRelocations; Options.DwarfVersion = DwarfVersion; Options.ShowMCInst = ShowMCInst; - Options.ABIName = ABIName; Options.MCFatalWarnings = FatalWarnings; Options.MCNoWarn = NoWarn; return Options; Index: test/CodeGen/ARM/arm-abi-attr.ll =================================================================== --- test/CodeGen/ARM/arm-abi-attr.ll +++ test/CodeGen/ARM/arm-abi-attr.ll @@ -1,13 +1,13 @@ ; RUN: llc -mtriple=arm-linux-gnu < %s | FileCheck %s --check-prefix=APCS -; RUN: llc -mtriple=arm-linux-gnu -target-abi=apcs < %s | \ +; RUN: llc -mtriple=arm-linux-gnu -mabi=apcs < %s | \ ; RUN: FileCheck %s --check-prefix=APCS -; RUN: llc -mtriple=arm-linux-gnueabi -target-abi=apcs < %s | \ +; RUN: llc -mtriple=arm-linux-gnueabi -mabi=apcs < %s | \ ; RUN: FileCheck %s --check-prefix=APCS ; RUN: llc -mtriple=arm-linux-gnueabi < %s | FileCheck %s --check-prefix=AAPCS -; RUN: llc -mtriple=arm-linux-gnueabi -target-abi=aapcs < %s | \ +; RUN: llc -mtriple=arm-linux-gnueabi -mabi=aapcs < %s | \ ; RUN: FileCheck %s --check-prefix=AAPCS -; RUN: llc -mtriple=arm-linux-gnu -target-abi=aapcs < %s | \ +; RUN: llc -mtriple=arm-linux-gnu -mabi=aapcs < %s | \ ; RUN: FileCheck %s --check-prefix=AAPCS ; The stack is 8 byte aligned on AAPCS and 4 on APCS, so we should get a BIC Index: test/CodeGen/ARM/atomic-64bit.ll =================================================================== --- test/CodeGen/ARM/atomic-64bit.ll +++ test/CodeGen/ARM/atomic-64bit.ll @@ -1,6 +1,6 @@ ; RUN: llc < %s -mtriple=armv7-apple-ios | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-LE ; RUN: llc < %s -mtriple=thumbv7-none-linux-gnueabihf | FileCheck %s --check-prefix=CHECK-THUMB --check-prefix=CHECK-THUMB-LE -; RUN: llc < %s -mtriple=armebv7 -target-abi apcs | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE +; RUN: llc < %s -mtriple=armebv7 -mabi=apcs | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-BE ; RUN: llc < %s -mtriple=thumbebv7-none-linux-gnueabihf | FileCheck %s --check-prefix=CHECK-THUMB --check-prefix=CHECK-THUMB-BE define i64 @test1(i64* %ptr, i64 %val) { Index: test/CodeGen/ARM/dagcombine-concatvector.ll =================================================================== --- test/CodeGen/ARM/dagcombine-concatvector.ll +++ test/CodeGen/ARM/dagcombine-concatvector.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s -mtriple=thumbv7s-apple-ios3.0.0 -mcpu=generic | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-LE -; RUN: llc < %s -mtriple=thumbeb -target-abi apcs -mattr=v7,neon | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-BE +; RUN: llc < %s -mtriple=thumbeb -mabi=apcs -mattr=v7,neon | FileCheck %s -check-prefix=CHECK -check-prefix=CHECK-BE ; PR15525 ; CHECK-LABEL: test1: Index: test/CodeGen/ARM/emit-big-cst.ll =================================================================== --- test/CodeGen/ARM/emit-big-cst.ll +++ test/CodeGen/ARM/emit-big-cst.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=thumbv7-unknown-unknown -target-abi apcs < %s | FileCheck %s +; RUN: llc -mtriple=thumbv7-unknown-unknown -mabi=apcs < %s | FileCheck %s ; Check assembly printing of odd constants. ; CHECK: bigCst: Index: test/CodeGen/ARM/tail-call.ll =================================================================== --- test/CodeGen/ARM/tail-call.ll +++ test/CodeGen/ARM/tail-call.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple armv7 -target-abi apcs -O0 -o - < %s \ +; RUN: llc -mtriple armv7 -mabi=apcs -O0 -o - < %s \ ; RUN: | FileCheck %s -check-prefix CHECK-TAIL -; RUN: llc -mtriple armv7 -target-abi apcs -O0 -disable-tail-calls -o - < %s \ +; RUN: llc -mtriple armv7 -mabi=apcs -O0 -disable-tail-calls -o - < %s \ ; RUN: | FileCheck %s -check-prefix CHECK-NO-TAIL declare i32 @callee(i32 %i) Index: test/CodeGen/Mips/2008-08-01-AsmInline.ll =================================================================== --- test/CodeGen/Mips/2008-08-01-AsmInline.ll +++ test/CodeGen/Mips/2008-08-01-AsmInline.ll @@ -1,5 +1,5 @@ ; RUN: llc -march=mips -mcpu=mips32 < %s | FileCheck %s -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi=n64 < %s | FileCheck %s +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 < %s | FileCheck %s %struct.DWstruct = type { i32, i32 } Index: test/CodeGen/Mips/2009-11-16-CstPoolLoad.ll =================================================================== --- test/CodeGen/Mips/2009-11-16-CstPoolLoad.ll +++ test/CodeGen/Mips/2009-11-16-CstPoolLoad.ll @@ -1,9 +1,9 @@ ; RUN: llc -march=mipsel -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-O32 ; RUN: llc -march=mipsel -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-O32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n32 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n32 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n64 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N64 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n64 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N64 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n32 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N32 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n32 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N32 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N64 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N64 define float @h() nounwind readnone { entry: Index: test/CodeGen/Mips/Fast-ISel/check-disabled-mcpus.ll =================================================================== --- test/CodeGen/Mips/Fast-ISel/check-disabled-mcpus.ll +++ test/CodeGen/Mips/Fast-ISel/check-disabled-mcpus.ll @@ -1,9 +1,9 @@ ; Targets where we should not enable FastISel. ; RUN: llc -march=mips -mcpu=mips2 -O0 -relocation-model=pic \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s -; RUN: llc -march=mips -mcpu=mips3 -O0 -relocation-model=pic -target-abi n64 \ +; RUN: llc -march=mips -mcpu=mips3 -O0 -relocation-model=pic -mabi=n64 \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s -; RUN: llc -march=mips -mcpu=mips4 -O0 -relocation-model=pic -target-abi n64 \ +; RUN: llc -march=mips -mcpu=mips4 -O0 -relocation-model=pic -mabi=n64 \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s ; RUN: llc -march=mips -mcpu=mips32r6 -O0 -relocation-model=pic \ @@ -19,13 +19,13 @@ ; RUN: llc -march=mips -mcpu=mips32r5 -mattr=+micromips -O0 -relocation-model=pic \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s -; RUN: llc -march=mips -mcpu=mips64 -O0 -relocation-model=pic -target-abi n64 \ +; RUN: llc -march=mips -mcpu=mips64 -O0 -relocation-model=pic -mabi=n64 \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s -; RUN: llc -march=mips -mcpu=mips64r2 -O0 -relocation-model=pic -target-abi n64 \ +; RUN: llc -march=mips -mcpu=mips64r2 -O0 -relocation-model=pic -mabi=n64 \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s -; RUN: llc -march=mips -mcpu=mips64r3 -O0 -relocation-model=pic -target-abi n64 \ +; RUN: llc -march=mips -mcpu=mips64r3 -O0 -relocation-model=pic -mabi=n64 \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s -; RUN: llc -march=mips -mcpu=mips64r5 -O0 -relocation-model=pic -target-abi n64 \ +; RUN: llc -march=mips -mcpu=mips64r5 -O0 -relocation-model=pic -mabi=n64 \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s ; RUN: llc -march=mips -mcpu=mips32r6 -O0 -relocation-model=pic \ ; RUN: -fast-isel-verbose <%s 2>&1 | FileCheck %s Index: test/CodeGen/Mips/abiflags32.ll =================================================================== --- test/CodeGen/Mips/abiflags32.ll +++ test/CodeGen/Mips/abiflags32.ll @@ -1,6 +1,6 @@ ; RUN: llc -filetype=asm -mtriple mipsel-unknown-linux -mcpu=mips32 %s -o - | FileCheck %s ; RUN: llc -filetype=asm -mtriple mipsel-unknown-linux -mcpu=mips32 -mattr=fp64 %s -o - | FileCheck -check-prefix=CHECK-64 %s -; RUN: llc -filetype=asm -mtriple mipsel-unknown-linux -mcpu=mips64 -target-abi n32 %s -o - | FileCheck -check-prefix=CHECK-64n %s +; RUN: llc -filetype=asm -mtriple mipsel-unknown-linux -mcpu=mips64 -mabi=n32 %s -o - | FileCheck -check-prefix=CHECK-64n %s ; CHECK: .nan legacy ; We don't emit '.module fp=32' for compatibility with binutils 2.24 which Index: test/CodeGen/Mips/adjust-callstack-sp.ll =================================================================== --- test/CodeGen/Mips/adjust-callstack-sp.ll +++ test/CodeGen/Mips/adjust-callstack-sp.ll @@ -2,9 +2,9 @@ ; RUN: llc < %s -march=mips -mcpu=mips2 | FileCheck %s -check-prefix=GP32 ; RUN: llc < %s -march=mips -mcpu=mips32 | FileCheck %s -check-prefix=GP32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 | FileCheck %s -check-prefix=GP32 -; RUN: llc < %s -march=mips -mcpu=mips3 -target-abi n64 | FileCheck %s -check-prefix=GP64 -; RUN: llc < %s -march=mips -mcpu=mips64 -target-abi n64 | FileCheck %s -check-prefix=GP64 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 | FileCheck %s -check-prefix=GP64 +; RUN: llc < %s -march=mips -mcpu=mips3 -mabi=n64 | FileCheck %s -check-prefix=GP64 +; RUN: llc < %s -march=mips -mcpu=mips64 -mabi=n64 | FileCheck %s -check-prefix=GP64 +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 | FileCheck %s -check-prefix=GP64 declare void @bar(i32*) Index: test/CodeGen/Mips/atomicCmpSwapPW.ll =================================================================== --- test/CodeGen/Mips/atomicCmpSwapPW.ll +++ test/CodeGen/Mips/atomicCmpSwapPW.ll @@ -1,8 +1,8 @@ -; RUN: llc -O0 -march=mipsel -mcpu=mips32r2 -target-abi=o32 < %s -filetype=asm -o - \ +; RUN: llc -O0 -march=mipsel -mcpu=mips32r2 -mabi=o32 < %s -filetype=asm -o - \ ; RUN: | FileCheck -check-prefixes=PTR32,ALL %s -; RUN: llc -O0 -march=mips64el -mcpu=mips64r2 -target-abi=n32 < %s -filetype=asm -o - \ +; RUN: llc -O0 -march=mips64el -mcpu=mips64r2 -mabi=n32 < %s -filetype=asm -o - \ ; RUN: | FileCheck -check-prefixes=PTR32,ALL %s -; RUN: llc -O0 -march=mips64el -mcpu=mips64r2 -target-abi=n64 < %s -filetype=asm -o - \ +; RUN: llc -O0 -march=mips64el -mcpu=mips64r2 -mabi=n64 < %s -filetype=asm -o - \ ; RUN: | FileCheck -check-prefixes=PTR64,ALL %s ; PTR32: lw $[[R0:[0-9]+]] Index: test/CodeGen/Mips/blockaddr.ll =================================================================== --- test/CodeGen/Mips/blockaddr.ll +++ test/CodeGen/Mips/blockaddr.ll @@ -1,9 +1,9 @@ ; RUN: llc -march=mipsel -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-O32 ; RUN: llc -march=mipsel -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-O32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n32 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n32 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n64 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N64 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n64 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N64 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n32 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N32 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n32 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N32 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N64 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N64 ; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips32 -mattr=+mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-MIPS16-1 ; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips32 -mattr=+mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-MIPS16-2 Index: test/CodeGen/Mips/cconv/arguments-float.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-float.ll +++ test/CodeGen/Mips/cconv/arguments-float.ll @@ -1,14 +1,14 @@ ; RUN: llc -march=mips -relocation-model=static -mattr=+soft-float < %s | FileCheck --check-prefixes=ALL,SYM32,O32,O32BE %s ; RUN: llc -march=mipsel -relocation-model=static -mattr=+soft-float < %s | FileCheck --check-prefixes=ALL,SYM32,O32,O32LE %s -; RUN-TODO: llc -march=mips64 -relocation-model=static -mattr=+soft-float -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN-TODO: llc -march=mips64el -relocation-model=static -mattr=+soft-float -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64 -relocation-model=static -mattr=+soft-float -mabi=o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64el -relocation-model=static -mattr=+soft-float -mabi=o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s -; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s +; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s +; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s -; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s -; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s +; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s +; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s ; Test the floating point arguments for all ABI's and byte orders as specified ; by section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/arguments-fp128.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-fp128.ll +++ test/CodeGen/Mips/cconv/arguments-fp128.ll @@ -1,8 +1,8 @@ -; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s -; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s +; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s +; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s -; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s -; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s +; RUN: llc -march=mips64 -relocation-model=static -mattr=+soft-float -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s +; RUN: llc -march=mips64el -relocation-model=static -mattr=+soft-float -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s ; Test the fp128 arguments for all ABI's and byte orders as specified ; by section 2 of the MIPSpro N32 Handbook. Index: test/CodeGen/Mips/cconv/arguments-hard-float-varargs.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-hard-float-varargs.ll +++ test/CodeGen/Mips/cconv/arguments-hard-float-varargs.ll @@ -1,14 +1,14 @@ ; RUN: llc -march=mips -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32,O32BE %s ; RUN: llc -march=mipsel -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32,O32LE %s -; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64 -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64el -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,N32,NEW,NEWBE %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,N32,NEW,NEWLE %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,N32,NEW,NEWBE %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,N32,NEW,NEWLE %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,N64,NEW,NEWBE %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,N64,NEW,NEWLE %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,N64,NEW,NEWBE %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,N64,NEW,NEWLE %s ; Test the effect of varargs on floating point types in the non-variable part ; of the argument list as specified by section 2 of the MIPSpro N32 Handbook. Index: test/CodeGen/Mips/cconv/arguments-hard-float.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-hard-float.ll +++ test/CodeGen/Mips/cconv/arguments-hard-float.ll @@ -1,14 +1,14 @@ ; RUN: llc -march=mips -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32,O32BE %s ; RUN: llc -march=mipsel -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32,O32LE %s -; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64 -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64el -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s ; Test the floating point arguments for all ABI's and byte orders as specified ; by section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/arguments-hard-fp128.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-hard-fp128.ll +++ test/CodeGen/Mips/cconv/arguments-hard-fp128.ll @@ -1,8 +1,8 @@ -; RUN: llc -march=mips64 -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32 %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64 %s ; Test the fp128 arguments for all ABI's and byte orders as specified ; by section 2 of the MIPSpro N32 Handbook. Index: test/CodeGen/Mips/cconv/arguments-small-structures-bigger-than-32bits.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-small-structures-bigger-than-32bits.ll +++ test/CodeGen/Mips/cconv/arguments-small-structures-bigger-than-32bits.ll @@ -1,7 +1,7 @@ -; RUN: llc < %s -march=mips64 -target-abi n64 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEB -; RUN: llc < %s -march=mips64el -target-abi n64 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEL -; RUN: llc < %s -march=mips64 -target-abi n32 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEB -; RUN: llc < %s -march=mips64el -target-abi n32 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEL +; RUN: llc < %s -march=mips64 -mabi=n64 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEB +; RUN: llc < %s -march=mips64el -mabi=n64 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEL +; RUN: llc < %s -march=mips64 -mabi=n32 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEB +; RUN: llc < %s -march=mips64el -mabi=n32 -mcpu=mips64r2 | FileCheck %s -check-prefixes=ALL,MIPSEL ; #include ; Index: test/CodeGen/Mips/cconv/arguments-struct.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-struct.ll +++ test/CodeGen/Mips/cconv/arguments-struct.ll @@ -1,14 +1,14 @@ ; RUN: llc -mtriple=mips-unknown-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32-BE %s ; RUN: llc -mtriple=mipsel-unknown-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32-LE %s -; RUN-TODO: llc -mtriple=mips64-unknown-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32-BE %s -; RUN-TODO: llc -mtriple=mips64el-unknown-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32-LE %s +; RUN-TODO: llc -mtriple=mips64-unknown-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32-BE %s +; RUN-TODO: llc -mtriple=mips64el-unknown-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32-LE %s -; RUN: llc -mtriple=mips64-unknown-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW-BE %s -; RUN: llc -mtriple=mips64el-unknown-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW-LE %s +; RUN: llc -mtriple=mips64-unknown-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW-BE %s +; RUN: llc -mtriple=mips64el-unknown-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW-LE %s -; RUN: llc -mtriple=mips64-unknown-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW-BE %s -; RUN: llc -mtriple=mips64el-unknown-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW-LE %s +; RUN: llc -mtriple=mips64-unknown-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW-BE %s +; RUN: llc -mtriple=mips64el-unknown-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW-LE %s ; Test small structures for all ABI's and byte orders. ; Index: test/CodeGen/Mips/cconv/arguments-varargs.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments-varargs.ll +++ test/CodeGen/Mips/cconv/arguments-varargs.ll @@ -1,14 +1,14 @@ ; RUN: llc -mtriple=mips-linux -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32,O32-BE %s ; RUN: llc -mtriple=mipsel-linux -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32,O32-LE %s -; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64 -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64el -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -mtriple=mips64-linux -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,NEW,N32,NEW-BE %s -; RUN: llc -mtriple=mips64el-linux -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,NEW,N32,NEW-LE %s +; RUN: llc -mtriple=mips64-linux -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,NEW,N32,NEW-BE %s +; RUN: llc -mtriple=mips64el-linux -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,NEW,N32,NEW-LE %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,NEW,N64,NEW-BE %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,NEW,N64,NEW-LE %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,NEW,N64,NEW-BE %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,NEW,N64,NEW-LE %s @hwords = global [3 x i16] zeroinitializer, align 1 @words = global [3 x i32] zeroinitializer, align 1 Index: test/CodeGen/Mips/cconv/arguments.ll =================================================================== --- test/CodeGen/Mips/cconv/arguments.ll +++ test/CodeGen/Mips/cconv/arguments.ll @@ -1,14 +1,14 @@ ; RUN: llc -march=mips -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s ; RUN: llc -march=mipsel -relocation-model=static < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN-TODO: llc -march=mips64 -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN-TODO: llc -march=mips64el -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64 -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s +; RUN-TODO: llc -march=mips64el -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,O32 %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,SYM32,NEW %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,SYM64,NEW %s ; Test the integer arguments for all ABI's and byte orders as specified by ; section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/callee-saved-float.ll =================================================================== --- test/CodeGen/Mips/cconv/callee-saved-float.ll +++ test/CodeGen/Mips/cconv/callee-saved-float.ll @@ -3,20 +3,20 @@ ; RUN: llc -march=mips < %s | FileCheck --check-prefixes=ALL,O32-INV %s ; RUN: llc -march=mipsel < %s | FileCheck --check-prefixes=ALL,O32-INV %s -; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,O32-INV %s -; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,O32-INV %s +; RUN-TODO: llc -march=mips64 -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64el -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64 -mabi=o32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,O32-INV %s +; RUN-TODO: llc -march=mips64el -mabi=o32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,O32-INV %s -; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N32-INV %s -; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N32-INV %s +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64el -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N32-INV %s +; RUN: llc -march=mips64el -mabi=n32 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N32-INV %s -; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N64-INV %s -; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N64-INV %s +; RUN: llc -march=mips64 -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64el -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64 -mabi=n64 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N64-INV %s +; RUN: llc -march=mips64el -mabi=n64 < %s | FileCheck --check-prefixes=ALL,ALL-INV,N64-INV %s ; RUN: llc -march=mips -mcpu=mips32r6 -mattr=micromips -filetype=obj < %s -o - | llvm-objdump -no-show-raw-insn -arch mips -mcpu=mips32r6 -mattr=micromips -d - | FileCheck --check-prefix=MM32R6 %s Index: test/CodeGen/Mips/cconv/callee-saved.ll =================================================================== --- test/CodeGen/Mips/cconv/callee-saved.ll +++ test/CodeGen/Mips/cconv/callee-saved.ll @@ -3,20 +3,20 @@ ; RUN: llc -march=mips < %s | FileCheck --check-prefixes=ALL,O32-INV %s ; RUN: llc -march=mipsel < %s | FileCheck --check-prefixes=ALL,O32-INV %s -; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32-INV %s -; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32-INV %s +; RUN-TODO: llc -march=mips64 -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64el -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64 -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32-INV %s +; RUN-TODO: llc -march=mips64el -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32-INV %s -; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32-INV %s -; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32-INV %s +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64el -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32-INV %s +; RUN: llc -march=mips64el -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32-INV %s -; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64-INV %s -; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64-INV %s +; RUN: llc -march=mips64 -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64el -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64 -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64-INV %s +; RUN: llc -march=mips64el -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64-INV %s ; Test the callee-saved registers are callee-saved as specified by section ; 2 of the MIPSpro N32 Handbook and section 3 of the SYSV ABI spec. Index: test/CodeGen/Mips/cconv/memory-layout.ll =================================================================== --- test/CodeGen/Mips/cconv/memory-layout.ll +++ test/CodeGen/Mips/cconv/memory-layout.ll @@ -1,14 +1,14 @@ ; RUN: llc -march=mips < %s | FileCheck --check-prefixes=ALL,O32 %s ; RUN: llc -march=mipsel < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64 -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64el -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64el -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64 -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64el -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; Test the memory layout for all ABI's and byte orders as specified by section ; 4 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/reserved-space.ll =================================================================== --- test/CodeGen/Mips/cconv/reserved-space.ll +++ test/CodeGen/Mips/cconv/reserved-space.ll @@ -1,14 +1,14 @@ ; RUN: llc -march=mips < %s | FileCheck --check-prefixes=ALL,O32 %s ; RUN: llc -march=mipsel < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64 -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64el -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64el -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64 -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64el -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; Test that O32 correctly reserved space for the four arguments, even when ; there aren't any as per section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/return-float.ll =================================================================== --- test/CodeGen/Mips/cconv/return-float.ll +++ test/CodeGen/Mips/cconv/return-float.ll @@ -1,14 +1,14 @@ ; RUN: llc -mtriple=mips-linux-gnu -mattr=+soft-float -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32 %s ; RUN: llc -mtriple=mipsel-linux-gnu -mattr=+soft-float -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -mtriple=mips64-linux-gnu -mattr=+soft-float -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -mtriple=mips64el-linux-gnu -mattr=+soft-float -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64-linux-gnu -mattr=+soft-float -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64el-linux-gnu -mattr=+soft-float -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -mtriple=mips64-linux-gnu -mattr=+soft-float -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64el-linux-gnu -mattr=+soft-float -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64-linux-gnu -mattr=+soft-float -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64el-linux-gnu -mattr=+soft-float -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64-linux-gnu -mattr=+soft-float -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -mtriple=mips64el-linux-gnu -mattr=+soft-float -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64-linux-gnu -mattr=+soft-float -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64el-linux-gnu -mattr=+soft-float -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; Test the float returns for all ABI's and byte orders as specified by ; section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/return-hard-float.ll =================================================================== --- test/CodeGen/Mips/cconv/return-hard-float.ll +++ test/CodeGen/Mips/cconv/return-hard-float.ll @@ -1,14 +1,14 @@ ; RUN: llc -mtriple=mips-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32 %s ; RUN: llc -mtriple=mipsel-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; RUN: llc -mtriple=mips-linux-gnu -relocation-model=static -mattr=+o32,+fp64 < %s | FileCheck --check-prefixes=ALL,032FP64 %s ; RUN: llc -mtriple=mipsel-linux-gnu -relocation-model=static -mattr=+o32,+fp64 < %s | FileCheck --check-prefixes=ALL,032FP64 %s Index: test/CodeGen/Mips/cconv/return-hard-fp128.ll =================================================================== --- test/CodeGen/Mips/cconv/return-hard-fp128.ll +++ test/CodeGen/Mips/cconv/return-hard-fp128.ll @@ -1,8 +1,8 @@ -; RUN: llc -march=mips64 -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64 -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64el -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64 -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64el -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; Test the fp128 returns for N32/N64 and all byte orders as specified by ; section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/return-hard-struct-f128.ll =================================================================== --- test/CodeGen/Mips/cconv/return-hard-struct-f128.ll +++ test/CodeGen/Mips/cconv/return-hard-struct-f128.ll @@ -1,8 +1,8 @@ -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; Test return of {fp128} agrees with de-facto N32/N64 ABI. Index: test/CodeGen/Mips/cconv/return-struct.ll =================================================================== --- test/CodeGen/Mips/cconv/return-struct.ll +++ test/CodeGen/Mips/cconv/return-struct.ll @@ -1,14 +1,14 @@ ; RUN: llc -mtriple=mips-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32,O32-BE %s ; RUN: llc -mtriple=mipsel-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32,O32-LE %s -; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32,N32-BE %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32,N32-LE %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32,N32-BE %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32,N32-LE %s -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64,N64-BE %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64,N64-LE %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64,N64-BE %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64,N64-LE %s ; Test struct returns for all ABI's and byte orders. Index: test/CodeGen/Mips/cconv/return.ll =================================================================== --- test/CodeGen/Mips/cconv/return.ll +++ test/CodeGen/Mips/cconv/return.ll @@ -1,14 +1,14 @@ ; RUN: llc -mtriple=mips-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32 %s ; RUN: llc -mtriple=mipsel-linux-gnu -relocation-model=static < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -mtriple=mips64el-linux-gnu -relocation-model=static -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; Test the integer returns for all ABI's and byte orders as specified by ; section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/cconv/roundl-call.ll =================================================================== --- test/CodeGen/Mips/cconv/roundl-call.ll +++ test/CodeGen/Mips/cconv/roundl-call.ll @@ -1,22 +1,24 @@ -; RUN: llc -march=mips64 -mcpu=mips64 -target-abi=n32 -relocation-model=pic < \ -; RUN: %s | FileCheck %s -check-prefixes=ALL,N32,HARD-FLOAT -; RUN: llc -march=mips64el -mcpu=mips64 -target-abi=n32 -relocation-model=pic < \ -; RUN: %s | FileCheck %s -check-prefixes=ALL,N32,HARD-FLOAT - -; RUN: llc -march=mips64 -mcpu=mips64 -target-abi=n64 -relocation-model=pic < \ -; RUN: %s | FileCheck %s -check-prefixes=ALL,N64,HARD-FLOAT -; RUN: llc -march=mips64el -mcpu=mips64 -target-abi=n64 -relocation-model=pic < \ -; RUN: %s | FileCheck %s -check-prefixes=ALL,N64,HARD-FLOAT - -; RUN: llc -march=mips64 -mcpu=mips64 -mattr=+soft-float -target-abi=n32 \ -; RUN: -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,N32,SOFT-FLOAT -; RUN: llc -march=mips64el -mcpu=mips64 -mattr=+soft-float -target-abi=n32 \ -; RUN: -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,N32,SOFT-FLOAT - -; RUN: llc -march=mips64 -mcpu=mips64 -mattr=+soft-float -target-abi=n64 < %s \ -; RUN: | FileCheck %s -check-prefixes=ALL,N64,SOFT-FLOAT -; RUN: llc -march=mips64el -mcpu=mips64 -mattr=+soft-float -target-abi=n64 < \ -; RUN: %s | FileCheck %s -check-prefixes=ALL,N64,SOFT-FLOAT +; RUN: llc -march=mips64 -mcpu=mips64 -mabi=n32 -relocation-model=pic < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N32,HARD-FLOAT +; RUN: llc -march=mips64el -mcpu=mips64 -mabi=n32 -relocation-model=pic < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N32,HARD-FLOAT + +; RUN: llc -march=mips64 -mcpu=mips64 -mabi=n64 -relocation-model=pic < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N64,HARD-FLOAT +; RUN: llc -march=mips64el -mcpu=mips64 -mabi=n64 -relocation-model=pic < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N64,HARD-FLOAT + +; RUN: llc -march=mips64 -mcpu=mips64 -mattr=+soft-float -mabi=n32 \ +; RUN: -relocation-model=pic < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N32,SOFT-FLOAT +; RUN: llc -march=mips64el -mcpu=mips64 -mattr=+soft-float -mabi=n32 \ +; RUN: -relocation-model=pic < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N32,SOFT-FLOAT + +; RUN: llc -march=mips64 -mcpu=mips64 -mattr=+soft-float -mabi=n64 < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N64,SOFT-FLOAT +; RUN: llc -march=mips64el -mcpu=mips64 -mattr=+soft-float -mabi=n64 < %s | \ +; RUN: FileCheck %s -check-prefixes=ALL,N64,SOFT-FLOAT @fp128 = global fp128 zeroinitializer Index: test/CodeGen/Mips/cconv/stack-alignment.ll =================================================================== --- test/CodeGen/Mips/cconv/stack-alignment.ll +++ test/CodeGen/Mips/cconv/stack-alignment.ll @@ -1,14 +1,14 @@ ; RUN: llc -march=mips < %s | FileCheck --check-prefixes=ALL,O32 %s ; RUN: llc -march=mipsel < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64 -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN-TODO: llc -march=mips64el -target-abi o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64 -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s +; RUN-TODO: llc -march=mips64el -mabi=o32 < %s | FileCheck --check-prefixes=ALL,O32 %s -; RUN: llc -march=mips64 -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64el -target-abi n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64el -mabi=n32 < %s | FileCheck --check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64 -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s -; RUN: llc -march=mips64el -target-abi n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64 -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s +; RUN: llc -march=mips64el -mabi=n64 < %s | FileCheck --check-prefixes=ALL,N64 %s ; Test the stack alignment for all ABI's and byte orders as specified by ; section 5 of MD00305 (MIPS ABIs Described). Index: test/CodeGen/Mips/compactbranches/compact-branches-64.ll =================================================================== --- test/CodeGen/Mips/compactbranches/compact-branches-64.ll +++ test/CodeGen/Mips/compactbranches/compact-branches-64.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips64r6 -disable-mips-delay-filler -target-abi=n64 < %s | FileCheck %s +; RUN: llc -march=mipsel -mcpu=mips64r6 -disable-mips-delay-filler -mabi=n64 < %s | FileCheck %s ; Function Attrs: nounwind define void @l() { Index: test/CodeGen/Mips/compactbranches/compact-branches.ll =================================================================== --- test/CodeGen/Mips/compactbranches/compact-branches.ll +++ test/CodeGen/Mips/compactbranches/compact-branches.ll @@ -1,5 +1,5 @@ ; RUN: llc -march=mipsel -mcpu=mips32r6 -relocation-model=static -disable-mips-delay-filler < %s | FileCheck %s -check-prefix=STATIC32 -; RUN: llc -march=mipsel -mcpu=mips64r6 -target-abi n64 -disable-mips-delay-filler < %s | FileCheck %s -check-prefix=PIC +; RUN: llc -march=mipsel -mcpu=mips64r6 -mabi=n64 -disable-mips-delay-filler < %s | FileCheck %s -check-prefix=PIC ; Function Attrs: nounwind define void @l() { Index: test/CodeGen/Mips/compactbranches/no-beqzc-bnezc.ll =================================================================== --- test/CodeGen/Mips/compactbranches/no-beqzc-bnezc.ll +++ test/CodeGen/Mips/compactbranches/no-beqzc-bnezc.ll @@ -1,8 +1,8 @@ ; RUN: llc -march=mipsel -mcpu=mips32r6 -disable-mips-delay-filler < %s | FileCheck %s ; RUN: llc -march=mips -mcpu=mips32r6 -disable-mips-delay-filler < %s -filetype=obj \ ; RUN: -o - | llvm-objdump -d - | FileCheck %s -check-prefix=ENCODING -; RUN: llc -march=mipsel -mcpu=mips64r6 -disable-mips-delay-filler -target-abi=n64 < %s | FileCheck %s -; RUN: llc -march=mips -mcpu=mips64r6 -disable-mips-delay-filler -target-abi=n64 < %s -filetype=obj \ +; RUN: llc -march=mipsel -mcpu=mips64r6 -disable-mips-delay-filler -mabi=n64 < %s | FileCheck %s +; RUN: llc -march=mips -mcpu=mips64r6 -disable-mips-delay-filler -mabi=n64 < %s -filetype=obj \ ; RUN: -o - | llvm-objdump -d - | FileCheck %s -check-prefix=ENCODING ; bnezc and beqzc have restriction that $rt != 0 Index: test/CodeGen/Mips/cstmaterialization/stack.ll =================================================================== --- test/CodeGen/Mips/cstmaterialization/stack.ll +++ test/CodeGen/Mips/cstmaterialization/stack.ll @@ -1,7 +1,7 @@ ; RUN: llc -march=mipsel -mcpu=mips32 < %s | FileCheck %s -check-prefix=CHECK-MIPS32 ; RUN: llc -march=mips64el -mcpu=mips64 < %s | \ ; RUN: FileCheck %s -check-prefix=CHECK-MIPS64 -; RUN: llc -march=mipsel -mcpu=mips64 -target-abi n32 < %s | \ +; RUN: llc -march=mipsel -mcpu=mips64 -mabi=n32 < %s | \ ; RUN: FileCheck %s -check-prefix=CHECK-MIPSN32 ; Test that the expansion of ADJCALLSTACKDOWN and ADJCALLSTACKUP generate Index: test/CodeGen/Mips/dynamic-stack-realignment.ll =================================================================== --- test/CodeGen/Mips/dynamic-stack-realignment.ll +++ test/CodeGen/Mips/dynamic-stack-realignment.ll @@ -10,11 +10,11 @@ ; RUN: --check-prefixes=ALL,GP64,N64 ; RUN: llc < %s -march=mips64 -mcpu=mips64r6 -relocation-model=pic | FileCheck %s \ ; RUN: --check-prefixes=ALL,GP64,N64 -; RUN: llc < %s -march=mips64 -mcpu=mips3 -target-abi n32 -relocation-model=pic | FileCheck %s \ +; RUN: llc < %s -march=mips64 -mcpu=mips3 -mabi=n32 -relocation-model=pic | FileCheck %s \ ; RUN: --check-prefixes=ALL,GP64,N32 -; RUN: llc < %s -march=mips64 -mcpu=mips64 -target-abi n32 -relocation-model=pic | FileCheck %s \ +; RUN: llc < %s -march=mips64 -mcpu=mips64 -mabi=n32 -relocation-model=pic | FileCheck %s \ ; RUN: --check-prefixes=ALL,GP64,N32 -; RUN: llc < %s -march=mips64 -mcpu=mips64r6 -target-abi n32 -relocation-model=pic | FileCheck %s \ +; RUN: llc < %s -march=mips64 -mcpu=mips64r6 -mabi=n32 -relocation-model=pic | FileCheck %s \ ; RUN: --check-prefixes=ALL,GP64,N32 ; Check dynamic stack realignment in functions without variable-sized objects. Index: test/CodeGen/Mips/ehframe-indirect.ll =================================================================== --- test/CodeGen/Mips/ehframe-indirect.ll +++ test/CodeGen/Mips/ehframe-indirect.ll @@ -2,9 +2,9 @@ ; RUN: FileCheck -check-prefixes=ALL,LINUX,LINUX-O32,O32 %s ; RUN: llc -mtriple=mipsel-linux-android < %s -asm-verbose -relocation-model=pic | \ ; RUN: FileCheck -check-prefixes=ALL,LINUX,LINUX-O32,O32 %s -; RUN: llc -mtriple=mips64el-linux-gnu -target-abi=n32 < %s -asm-verbose -relocation-model=pic | \ +; RUN: llc -mtriple=mips64el-linux-gnu -mabi=n32 < %s -asm-verbose -relocation-model=pic | \ ; RUN: FileCheck -check-prefixes=ALL,LINUX,LINUX-N32,N32 %s -; RUN: llc -mtriple=mips64el-linux-android -target-abi=n32 < %s -asm-verbose -relocation-model=pic | \ +; RUN: llc -mtriple=mips64el-linux-android -mabi=n32 < %s -asm-verbose -relocation-model=pic | \ ; RUN: FileCheck -check-prefixes=ALL,LINUX,LINUX-N32,N32 %s ; RUN: llc -mtriple=mips64el-linux-gnu < %s -asm-verbose -relocation-model=pic | \ ; RUN: FileCheck -check-prefixes=ALL,LINUX,LINUX-N64,N64 %s Index: test/CodeGen/Mips/elf_eflags.ll =================================================================== --- test/CodeGen/Mips/elf_eflags.ll +++ test/CodeGen/Mips/elf_eflags.ll @@ -23,13 +23,13 @@ ; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips32r2 -mattr=+micromips -relocation-model=static %s -o - | FileCheck -check-prefix=CHECK-LE32R2-MICROMIPS %s ; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips32r2 -mattr=+micromips %s -o - | FileCheck -check-prefix=CHECK-LE32R2-MICROMIPS_PIC %s -; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips4 -target-abi n64 -relocation-model=static %s -o - | FileCheck -check-prefix=CHECK-LE64 %s -; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips4 -target-abi n64 %s -o - | FileCheck -check-prefix=CHECK-LE64_PIC %s +; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips4 -mabi=n64 -relocation-model=static %s -o - | FileCheck -check-prefix=CHECK-LE64 %s +; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips4 -mabi=n64 %s -o - | FileCheck -check-prefix=CHECK-LE64_PIC %s -; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64 -target-abi n64 -relocation-model=static %s -o - | FileCheck -check-prefix=CHECK-LE64 %s -; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64 -target-abi n64 %s -o - | FileCheck -check-prefix=CHECK-LE64_PIC %s -; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64r2 -target-abi n64 -relocation-model=static %s -o - | FileCheck -check-prefix=CHECK-LE64R2 %s -; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64r2 -target-abi n64 %s -o - | FileCheck -check-prefix=CHECK-LE64R2_PIC %s +; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64 -mabi=n64 -relocation-model=static %s -o - | FileCheck -check-prefix=CHECK-LE64 %s +; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64 -mabi=n64 %s -o - | FileCheck -check-prefix=CHECK-LE64_PIC %s +; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64r2 -mabi=n64 -relocation-model=static %s -o - | FileCheck -check-prefix=CHECK-LE64R2 %s +; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips64r2 -mabi=n64 %s -o - | FileCheck -check-prefix=CHECK-LE64R2_PIC %s ; RUN: llc -mtriple mipsel-unknown-linux -mcpu=mips32r2 -mattr=+mips16 -relocation-model=pic %s -o - | FileCheck -check-prefix=CHECK-LE32R2-MIPS16 %s Index: test/CodeGen/Mips/fcopysign-f32-f64.ll =================================================================== --- test/CodeGen/Mips/fcopysign-f32-f64.ll +++ test/CodeGen/Mips/fcopysign-f32-f64.ll @@ -1,8 +1,8 @@ -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi=n64 | \ +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n64 | \ ; RUN: FileCheck %s -check-prefixes=ALL,64 -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi=n64 | \ +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 | \ ; RUN: FileCheck %s -check-prefixes=ALL,64 -; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -target-abi=n64 | \ +; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -mabi=n64 | \ ; RUN: FileCheck %s -check-prefixes=ALL,64R2 declare double @copysign(double, double) nounwind readnone Index: test/CodeGen/Mips/fcopysign.ll =================================================================== --- test/CodeGen/Mips/fcopysign.ll +++ test/CodeGen/Mips/fcopysign.ll @@ -1,8 +1,8 @@ ; RUN: llc < %s -march=mipsel -mcpu=mips32 | FileCheck %s -check-prefix=32 ; RUN: llc < %s -march=mipsel -mcpu=mips32r2 | FileCheck %s -check-prefix=32R2 -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi=n64 | FileCheck %s -check-prefix=64 -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi=n64 | FileCheck %s -check-prefix=64 -; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -target-abi=n64 | FileCheck %s -check-prefix=64R2 +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n64 | FileCheck %s -check-prefix=64 +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 | FileCheck %s -check-prefix=64 +; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -mabi=n64 | FileCheck %s -check-prefix=64R2 define double @func0(double %d0, double %d1) nounwind readnone { entry: Index: test/CodeGen/Mips/fmadd1.ll =================================================================== --- test/CodeGen/Mips/fmadd1.ll +++ test/CodeGen/Mips/fmadd1.ll @@ -5,18 +5,18 @@ ; IEEE 754 (1985) and IEEE 754 (2008). These instructions are therefore only ; available when -enable-no-nans-fp-math is given. -; RUN: llc < %s -march=mipsel -mcpu=mips32 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,32,32-NONAN -; RUN: llc < %s -march=mipsel -mcpu=mips32r2 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,32R2,32R2-NONAN -; RUN: llc < %s -march=mipsel -mcpu=mips32r6 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,32R6,32R6-NONAN -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi=n64 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,64,64-NONAN -; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -target-abi=n64 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,64R2,64R2-NONAN -; RUN: llc < %s -march=mips64el -mcpu=mips64r6 -target-abi=n64 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,64R6,64R6-NONAN -; RUN: llc < %s -march=mipsel -mcpu=mips32 | FileCheck %s -check-prefixes=ALL,32,32-NAN -; RUN: llc < %s -march=mipsel -mcpu=mips32r2 | FileCheck %s -check-prefixes=ALL,32R2,32R2-NAN -; RUN: llc < %s -march=mipsel -mcpu=mips32r6 | FileCheck %s -check-prefixes=ALL,32R6,32R6-NAN -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi=n64 | FileCheck %s -check-prefixes=ALL,64,64-NAN -; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -target-abi=n64 | FileCheck %s -check-prefixes=ALL,64R2,64R2-NAN -; RUN: llc < %s -march=mips64el -mcpu=mips64r6 -target-abi=n64 | FileCheck %s -check-prefixes=ALL,64R6,64R6-NAN +; RUN: llc < %s -march=mipsel -mcpu=mips32 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,32,32-NONAN +; RUN: llc < %s -march=mipsel -mcpu=mips32r2 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,32R2,32R2-NONAN +; RUN: llc < %s -march=mipsel -mcpu=mips32r6 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,32R6,32R6-NONAN +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,64,64-NONAN +; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -mabi=n64 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,64R2,64R2-NONAN +; RUN: llc < %s -march=mips64el -mcpu=mips64r6 -mabi=n64 -enable-no-nans-fp-math | FileCheck %s -check-prefixes=ALL,64R6,64R6-NONAN +; RUN: llc < %s -march=mipsel -mcpu=mips32 | FileCheck %s -check-prefixes=ALL,32,32-NAN +; RUN: llc < %s -march=mipsel -mcpu=mips32r2 | FileCheck %s -check-prefixes=ALL,32R2,32R2-NAN +; RUN: llc < %s -march=mipsel -mcpu=mips32r6 | FileCheck %s -check-prefixes=ALL,32R6,32R6-NAN +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 | FileCheck %s -check-prefixes=ALL,64,64-NAN +; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -mabi=n64 | FileCheck %s -check-prefixes=ALL,64R2,64R2-NAN +; RUN: llc < %s -march=mips64el -mcpu=mips64r6 -mabi=n64 | FileCheck %s -check-prefixes=ALL,64R6,64R6-NAN define float @FOO0float(float %a, float %b, float %c) nounwind readnone { entry: Index: test/CodeGen/Mips/fp-indexed-ls.ll =================================================================== --- test/CodeGen/Mips/fp-indexed-ls.ll +++ test/CodeGen/Mips/fp-indexed-ls.ll @@ -1,10 +1,10 @@ ; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS32R1 ; RUN: llc -march=mipsel -mcpu=mips32r2 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS32R2 ; RUN: llc -march=mipsel -mcpu=mips32r6 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS32R6 -; RUN: llc -march=mips64el -mcpu=mips4 -target-abi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS4 -; RUN: llc -march=mips64el -mcpu=mips64 -target-abi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS4 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS4 -; RUN: llc -march=mips64el -mcpu=mips64r6 -target-abi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS64R6 +; RUN: llc -march=mips64el -mcpu=mips4 -mabi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS4 +; RUN: llc -march=mips64el -mcpu=mips64 -mabi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS4 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS4 +; RUN: llc -march=mips64el -mcpu=mips64r6 -mabi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefixes=ALL,MIPS64R6 ; Check that [ls][dwu]xc1 are not emitted for nacl. ; RUN: llc -mtriple=mipsel-none-nacl-gnu -mcpu=mips32r2 < %s | FileCheck %s -check-prefix=CHECK-NACL Index: test/CodeGen/Mips/fpxx.ll =================================================================== --- test/CodeGen/Mips/fpxx.ll +++ test/CodeGen/Mips/fpxx.ll @@ -10,11 +10,11 @@ ; RUN: llc -march=mips64 -mcpu=mips64 < %s | FileCheck %s -check-prefixes=ALL,64-NOFPXX ; RUN: not llc -march=mips64 -mcpu=mips64 -mattr=fpxx < %s 2>&1 | FileCheck %s -check-prefix=64-FPXX -; RUN-TODO: llc -march=mips64 -mcpu=mips4 -target-abi o32 < %s | FileCheck %s -check-prefixes=ALL,4-O32-NOFPXX -; RUN-TODO: llc -march=mips64 -mcpu=mips4 -target-abi o32 -mattr=fpxx < %s | FileCheck %s -check-prefixes=ALL,4-O32-FPXX +; RUN-TODO: llc -march=mips64 -mcpu=mips4 -mabi=o32 < %s | FileCheck %s -check-prefixes=ALL,4-O32-NOFPXX +; RUN-TODO: llc -march=mips64 -mcpu=mips4 -mabi=o32 -mattr=fpxx < %s | FileCheck %s -check-prefixes=ALL,4-O32-FPXX -; RUN-TODO: llc -march=mips64 -mcpu=mips64 -target-abi o32 < %s | FileCheck %s -check-prefixes=ALL,64-O32-NOFPXX -; RUN-TODO: llc -march=mips64 -mcpu=mips64 -target-abi o32 -mattr=fpxx < %s | FileCheck %s -check-prefixes=ALL,64-O32-FPXX +; RUN-TODO: llc -march=mips64 -mcpu=mips64 -mabi=o32 < %s | FileCheck %s -check-prefixes=ALL,64-O32-NOFPXX +; RUN-TODO: llc -march=mips64 -mcpu=mips64 -mabi=o32 -mattr=fpxx < %s | FileCheck %s -check-prefixes=ALL,64-O32-FPXX declare double @dbl(); Index: test/CodeGen/Mips/global-address.ll =================================================================== --- test/CodeGen/Mips/global-address.ll +++ test/CodeGen/Mips/global-address.ll @@ -1,9 +1,9 @@ ; RUN: llc -march=mipsel -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-O32 ; RUN: llc -march=mipsel -relocation-model=static -mtriple=mipsel-linux-gnu < %s | FileCheck %s -check-prefix=STATIC-O32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n32 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n32 -relocation-model=static -mtriple=mipsel-linux-gnu < %s | FileCheck %s -check-prefix=STATIC-N32 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n64 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N64 -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi n64 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N64 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n32 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N32 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n32 -relocation-model=static -mtriple=mipsel-linux-gnu < %s | FileCheck %s -check-prefix=STATIC-N32 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC-N64 +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC-N64 @s1 = internal unnamed_addr global i32 8, align 4 @g1 = external global i32 Index: test/CodeGen/Mips/inlineasm-cnstrnt-reg64.ll =================================================================== --- test/CodeGen/Mips/inlineasm-cnstrnt-reg64.ll +++ test/CodeGen/Mips/inlineasm-cnstrnt-reg64.ll @@ -3,7 +3,7 @@ ; The target is 64 bit. ; ; -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi=n64 < %s | FileCheck %s +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 < %s | FileCheck %s define i32 @main() nounwind { Index: test/CodeGen/Mips/inlineasm-constraint_ZC_2.ll =================================================================== --- test/CodeGen/Mips/inlineasm-constraint_ZC_2.ll +++ test/CodeGen/Mips/inlineasm-constraint_ZC_2.ll @@ -1,7 +1,7 @@ ; RUN: llc -march=mips -mcpu=mips32r6 < %s | FileCheck %s --check-prefixes=ALL,R6 -; RUN: llc -march=mips -mcpu=mips64r6 -target-abi=n64 < %s | FileCheck %s --check-prefixes=ALL,R6 +; RUN: llc -march=mips -mcpu=mips64r6 -mabi=n64 < %s | FileCheck %s --check-prefixes=ALL,R6 ; RUN: llc -march=mips -mcpu=mips32 < %s | FileCheck %s --check-prefixes=ALL,PRER6 -; RUN: llc -march=mips -mcpu=mips64 -target-abi=n64 < %s | FileCheck %s --check-prefixes=ALL,PRER6 +; RUN: llc -march=mips -mcpu=mips64 -mabi=n64 < %s | FileCheck %s --check-prefixes=ALL,PRER6 %struct.anon = type { [63 x i32], i32, i32 } Index: test/CodeGen/Mips/inlineasm64.ll =================================================================== --- test/CodeGen/Mips/inlineasm64.ll +++ test/CodeGen/Mips/inlineasm64.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi=n64 < %s | FileCheck %s +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 < %s | FileCheck %s @gl2 = external global i64 @gl1 = external global i64 Index: test/CodeGen/Mips/interrupt-attr-64-error.ll =================================================================== --- test/CodeGen/Mips/interrupt-attr-64-error.ll +++ test/CodeGen/Mips/interrupt-attr-64-error.ll @@ -1,4 +1,4 @@ -; RUN: not llc -mcpu=mips64r6 -march=mipsel -target-abi n64 -relocation-model=static < %s 2>%t +; RUN: not llc -mcpu=mips64r6 -march=mipsel -mabi=n64 -relocation-model=static < %s 2>%t ; RUN: FileCheck %s < %t ; CHECK: LLVM ERROR: "interrupt" attribute is only supported for the O32 ABI on MIPS32R2+ at the present time. Index: test/CodeGen/Mips/jumptable_labels.ll =================================================================== --- test/CodeGen/Mips/jumptable_labels.ll +++ test/CodeGen/Mips/jumptable_labels.ll @@ -1,5 +1,5 @@ ; RUN: llc -march=mips < %s | FileCheck %s -check-prefix=O32 -; RUN: llc -march=mips64 -target-abi=n32 < %s | FileCheck %s -check-prefix=N32 +; RUN: llc -march=mips64 -mabi=n32 < %s | FileCheck %s -check-prefix=N32 ; RUN: llc -march=mips64 < %s | FileCheck %s -check-prefix=N64 ; We only use the '$' prefix on O32. The others use the ELF convention. Index: test/CodeGen/Mips/largeimmprinting.ll =================================================================== --- test/CodeGen/Mips/largeimmprinting.ll +++ test/CodeGen/Mips/largeimmprinting.ll @@ -1,7 +1,7 @@ ; RUN: llc -march=mipsel -relocation-model=pic < %s | FileCheck %s -check-prefix=32 -; RUN: llc -march=mips64el -mcpu=mips4 -target-abi=n64 -relocation-model=pic < %s | \ +; RUN: llc -march=mips64el -mcpu=mips4 -mabi=n64 -relocation-model=pic < %s | \ ; RUN: FileCheck %s -check-prefix=64 -; RUN: llc -march=mips64el -mcpu=mips64 -target-abi=n64 -relocation-model=pic < %s | \ +; RUN: llc -march=mips64el -mcpu=mips64 -mabi=n64 -relocation-model=pic < %s | \ ; RUN: FileCheck %s -check-prefix=64 %struct.S1 = type { [65536 x i8] } Index: test/CodeGen/Mips/llvm-ir/add.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/add.ll +++ test/CodeGen/Mips/llvm-ir/add.ll @@ -28,7 +28,7 @@ ; RUN: -check-prefixes=ALL,MMR6,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips -O2 | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips -O2 | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips -O2 | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM64 Index: test/CodeGen/Mips/llvm-ir/and.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/and.ll +++ test/CodeGen/Mips/llvm-ir/and.ll @@ -28,7 +28,7 @@ ; RUN: -check-prefixes=ALL,MM,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM64 define signext i1 @and_i1(i1 signext %a, i1 signext %b) { Index: test/CodeGen/Mips/llvm-ir/lh_lhu.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/lh_lhu.ll +++ test/CodeGen/Mips/llvm-ir/lh_lhu.ll @@ -1,7 +1,7 @@ ; RUN: llc < %s -march=mips -mcpu=mips32r2 -mattr=+micromips -relocation-model=pic | FileCheck %s ; RUN: llc < %s -march=mips -mcpu=mips32r3 -mattr=+micromips -relocation-model=pic | FileCheck %s ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips -relocation-model=pic | FileCheck %s -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips -relocation-model=pic | FileCheck %s +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips -relocation-model=pic | FileCheck %s @us = global i16 0, align 2 Index: test/CodeGen/Mips/llvm-ir/mul.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/mul.ll +++ test/CodeGen/Mips/llvm-ir/mul.ll @@ -26,7 +26,7 @@ ; RUN: FileCheck %s -check-prefixes=MM32,MM32R3 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips -relocation-model=pic | \ ; RUN: FileCheck %s -check-prefixes=MM32,MM32R6 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -mattr=+micromips -target-abi n64 -relocation-model=pic | \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mattr=+micromips -mabi=n64 -relocation-model=pic | \ ; RUN: FileCheck %s -check-prefix=MM64R6 define signext i1 @mul_i1(i1 signext %a, i1 signext %b) { Index: test/CodeGen/Mips/llvm-ir/not.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/not.ll +++ test/CodeGen/Mips/llvm-ir/not.ll @@ -26,7 +26,7 @@ ; RUN: -check-prefixes=ALL,MM,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM64 define signext i1 @not_i1(i1 signext %a) { Index: test/CodeGen/Mips/llvm-ir/or.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/or.ll +++ test/CodeGen/Mips/llvm-ir/or.ll @@ -15,7 +15,7 @@ ; RUN: -check-prefixes=ALL,MM,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM64 define signext i1 @or_i1(i1 signext %a, i1 signext %b) { Index: test/CodeGen/Mips/llvm-ir/sdiv.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/sdiv.ll +++ test/CodeGen/Mips/llvm-ir/sdiv.ll @@ -30,7 +30,7 @@ ; RUN: -check-prefixes=ALL,MMR3,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -mattr=+micromips -target-abi n64 -relocation-model=pic | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mattr=+micromips -mabi=n64 -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM64 define signext i1 @sdiv_i1(i1 signext %a, i1 signext %b) { Index: test/CodeGen/Mips/llvm-ir/srem.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/srem.ll +++ test/CodeGen/Mips/llvm-ir/srem.ll @@ -30,7 +30,7 @@ ; RUN: -check-prefixes=ALL,MMR3,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips -relocation-model=pic | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM64 define signext i1 @srem_i1(i1 signext %a, i1 signext %b) { Index: test/CodeGen/Mips/llvm-ir/udiv.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/udiv.ll +++ test/CodeGen/Mips/llvm-ir/udiv.ll @@ -30,7 +30,7 @@ ; RUN: -check-prefixes=ALL,MMR3,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips -relocation-model=pic | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM64 define zeroext i1 @udiv_i1(i1 zeroext %a, i1 zeroext %b) { Index: test/CodeGen/Mips/llvm-ir/urem.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/urem.ll +++ test/CodeGen/Mips/llvm-ir/urem.ll @@ -30,7 +30,7 @@ ; RUN: -check-prefixes=ALL,MMR3,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips -relocation-model=pic | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips -relocation-model=pic | FileCheck %s \ ; RUN: -check-prefixes=ALL,MMR6,MM64 define signext i1 @urem_i1(i1 signext %a, i1 signext %b) { Index: test/CodeGen/Mips/llvm-ir/xor.ll =================================================================== --- test/CodeGen/Mips/llvm-ir/xor.ll +++ test/CodeGen/Mips/llvm-ir/xor.ll @@ -26,7 +26,7 @@ ; RUN: -check-prefixes=ALL,MM,MM32 ; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM32 -; RUN: llc < %s -march=mips -mcpu=mips64r6 -target-abi n64 -mattr=+micromips | FileCheck %s \ +; RUN: llc < %s -march=mips -mcpu=mips64r6 -mabi=n64 -mattr=+micromips | FileCheck %s \ ; RUN: -check-prefixes=ALL,MM,MM64 define signext i1 @xor_i1(i1 signext %a, i1 signext %b) { Index: test/CodeGen/Mips/load-store-left-right.ll =================================================================== --- test/CodeGen/Mips/load-store-left-right.ll +++ test/CodeGen/Mips/load-store-left-right.ll @@ -1,17 +1,17 @@ -; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EL %s -; RUN: llc -march=mips -mcpu=mips32 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EB %s -; RUN: llc -march=mipsel -mcpu=mips32r2 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EL %s -; RUN: llc -march=mips -mcpu=mips32r2 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EB %s -; RUN: llc -march=mipsel -mcpu=mips32r6 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32R6,MIPS32R6-EL %s -; RUN: llc -march=mips -mcpu=mips32r6 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32R6,MIPS32R6-EB %s -; RUN: llc -march=mips64el -mcpu=mips4 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EL %s -; RUN: llc -march=mips64 -mcpu=mips4 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EB %s -; RUN: llc -march=mips64el -mcpu=mips64 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EL %s -; RUN: llc -march=mips64 -mcpu=mips64 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EB %s -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EL %s -; RUN: llc -march=mips64 -mcpu=mips64r2 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EB %s -; RUN: llc -march=mips64el -mcpu=mips64r6 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64R6,MIPS64R6-EL %s -; RUN: llc -march=mips64 -mcpu=mips64r6 -target-abi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64R6,MIPS64R6-EB %s +; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EL %s +; RUN: llc -march=mips -mcpu=mips32 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EB %s +; RUN: llc -march=mipsel -mcpu=mips32r2 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EL %s +; RUN: llc -march=mips -mcpu=mips32r2 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32,MIPS32-EB %s +; RUN: llc -march=mipsel -mcpu=mips32r6 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32R6,MIPS32R6-EL %s +; RUN: llc -march=mips -mcpu=mips32r6 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS32R6,MIPS32R6-EB %s +; RUN: llc -march=mips64el -mcpu=mips4 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EL %s +; RUN: llc -march=mips64 -mcpu=mips4 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EB %s +; RUN: llc -march=mips64el -mcpu=mips64 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EL %s +; RUN: llc -march=mips64 -mcpu=mips64 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EB %s +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EL %s +; RUN: llc -march=mips64 -mcpu=mips64r2 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64,MIPS64-EB %s +; RUN: llc -march=mips64el -mcpu=mips64r6 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64R6,MIPS64R6-EL %s +; RUN: llc -march=mips64 -mcpu=mips64r6 -mabi=n64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,MIPS64R6,MIPS64R6-EB %s %struct.SLL = type { i64 } %struct.SI = type { i32 } Index: test/CodeGen/Mips/longbranch.ll =================================================================== --- test/CodeGen/Mips/longbranch.ll +++ test/CodeGen/Mips/longbranch.ll @@ -3,11 +3,11 @@ ; RUN: | FileCheck %s -check-prefix=O32 ; RUN: llc -march=mipsel -mcpu=mips32r6 -force-mips-long-branch -O3 \ ; RUN: -relocation-model=pic -asm-show-inst < %s | FileCheck %s -check-prefix=O32-R6 -; RUN: llc -march=mips64el -mcpu=mips4 -target-abi=n64 -force-mips-long-branch -O3 -relocation-model=pic \ +; RUN: llc -march=mips64el -mcpu=mips4 -mabi=n64 -force-mips-long-branch -O3 -relocation-model=pic \ ; RUN: < %s | FileCheck %s -check-prefix=N64 -; RUN: llc -march=mips64el -mcpu=mips64 -target-abi=n64 -force-mips-long-branch -O3 -relocation-model=pic \ +; RUN: llc -march=mips64el -mcpu=mips64 -mabi=n64 -force-mips-long-branch -O3 -relocation-model=pic \ ; RUN: < %s | FileCheck %s -check-prefix=N64 -; RUN: llc -march=mips64el -mcpu=mips64r6 -target-abi=n64 -force-mips-long-branch -O3 \ +; RUN: llc -march=mips64el -mcpu=mips64r6 -mabi=n64 -force-mips-long-branch -O3 \ ; RUN: -relocation-model=pic -asm-show-inst < %s | FileCheck %s -check-prefix=N64-R6 ; RUN: llc -march=mipsel -mcpu=mips32r2 -mattr=micromips \ ; RUN: -force-mips-long-branch -O3 -relocation-model=pic < %s | FileCheck %s -check-prefix=MICROMIPS Index: test/CodeGen/Mips/madd-msub.ll =================================================================== --- test/CodeGen/Mips/madd-msub.ll +++ test/CodeGen/Mips/madd-msub.ll @@ -2,9 +2,9 @@ ; RUN: llc -march=mips -mcpu=mips32r2 < %s | FileCheck %s -check-prefixes=ALL,32 ; RUN: llc -march=mips -mcpu=mips32r6 < %s | FileCheck %s -check-prefixes=ALL,32R6 ; RUN: llc -march=mips -mcpu=mips32 -mattr=dsp < %s | FileCheck %s -check-prefix=DSP -; RUN: llc -march=mips -mcpu=mips64 -target-abi n64 < %s | FileCheck %s -check-prefixes=ALL,64 -; RUN: llc -march=mips -mcpu=mips64r2 -target-abi n64 < %s | FileCheck %s -check-prefixes=ALL,64 -; RUN: llc -march=mips -mcpu=mips64r6 -target-abi n64 < %s | FileCheck %s -check-prefixes=ALL,64R6 +; RUN: llc -march=mips -mcpu=mips64 -mabi=n64 < %s | FileCheck %s -check-prefixes=ALL,64 +; RUN: llc -march=mips -mcpu=mips64r2 -mabi=n64 < %s | FileCheck %s -check-prefixes=ALL,64 +; RUN: llc -march=mips -mcpu=mips64r6 -mabi=n64 < %s | FileCheck %s -check-prefixes=ALL,64R6 ; FIXME: The MIPS16 test should check its output ; RUN: llc -march=mips -mattr=mips16 < %s Index: test/CodeGen/Mips/micromips-lwc1-swc1.ll =================================================================== --- test/CodeGen/Mips/micromips-lwc1-swc1.ll +++ test/CodeGen/Mips/micromips-lwc1-swc1.ll @@ -4,7 +4,7 @@ ; RUN: llc -march=mips -mcpu=mips32r6 -mattr=+micromips \ ; RUN: -relocation-model=pic < %s | \ ; RUN: FileCheck %s -check-prefixes=ALL,MM32 -; RUN: llc -march=mips -mcpu=mips64r6 -mattr=+micromips -target-abi n64 \ +; RUN: llc -march=mips -mcpu=mips64r6 -mattr=+micromips -mabi=n64 \ ; RUN: -relocation-model=pic < %s | \ ; RUN: FileCheck %s -check-prefixes=ALL,MM64 Index: test/CodeGen/Mips/mips64-sret.ll =================================================================== --- test/CodeGen/Mips/mips64-sret.ll +++ test/CodeGen/Mips/mips64-sret.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mips64el -mcpu=mips64r2 -target-abi=n64 < %s | FileCheck %s +; RUN: llc -march=mips64el -mcpu=mips64r2 -mabi=n64 < %s | FileCheck %s define void @foo(i32* noalias sret %agg.result) nounwind { entry: Index: test/CodeGen/Mips/mips64directive.ll =================================================================== --- test/CodeGen/Mips/mips64directive.ll +++ test/CodeGen/Mips/mips64directive.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi=n64 | FileCheck %s -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi=n64 | FileCheck %s +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n64 | FileCheck %s +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 | FileCheck %s @gl = global i64 1250999896321, align 8 Index: test/CodeGen/Mips/mips64ext.ll =================================================================== --- test/CodeGen/Mips/mips64ext.ll +++ test/CodeGen/Mips/mips64ext.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi=n64 | FileCheck %s -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi=n64 | FileCheck %s +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n64 | FileCheck %s +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 | FileCheck %s define i64 @zext64_32(i32 %a) nounwind readnone { entry: Index: test/CodeGen/Mips/mips64extins.ll =================================================================== --- test/CodeGen/Mips/mips64extins.ll +++ test/CodeGen/Mips/mips64extins.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -target-abi=n64 | FileCheck %s +; RUN: llc < %s -march=mips64el -mcpu=mips64r2 -mabi=n64 | FileCheck %s define i64 @dext(i64 %i) nounwind readnone { entry: Index: test/CodeGen/Mips/mips64fpimm0.ll =================================================================== --- test/CodeGen/Mips/mips64fpimm0.ll +++ test/CodeGen/Mips/mips64fpimm0.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi=n64 | FileCheck %s -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi=n64 | FileCheck %s +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n64 | FileCheck %s +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 | FileCheck %s define double @foo1() nounwind readnone { entry: Index: test/CodeGen/Mips/mips64fpldst.ll =================================================================== --- test/CodeGen/Mips/mips64fpldst.ll +++ test/CodeGen/Mips/mips64fpldst.ll @@ -1,9 +1,9 @@ -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 -; RUN: llc < %s -march=mipsel -mcpu=mips64r6 -mattr=+micromips -target-abi n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 -; RUN: llc < %s -march=mipsel -mcpu=mips64r6 -mattr=+micromips -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 +; RUN: llc < %s -march=mipsel -mcpu=mips64r6 -mattr=+micromips -mabi=n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 +; RUN: llc < %s -march=mipsel -mcpu=mips64r6 -mattr=+micromips -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 @f0 = common global float 0.000000e+00, align 4 @d0 = common global double 0.000000e+00, align 8 Index: test/CodeGen/Mips/mips64intldst.ll =================================================================== --- test/CodeGen/Mips/mips64intldst.ll +++ test/CodeGen/Mips/mips64intldst.ll @@ -1,7 +1,7 @@ -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 -; RUN: llc < %s -march=mips64el -mcpu=mips4 -target-abi n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 -; RUN: llc < %s -march=mips64el -mcpu=mips64 -target-abi n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 +; RUN: llc < %s -march=mips64el -mcpu=mips4 -mabi=n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N64 +; RUN: llc < %s -march=mips64el -mcpu=mips64 -mabi=n32 -relocation-model=pic | FileCheck %s -check-prefix=CHECK-N32 @c = common global i8 0, align 4 @s = common global i16 0, align 4 Index: test/CodeGen/Mips/mips64r6/compatibility.ll =================================================================== --- test/CodeGen/Mips/mips64r6/compatibility.ll +++ test/CodeGen/Mips/mips64r6/compatibility.ll @@ -1,5 +1,5 @@ -; RUN: llc -march=mipsel -mcpu=mips64r6 -target-abi n64 < %s | FileCheck %s -; RUN: not llc -march=mipsel -mcpu=mips64r6 -target-abi n64 -mattr=+dsp < %s 2>&1 | FileCheck --check-prefix=DSP %s +; RUN: llc -march=mipsel -mcpu=mips64r6 -mabi=n64 < %s | FileCheck %s +; RUN: not llc -march=mipsel -mcpu=mips64r6 -mabi=n64 -mattr=+dsp < %s 2>&1 | FileCheck --check-prefix=DSP %s ; CHECK: foo: ; DSP: MIPS64r6 is not compatible with the DSP ASE Index: test/CodeGen/Mips/msa/basic_operations.ll =================================================================== --- test/CodeGen/Mips/msa/basic_operations.ll +++ test/CodeGen/Mips/msa/basic_operations.ll @@ -4,10 +4,10 @@ ; RUN: llc -march=mipsel -mattr=+msa,+fp64 -relocation-model=pic \ ; RUN: -verify-machineinstrs < %s | \ ; RUN: FileCheck -check-prefixes=ALL,O32,MIPS32,ALL-LE %s -; RUN: llc -march=mips64 -target-abi n32 -mattr=+msa,+fp64 \ +; RUN: llc -march=mips64 -mabi=n32 -mattr=+msa,+fp64 \ ; RUN: -relocation-model=pic -verify-machineinstrs < %s | \ ; RUN: FileCheck -check-prefixes=ALL,N32,MIPS64,ALL-BE %s -; RUN: llc -march=mips64el -target-abi n32 -mattr=+msa,+fp64 \ +; RUN: llc -march=mips64el -mabi=n32 -mattr=+msa,+fp64 \ ; RUN: -relocation-model=pic -verify-machineinstrs < %s | \ ; RUN: FileCheck -check-prefixes=ALL,N32,MIPS64,ALL-LE %s ; RUN: llc -march=mips64 -mattr=+msa,+fp64 -relocation-model=pic \ Index: test/CodeGen/Mips/msa/basic_operations_float.ll =================================================================== --- test/CodeGen/Mips/msa/basic_operations_float.ll +++ test/CodeGen/Mips/msa/basic_operations_float.ll @@ -1,7 +1,7 @@ ; RUN: llc -march=mips -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,O32 %s ; RUN: llc -march=mipsel -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,O32 %s -; RUN: llc -march=mips64 -target-abi=n32 -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,N32 %s -; RUN: llc -march=mips64el -target-abi=n32 -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64 -mabi=n32 -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,N32 %s +; RUN: llc -march=mips64el -mabi=n32 -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,N32 %s ; RUN: llc -march=mips64 -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,N64 %s ; RUN: llc -march=mips64el -mattr=+msa,+fp64 -relocation-model=pic < %s | FileCheck -check-prefixes=ALL,N64 %s Index: test/CodeGen/Mips/named-register-n32.ll =================================================================== --- test/CodeGen/Mips/named-register-n32.ll +++ test/CodeGen/Mips/named-register-n32.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mips64 -relocation-model=static -mattr=+noabicalls -target-abi n32 < %s | FileCheck %s +; RUN: llc -march=mips64 -relocation-model=static -mattr=+noabicalls -mabi=n32 < %s | FileCheck %s define i32* @get_gp() { entry: Index: test/CodeGen/Mips/remat-immed-load.ll =================================================================== --- test/CodeGen/Mips/remat-immed-load.ll +++ test/CodeGen/Mips/remat-immed-load.ll @@ -1,6 +1,6 @@ ; RUN: llc -march=mipsel < %s | FileCheck %s -check-prefix=32 -; RUN: llc -march=mips64el -mcpu=mips4 -target-abi=n64 < %s | FileCheck %s -check-prefix=64 -; RUN: llc -march=mips64el -mcpu=mips64 -target-abi=n64 < %s | FileCheck %s -check-prefix=64 +; RUN: llc -march=mips64el -mcpu=mips4 -mabi=n64 < %s | FileCheck %s -check-prefix=64 +; RUN: llc -march=mips64el -mcpu=mips64 -mabi=n64 < %s | FileCheck %s -check-prefix=64 define void @f0() nounwind { entry: Index: test/CodeGen/Mips/start-asm-file.ll =================================================================== --- test/CodeGen/Mips/start-asm-file.ll +++ test/CodeGen/Mips/start-asm-file.ll @@ -19,36 +19,36 @@ ; ### N32 ABI ### ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=static -target-abi n32 %s -o - | \ +; RUN: -relocation-model=static -mabi=n32 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-STATIC-N32,CHECK-STATIC-N32-NLEGACY %s ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=pic -target-abi n32 %s -o - | \ +; RUN: -relocation-model=pic -mabi=n32 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-PIC-N32,CHECK-PIC-N32-NLEGACY %s ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=static -target-abi n32 -mattr=+nan2008 %s -o - | \ +; RUN: -relocation-model=static -mabi=n32 -mattr=+nan2008 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-STATIC-N32,CHECK-STATIC-N32-N2008 %s ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=pic -target-abi n32 -mattr=+nan2008 %s -o - | \ +; RUN: -relocation-model=pic -mabi=n32 -mattr=+nan2008 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-PIC-N32,CHECK-PIC-N32-N2008 %s ; ### N64 ABI ### ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=static -target-abi n64 %s -o - | \ +; RUN: -relocation-model=static -mabi=n64 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-STATIC-N64,CHECK-STATIC-N64-NLEGACY %s ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=pic -target-abi n64 %s -o - | \ +; RUN: -relocation-model=pic -mabi=n64 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-PIC-N64,CHECK-PIC-N64-NLEGACY %s ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=static -target-abi n64 -mattr=+nan2008 %s -o - | \ +; RUN: -relocation-model=static -mabi=n64 -mattr=+nan2008 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-STATIC-N64,CHECK-STATIC-N64-N2008 %s ; RUN: llc -filetype=asm -mtriple mips64-unknown-linux -mcpu=mips64 \ -; RUN: -relocation-model=pic -target-abi n64 -mattr=+nan2008 %s -o - | \ +; RUN: -relocation-model=pic -mabi=n64 -mattr=+nan2008 %s -o - | \ ; RUN: FileCheck -check-prefixes=CHECK-PIC-N64,CHECK-PIC-N64-N2008 %s ; CHECK-STATIC-O32: .abicalls Index: test/CodeGen/Mips/tailcall/tail-call-arguments-clobber.ll =================================================================== --- test/CodeGen/Mips/tailcall/tail-call-arguments-clobber.ll +++ test/CodeGen/Mips/tailcall/tail-call-arguments-clobber.ll @@ -1,8 +1,8 @@ ; RUN: llc -march=mips -mcpu=mips32 -O0 -relocation-model=pic -mips-tail-calls=1 < %s | FileCheck \ ; RUN: %s -check-prefix=MIPS32 -; RUN: llc -march=mips64 -mcpu=mips64 -O0 -relocation-model=pic -target-abi n64 \ +; RUN: llc -march=mips64 -mcpu=mips64 -O0 -relocation-model=pic -mabi=n64 \ ; RUN: -mips-tail-calls=1 < %s | FileCheck %s -check-prefix=MIPS64 -; RUN: llc -march=mips64 -mcpu=mips64 -O0 -relocation-model=pic -target-abi n32 \ +; RUN: llc -march=mips64 -mcpu=mips64 -O0 -relocation-model=pic -mabi=n32 \ ; RUN: -mips-tail-calls=1 < %s | FileCheck %s -check-prefix=MIPS64 Index: test/CodeGen/Mips/zeroreg.ll =================================================================== --- test/CodeGen/Mips/zeroreg.ll +++ test/CodeGen/Mips/zeroreg.ll @@ -1,10 +1,10 @@ ; RUN: llc < %s -march=mipsel -mcpu=mips32 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,32-CMOV ; RUN: llc < %s -march=mipsel -mcpu=mips32r2 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,32-CMOV ; RUN: llc < %s -march=mipsel -mcpu=mips32r6 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,32R6 -; RUN: llc < %s -march=mipsel -mcpu=mips4 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64-CMOV -; RUN: llc < %s -march=mipsel -mcpu=mips64 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64-CMOV -; RUN: llc < %s -march=mipsel -mcpu=mips64r2 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64-CMOV -; RUN: llc < %s -march=mipsel -mcpu=mips64r6 -target-abi n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64R6 +; RUN: llc < %s -march=mipsel -mcpu=mips4 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64-CMOV +; RUN: llc < %s -march=mipsel -mcpu=mips64 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64-CMOV +; RUN: llc < %s -march=mipsel -mcpu=mips64r2 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64-CMOV +; RUN: llc < %s -march=mipsel -mcpu=mips64r6 -mabi=n64 -relocation-model=pic | FileCheck %s -check-prefixes=ALL,64R6 @g1 = external global i32 Index: test/CodeGen/PowerPC/ppc64-elf-abi.ll =================================================================== --- test/CodeGen/PowerPC/ppc64-elf-abi.ll +++ test/CodeGen/PowerPC/ppc64-elf-abi.ll @@ -1,9 +1,9 @@ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1 -; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1 -; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2 +; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -mabi=elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1 +; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -mabi=elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2 ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2 -; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1 -; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2 +; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -mabi=elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1 +; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -mabi=elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2 ; CHECK-ELFv2: .abiversion 2 ; CHECK-ELFv1-NOT: .abiversion 2 Index: test/ExecutionEngine/RuntimeDyld/Mips/ELF_N32_relocations.s =================================================================== --- test/ExecutionEngine/RuntimeDyld/Mips/ELF_N32_relocations.s +++ test/ExecutionEngine/RuntimeDyld/Mips/ELF_N32_relocations.s @@ -1,9 +1,9 @@ -# RUN: llvm-mc -triple=mips64el-unknown-linux -target-abi n32 -code-model=small -filetype=obj -o %T/test_ELF_N32.o %s -# RUN: llc -mtriple=mips64el-unknown-linux -target-abi n32 -filetype=obj -o %T/test_ELF_ExternalFunction_N32.o %S/Inputs/ExternalFunction.ll +# RUN: llvm-mc -triple=mips64el-unknown-linux -mabi=n32 -code-model=small -filetype=obj -o %T/test_ELF_N32.o %s +# RUN: llc -mtriple=mips64el-unknown-linux -mabi=n32 -filetype=obj -o %T/test_ELF_ExternalFunction_N32.o %S/Inputs/ExternalFunction.ll # RUN: llvm-rtdyld -triple=mips64el-unknown-linux -verify -map-section test_ELF_N32.o,.text=0x1000 -map-section test_ELF_ExternalFunction_N32.o,.text=0x10000 -check=%s %/T/test_ELF_N32.o %T/test_ELF_ExternalFunction_N32.o -# RUN: llvm-mc -triple=mips64-unknown-linux -target-abi n32 -code-model=small -filetype=obj -o %T/test_ELF_N32.o %s -# RUN: llc -mtriple=mips64-unknown-linux -target-abi n32 -filetype=obj -o %T/test_ELF_ExternalFunction_N32.o %S/Inputs/ExternalFunction.ll +# RUN: llvm-mc -triple=mips64-unknown-linux -mabi=n32 -code-model=small -filetype=obj -o %T/test_ELF_N32.o %s +# RUN: llc -mtriple=mips64-unknown-linux -mabi=n32 -filetype=obj -o %T/test_ELF_ExternalFunction_N32.o %S/Inputs/ExternalFunction.ll # RUN: llvm-rtdyld -triple=mips64-unknown-linux -verify -map-section test_ELF_N32.o,.text=0x1000 -map-section test_ELF_ExternalFunction_N32.o,.text=0x10000 -check=%s %/T/test_ELF_N32.o %T/test_ELF_ExternalFunction_N32.o .data Index: test/MC/AArch64/arm32-elf-relocs.s =================================================================== --- test/MC/AArch64/arm32-elf-relocs.s +++ test/MC/AArch64/arm32-elf-relocs.s @@ -1,5 +1,5 @@ // RUN: llvm-mc -triple=arm64-linux-gnu -o - < %s | FileCheck %s -// RUN: llvm-mc -target-abi=ilp32 -triple=arm64-linux-gnu -filetype=obj < %s | \ +// RUN: llvm-mc -mabi=ilp32 -triple=arm64-linux-gnu -filetype=obj < %s | \ // RUN: llvm-objdump -triple=arm64-linux-gnu - -r | \ // RUN: FileCheck %s --check-prefix=CHECK-OBJ-ILP32 Index: test/MC/AArch64/arm64-ilp32.s =================================================================== --- test/MC/AArch64/arm64-ilp32.s +++ test/MC/AArch64/arm64-ilp32.s @@ -1,4 +1,4 @@ -// RUN: llvm-mc -target-abi=ilp32 -triple aarch64-non-linux-gnu -filetype=obj \ +// RUN: llvm-mc -mabi=ilp32 -triple aarch64-non-linux-gnu -filetype=obj \ // RUN: %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-ILP32 %s // RUN: llvm-mc -triple aarch64-non-linux-gnu -filetype=obj \ // RUN: %s | llvm-objdump -r - | FileCheck --check-prefix=CHECK-LP64 %s Index: test/MC/AArch64/ilp32-diagnostics.s =================================================================== --- test/MC/AArch64/ilp32-diagnostics.s +++ test/MC/AArch64/ilp32-diagnostics.s @@ -1,4 +1,4 @@ -// RUN: not llvm-mc -triple aarch64-none-linux-gnu -target-abi=ilp32 \ +// RUN: not llvm-mc -triple aarch64-none-linux-gnu -mabi=ilp32 \ // RUN: < %s 2> %t2 -filetype=obj // RUN: FileCheck --check-prefix=CHECK-ERROR %s < %t2 Index: test/MC/Mips/cpload.s =================================================================== --- test/MC/Mips/cpload.s +++ test/MC/Mips/cpload.s @@ -3,7 +3,7 @@ # 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 -arch=mips64 -mcpu=mips64r2 -target-abi n32 -filetype=obj -o -| \ +# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mabi=n32 -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 -| \ Index: test/MC/Mips/cprestore-noreorder-noat.s =================================================================== --- test/MC/Mips/cprestore-noreorder-noat.s +++ test/MC/Mips/cprestore-noreorder-noat.s @@ -4,12 +4,11 @@ # 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 -arch=mips64 -mcpu=mips64 -target-abi=n32 \ +# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n32 \ # RUN: -filetype=obj -o /dev/null 2>&1 | FileCheck %s -allow-empty -check-prefix=N64 -# 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 -arch=mips64 -mcpu=mips64 -mabi=n32 -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 Index: test/MC/Mips/cprestore-noreorder.s =================================================================== --- test/MC/Mips/cprestore-noreorder.s +++ test/MC/Mips/cprestore-noreorder.s @@ -10,10 +10,10 @@ # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -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 -arch=mips -mcpu=mips64 -mabi=n32 --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 -arch=mips64 -mcpu=mips64 -mabi=n64 --position-independent -show-encoding | \ # RUN: FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N64 .text Index: test/MC/Mips/cprestore-reorder.s =================================================================== --- test/MC/Mips/cprestore-reorder.s +++ test/MC/Mips/cprestore-reorder.s @@ -10,10 +10,10 @@ # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -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 -arch=mips -mcpu=mips64 -mabi=n32 --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 -arch=mips64 -mcpu=mips64 -mabi=n64 --position-independent -show-encoding | \ # RUN: FileCheck %s -check-prefixes=BAD-ABI,BAD-ABI-N64 .text Index: test/MC/Mips/cpsetup.s =================================================================== --- test/MC/Mips/cpsetup.s +++ test/MC/Mips/cpsetup.s @@ -1,14 +1,14 @@ -# RUN: llvm-mc -triple mips-unknown-linux -target-abi o32 -filetype=obj -o - %s | \ +# RUN: llvm-mc -triple mips-unknown-linux -mabi=o32 -filetype=obj -o - %s | \ # RUN: llvm-objdump -d -r - | FileCheck -check-prefixes=ALL,O32 %s -# RUN: llvm-mc -triple mips-unknown-unknown -target-abi o32 %s | \ +# RUN: llvm-mc -triple mips-unknown-unknown -mabi=o32 %s | \ # RUN: FileCheck -check-prefixes=ALL,ASM,ASM-O32 %s -# RUN: llvm-mc -triple mips64-unknown-linux -target-abi n32 -filetype=obj -o - %s | \ +# RUN: llvm-mc -triple mips64-unknown-linux -mabi=n32 -filetype=obj -o - %s | \ # RUN: llvm-objdump -d -r - | \ # RUN: FileCheck -check-prefixes=ALL,NXX,N32 %s -# RUN: llvm-mc -triple mips64-unknown-unknown -target-abi n32 %s | \ +# RUN: llvm-mc -triple mips64-unknown-unknown -mabi=n32 %s | \ # RUN: FileCheck -check-prefixes=ALL,ASM,ASM-N32 %s # RUN: llvm-mc -triple mips64-unknown-linux %s -filetype=obj -o - | \ Index: test/MC/Mips/do_switch3.s =================================================================== --- test/MC/Mips/do_switch3.s +++ test/MC/Mips/do_switch3.s @@ -2,7 +2,7 @@ // produced. This was not handled for direct object and an assertion // to occur. This is a variation on test case test/CodeGen/Mips/do_switch.ll -// RUN: llvm-mc < %s -filetype=obj -triple=mips64-pc-linux -mcpu=mips64 -target-abi=n64 +// RUN: llvm-mc < %s -filetype=obj -triple=mips64-pc-linux -mcpu=mips64 -mabi=n64 .text .abicalls Index: test/MC/Mips/elf_eflags.s =================================================================== --- test/MC/Mips/elf_eflags.s +++ test/MC/Mips/elf_eflags.s @@ -1,26 +1,26 @@ # These *MUST* match the output of 'gcc -c' compiled with the same triple and # corresponding options (-mcpu=mips32 -> -mips32 for example). -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r6 -target-abi n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R6 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r6 -mabi=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R6 %s # MIPSEL-MIPS64R6: Flags [ (0xA0000406) -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r6 -target-abi n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R6-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r6 -mabi=n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R6-NAN2008 %s # MIPSEL-MIPS64R6-NAN2008: Flags [ (0xA0000406) -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r2 -target-abi n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2 %s -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r3 -target-abi n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2 %s -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r5 -target-abi n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r2 -mabi=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r3 -mabi=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r5 -mabi=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2 %s # MIPSEL-MIPS64R2: Flags [ (0x80000006) -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r2 -target-abi n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2-NAN2008 %s -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r3 -target-abi n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2-NAN2008 %s -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r5 -target-abi n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r2 -mabi=n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r3 -mabi=n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r5 -mabi=n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64R2-NAN2008 %s # MIPSEL-MIPS64R2-NAN2008: Flags [ (0x80000406) -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64 -target-abi n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64 -mabi=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64 %s # MIPSEL-MIPS64: Flags [ (0x60000006) -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64 -target-abi n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64 -mabi=n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS64-NAN2008 %s # MIPSEL-MIPS64-NAN2008: Flags [ (0x60000406) # RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips32r6 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS32R6 %s @@ -45,35 +45,35 @@ # RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips32 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-MIPS32-NAN2008 %s # MIPSEL-MIPS32-NAN2008: Flags [ (0x50001404) -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r2 -target-abi n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N32 %s -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -target-abi n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N32 %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=mips64r2 -mabi=n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N32 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mabi=n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N32 %s # MIPS64EL-MIPS64R2-N32: Flags [ (0x80000024) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -target-abi n32 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N32-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mabi=n32 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N32-NAN2008 %s # MIPS64EL-MIPS64R2-N32-NAN2008: Flags [ (0x80000424) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 -target-abi n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N32 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 -mabi=n32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N32 %s # MIPS64EL-MIPS64-N32: Flags [ (0x60000024) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 -target-abi n32 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N32-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 -mabi=n32 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N32-NAN2008 %s # MIPS64EL-MIPS64-N32-NAN2008: Flags [ (0x60000424) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -target-abi n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N64 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mabi=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N64 %s # MIPS64EL-MIPS64R2-N64: Flags [ (0x80000006) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -target-abi n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N64-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mabi=n64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-N64-NAN2008 %s # MIPS64EL-MIPS64R2-N64-NAN2008: Flags [ (0x80000406) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -target-abi n64 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N64 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -mabi=n64 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N64 %s # MIPS64EL-MIPS64-N64: Flags [ (0x60000006) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -target-abi n64 -mattr=+nan2008 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N64-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -mabi=n64 -mattr=+nan2008 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-N64-NAN2008 %s # MIPS64EL-MIPS64-N64-NAN2008: Flags [ (0x60000406) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -target-abi o32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-O32 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mabi=o32 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-O32 %s # MIPS64EL-MIPS64R2-O32: Flags [ (0x80001104) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -target-abi o32 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-O32-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64r2 -mabi=o32 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64R2-O32-NAN2008 %s # MIPS64EL-MIPS64R2-O32-NAN2008: Flags [ (0x80001504) # RUN: llvm-mc -filetype=obj -triple mips64-unknown-linux -mcpu=mips5 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS5 %s @@ -106,10 +106,10 @@ # RUN: llvm-mc -filetype=obj -triple mips-unknown-linux -mcpu=mips1 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS1-NAN2008 %s # MIPS1-NAN2008: Flags [ (0x1404) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -target-abi o32 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-O32 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -mabi=o32 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-O32 %s # MIPS64EL-MIPS64-O32: Flags [ (0x60001104) -# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -target-abi o32 -mattr=+nan2008 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-O32-NAN2008 %s +# RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 %s -mabi=o32 -mattr=+nan2008 -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-O32-NAN2008 %s # MIPS64EL-MIPS64-O32-NAN2008: Flags [ (0x60001504) # Default ABI for MIPS64 is N64 as opposed to GCC/GAS (N32) @@ -126,5 +126,5 @@ # RUN: llvm-mc -filetype=obj -triple mips64el-unknown-linux -mcpu=mips64 -mattr=+nan2008 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPS64EL-MIPS64-NAN2008 %s # MIPS64EL-MIPS64-NAN2008: Flags [ (0x60000406) -# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=octeon -target-abi n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-OCTEON %s +# RUN: llvm-mc -filetype=obj -triple mipsel-unknown-linux -mcpu=octeon -mabi=n64 %s -o -| llvm-readobj -h | FileCheck --check-prefix=MIPSEL-OCTEON %s # MIPSEL-OCTEON: Flags [ (0x808B0006) Index: test/MC/Mips/elf_reginfo.s =================================================================== --- test/MC/Mips/elf_reginfo.s +++ test/MC/Mips/elf_reginfo.s @@ -1,9 +1,9 @@ # These *MUST* match the output of gas compiled with the same triple and # corresponding options (-mabi=64 -> -mattr=+n64 for example). -# RUN: llvm-mc -filetype=obj -triple=mips64el-linux -target-abi n64 %s -o - \ +# RUN: llvm-mc -filetype=obj -triple=mips64el-linux -mabi=n64 %s -o - \ # RUN: | llvm-readobj -s | FileCheck --check-prefix=CHECK_64 %s -# RUN: llvm-mc -filetype=obj -triple=mipsel %s -target-abi n32 -o - \ +# RUN: llvm-mc -filetype=obj -triple=mipsel %s -mabi=n32 -o - \ # RUN: | llvm-readobj -s | FileCheck --check-prefix=CHECK_32 %s # Check for register information sections. Index: test/MC/Mips/expansion-jal-sym-pic.s =================================================================== --- test/MC/Mips/expansion-jal-sym-pic.s +++ test/MC/Mips/expansion-jal-sym-pic.s @@ -1,19 +1,19 @@ # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,NORMAL,O32 -# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n32 -show-encoding |\ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -mabi=n32 -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,NORMAL,N32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 -show-encoding |\ +# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n64 -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,NORMAL,N64 # RUN: llvm-mc %s -arch=mips -mcpu=mips32 -mattr=micromips -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,MICROMIPS,O32-MICROMIPS -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 -mattr=micromips -show-encoding |\ +# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n32 -mattr=micromips -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,MICROMIPS,N32-MICROMIPS -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 -mattr=micromips -show-encoding |\ +# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n64 -mattr=micromips -show-encoding |\ # RUN: FileCheck %s -check-prefixes=ALL,MICROMIPS,N64-MICROMIPS .weak weak_label Index: test/MC/Mips/macro-la-bad.s =================================================================== --- test/MC/Mips/macro-la-bad.s +++ test/MC/Mips/macro-la-bad.s @@ -1,8 +1,8 @@ # RUN: not llvm-mc %s -arch=mips -mcpu=mips32r2 2>%t1 # RUN: FileCheck %s < %t1 --check-prefix=O32 -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 2>&1 | \ +# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n32 2>&1 | \ # RUN: FileCheck %s --check-prefix=N32 -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 2>&1 | \ +# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n64 2>&1 | \ # RUN: FileCheck %s --check-prefix=N64 .text Index: test/MC/Mips/macro-la.s =================================================================== --- test/MC/Mips/macro-la.s +++ test/MC/Mips/macro-la.s @@ -2,9 +2,9 @@ # RUN: FileCheck %s --check-prefixes=CHECK,O32 # RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips32r6 | \ # RUN: FileCheck %s --check-prefixes=CHECK,O32 -# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64r2 -target-abi=n32 | \ +# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64r2 -mabi=n32 | \ # RUN: FileCheck %s --check-prefixes=CHECK,N32 -# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64r6 -target-abi=n32 | \ +# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64r6 -mabi=n32 | \ # RUN: FileCheck %s --check-prefixes=CHECK,N32 # N64 should be acceptable too but we cannot convert la to dla yet. Index: test/MC/Mips/macro-ld-sd.s =================================================================== --- test/MC/Mips/macro-ld-sd.s +++ test/MC/Mips/macro-ld-sd.s @@ -1,8 +1,8 @@ # RUN: llvm-mc -triple mips-mti-linux-gnu -show-encoding %s | FileCheck \ # RUN: --check-prefixes=ALL,32 %s -# RUN: llvm-mc -triple mips64-mti-linux-gnu -show-encoding %s -target-abi n64 \ +# RUN: llvm-mc -triple mips64-mti-linux-gnu -show-encoding %s -mabi=n64 \ # RUN: | FileCheck --check-prefixes=ALL,64 %s -# RUN: llvm-mc -triple mips64-mti-linux-gnu -show-encoding %s -target-abi n32 \ +# RUN: llvm-mc -triple mips64-mti-linux-gnu -show-encoding %s -mabi=n32 \ # RUN: | FileCheck --check-prefixes=ALL,64 %s # ALL: .text Index: test/MC/Mips/macro-li-bad.s =================================================================== --- test/MC/Mips/macro-li-bad.s +++ test/MC/Mips/macro-li-bad.s @@ -1,8 +1,8 @@ # RUN: not llvm-mc %s -arch=mips -mcpu=mips32r2 2>%t1 # RUN: FileCheck %s < %t1 --check-prefix=32-BIT -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 2>&1 | \ +# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n32 2>&1 | \ # RUN: FileCheck %s --check-prefix=64-BIT -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 2>&1 | \ +# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n64 2>&1 | \ # RUN: FileCheck %s --check-prefix=64-BIT .text Index: test/MC/Mips/mips-expansions-bad.s =================================================================== --- test/MC/Mips/mips-expansions-bad.s +++ test/MC/Mips/mips-expansions-bad.s @@ -1,8 +1,8 @@ # RUN: not llvm-mc %s -arch=mips -mcpu=mips32r2 2>%t1 # RUN: FileCheck %s < %t1 --check-prefix=32-BIT -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 2>&1 | \ +# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n32 2>&1 | \ # RUN: FileCheck %s --check-prefixes=64-BIT,N32-ONLY -# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 2>&1 | \ +# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -mabi=n64 2>&1 | \ # RUN: FileCheck %s --check-prefixes=64-BIT,N64-ONLY .text Index: test/MC/Mips/mips-reginfo-fp64.s =================================================================== --- test/MC/Mips/mips-reginfo-fp64.s +++ test/MC/Mips/mips-reginfo-fp64.s @@ -2,11 +2,11 @@ # RUN: llvm-readobj -s -section-data | \ # RUN: FileCheck %s -check-prefix=ELF32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -target-abi n32 -filetype=obj -o - | \ +# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -mabi=n32 -filetype=obj -o - | \ # RUN: llvm-readobj -s -section-data | \ # RUN: FileCheck %s -check-prefix=ELF32 -# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -target-abi n64 -filetype=obj -o - | \ +# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64r2 -mattr=+msa,+fp64 -mabi=n64 -filetype=obj -o - | \ # RUN: llvm-readobj -s -section-data | \ # RUN: FileCheck %s -check-prefix=ELF64 Index: test/MC/Mips/mips64-register-names-n32-n64.s =================================================================== --- test/MC/Mips/mips64-register-names-n32-n64.s +++ test/MC/Mips/mips64-register-names-n32-n64.s @@ -3,7 +3,7 @@ # RUN: FileCheck -check-prefix=WARNING %s < %t0 # # RUN: llvm-mc %s -triple=mips64-unknown-freebsd -show-encoding \ -# RUN: -target-abi n32 2>%t1 | FileCheck %s +# RUN: -mabi=n32 2>%t1 | FileCheck %s # RUN: FileCheck -check-prefix=WARNING %s < %t1 # # Check that the register names are mapped to their correct numbers for n32/n64 Index: test/MC/Mips/mips64-register-names-o32.s =================================================================== --- test/MC/Mips/mips64-register-names-o32.s +++ test/MC/Mips/mips64-register-names-o32.s @@ -1,5 +1,5 @@ # RUN: llvm-mc %s -triple=mips64-unknown-freebsd -show-encoding \ -# RUN: -target-abi o32 | FileCheck %s +# RUN: -mabi=o32 | FileCheck %s # Check that the register names are mapped to their correct numbers for o32 # Second byte of daddiu with $zero at rt contains the number of the source Index: test/MC/Mips/mips64/abiflags.s =================================================================== --- test/MC/Mips/mips64/abiflags.s +++ test/MC/Mips/mips64/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n64 | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -mabi=n64 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -target-abi n64 -filetype=obj -o - | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64 -mabi=n64 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ Index: test/MC/Mips/mips64extins.s =================================================================== --- test/MC/Mips/mips64extins.s +++ test/MC/Mips/mips64extins.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc -arch=mips64el -filetype=obj -mcpu=mips64r2 -target-abi=n64 %s -o - \ +# RUN: llvm-mc -arch=mips64el -filetype=obj -mcpu=mips64r2 -mabi=n64 %s -o - \ # RUN: | llvm-objdump -disassemble - | FileCheck %s dext $2, $4, 5, 10 # CHECK: dext ${{[0-9]+}}, ${{[0-9]+}}, 5, 10 Index: test/MC/Mips/mips64r2/abi-bad.s =================================================================== --- test/MC/Mips/mips64r2/abi-bad.s +++ test/MC/Mips/mips64r2/abi-bad.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc %s -triple mips-unknown-linux -mcpu=mips64r2 -target-abi n64 2>&1 | FileCheck %s +# RUN: not llvm-mc %s -triple mips-unknown-linux -mcpu=mips64r2 -mabi=n64 2>&1 | FileCheck %s .set fp=xx # CHECK: error: '.set fp=xx' requires the O32 ABI # CHECK: .set fp=xx Index: test/MC/Mips/mips64r2/abiflags.s =================================================================== --- test/MC/Mips/mips64r2/abiflags.s +++ test/MC/Mips/mips64r2/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips64r2 -target-abi n64 | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64r2 -mabi=n64 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips64r2 -target-abi n64 -filetype=obj -o - | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64r2 -mabi=n64 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ Index: test/MC/Mips/mips64r3/abi-bad.s =================================================================== --- test/MC/Mips/mips64r3/abi-bad.s +++ test/MC/Mips/mips64r3/abi-bad.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc %s -triple mips-unknown-linux -mcpu=mips64r3 -target-abi n64 2>&1 | FileCheck %s +# RUN: not llvm-mc %s -triple mips-unknown-linux -mcpu=mips64r3 -mabi=n64 2>&1 | FileCheck %s .set fp=xx # CHECK: error: '.set fp=xx' requires the O32 ABI # CHECK: .set fp=xx Index: test/MC/Mips/mips64r3/abiflags.s =================================================================== --- test/MC/Mips/mips64r3/abiflags.s +++ test/MC/Mips/mips64r3/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips64r3 -target-abi n64 | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64r3 -mabi=n64 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips64r3 -target-abi n64 -filetype=obj -o - | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64r3 -mabi=n64 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ Index: test/MC/Mips/mips64r5/abi-bad.s =================================================================== --- test/MC/Mips/mips64r5/abi-bad.s +++ test/MC/Mips/mips64r5/abi-bad.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc %s -triple mips-unknown-linux -mcpu=mips64r5 -target-abi n64 2>&1 | FileCheck %s +# RUN: not llvm-mc %s -triple mips-unknown-linux -mcpu=mips64r5 -mabi=n64 2>&1 | FileCheck %s .set fp=xx # CHECK: error: '.set fp=xx' requires the O32 ABI # CHECK: .set fp=xx Index: test/MC/Mips/mips64r5/abiflags.s =================================================================== --- test/MC/Mips/mips64r5/abiflags.s +++ test/MC/Mips/mips64r5/abiflags.s @@ -1,7 +1,7 @@ -# RUN: llvm-mc %s -arch=mips -mcpu=mips64r5 -target-abi n64 | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64r5 -mabi=n64 | \ # RUN: FileCheck %s -check-prefix=CHECK-ASM # -# RUN: llvm-mc %s -arch=mips -mcpu=mips64r5 -target-abi n64 -filetype=obj -o - | \ +# RUN: llvm-mc %s -arch=mips -mcpu=mips64r5 -mabi=n64 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefix=CHECK-OBJ Index: test/MC/Mips/mips_abi_flags_xx.s =================================================================== --- test/MC/Mips/mips_abi_flags_xx.s +++ test/MC/Mips/mips_abi_flags_xx.s @@ -13,7 +13,7 @@ # 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 -arch=mips -mcpu=octeon -mabi=n64 -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 Index: test/MC/Mips/nabi-regs.s =================================================================== --- test/MC/Mips/nabi-regs.s +++ test/MC/Mips/nabi-regs.s @@ -7,10 +7,10 @@ # RUN: -mcpu=mips64r2 -arch=mips64 | FileCheck %s # # RUN: llvm-mc %s -triple=mipsel-unknown-linux -show-encoding \ -# RUN: -mcpu=mips64r2 -arch=mips64 -target-abi n32 | FileCheck %s +# RUN: -mcpu=mips64r2 -arch=mips64 -mabi=n32 | FileCheck %s # # RUN: llvm-mc %s -triple=mipsel-unknown-linux -show-encoding \ -# RUN: -mcpu=mips64r2 -arch=mips64 -target-abi n64 | FileCheck %s +# RUN: -mcpu=mips64r2 -arch=mips64 -mabi=n64 | FileCheck %s .text foo: Index: test/MC/Mips/nooddspreg-cmdarg.s =================================================================== --- test/MC/Mips/nooddspreg-cmdarg.s +++ test/MC/Mips/nooddspreg-cmdarg.s @@ -5,10 +5,10 @@ # 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 -arch=mips -mcpu=mips64 -mabi=n32 -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 -arch=mips -mcpu=mips64 -mabi=n64 -mattr=+nooddspreg 2> %t0 # RUN: FileCheck %s -check-prefix=INVALID < %t0 # # CHECK-ASM-NOT: .module nooddspreg Index: test/MC/Mips/nooddspreg.s =================================================================== --- test/MC/Mips/nooddspreg.s +++ test/MC/Mips/nooddspreg.s @@ -5,10 +5,10 @@ # 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 -arch=mips -mcpu=mips64 -mabi=n32 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 -arch=mips -mcpu=mips64 -mabi=n64 2> %t2 # RUN: FileCheck %s -check-prefix=INVALID < %t2 # # CHECK-ASM: .module nooddspreg Index: test/MC/Mips/oddspreg.s =================================================================== --- test/MC/Mips/oddspreg.s +++ test/MC/Mips/oddspreg.s @@ -5,10 +5,10 @@ # 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 -arch=mips64 -mcpu=mips64 -mabi=n32 | \ # 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 -arch=mips64 -mcpu=mips64 -mabi=n32 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32 @@ -25,7 +25,7 @@ # 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 -arch=mips64 -mcpu=mips64 -mabi=n32 -filetype=obj -o - | \ # RUN: llvm-readobj -sections -section-data -section-relocations - | \ # RUN: FileCheck %s -check-prefixes=CHECK-OBJ-ALL,CHECK-OBJ-N32 Index: test/MC/Mips/reloc-directive-bad.s =================================================================== --- test/MC/Mips/reloc-directive-bad.s +++ test/MC/Mips/reloc-directive-bad.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc -triple mips-unknown-linux < %s -show-encoding -target-abi=o32 \ +# RUN: not llvm-mc -triple mips-unknown-linux < %s -show-encoding -mabi=o32 \ # RUN: 2>&1 | FileCheck %s .text foo: Index: test/MC/Mips/reloc-directive-negative.s =================================================================== --- test/MC/Mips/reloc-directive-negative.s +++ test/MC/Mips/reloc-directive-negative.s @@ -1,4 +1,4 @@ -# RUN: not llvm-mc -triple mips-unknown-linux < %s -show-encoding -target-abi=o32 \ +# RUN: not llvm-mc -triple mips-unknown-linux < %s -show-encoding -mabi=o32 \ # RUN: 2>&1 | FileCheck %s .text foo: Index: test/MC/Mips/reloc-directive.s =================================================================== --- test/MC/Mips/reloc-directive.s +++ test/MC/Mips/reloc-directive.s @@ -1,16 +1,16 @@ -# RUN: llvm-mc -triple mips-unknown-linux < %s -show-encoding -target-abi=o32 \ +# RUN: llvm-mc -triple mips-unknown-linux < %s -show-encoding -mabi=o32 \ # RUN: | FileCheck -check-prefix=ASM %s -# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n32 \ +# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -mabi=n32 \ # RUN: | FileCheck -check-prefix=ASM %s -# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n64 \ +# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -mabi=n64 \ # RUN: | FileCheck -check-prefix=ASM %s -# RUN: llvm-mc -triple mips-unknown-linux < %s -show-encoding -target-abi=o32 \ +# RUN: llvm-mc -triple mips-unknown-linux < %s -show-encoding -mabi=o32 \ # RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-O32 %s -# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n32 \ +# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -mabi=n32 \ # RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-N32 %s -# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -target-abi=n64 \ +# RUN: llvm-mc -triple mips64-unknown-linux < %s -show-encoding -mabi=n64 \ # RUN: -filetype=obj | llvm-readobj -sections -section-data -r | \ # RUN: FileCheck -check-prefix=OBJ-N64 %s .text Index: tools/llc/llc.cpp =================================================================== --- tools/llc/llc.cpp +++ tools/llc/llc.cpp @@ -90,6 +90,9 @@ static cl::opt TargetTriple("mtriple", cl::desc("Override target triple for module")); +static cl::opt MABI("mabi", cl::desc("Target ABI to assemble for"), + cl::value_desc("abi"), cl::init("")); + static cl::opt NoVerify("disable-verify", cl::Hidden, cl::desc("Do not verify input module")); @@ -397,6 +400,7 @@ Options.MCOptions.MCUseDwarfDirectory = EnableDwarfDirectory; Options.MCOptions.AsmVerbose = AsmVerbose; Options.MCOptions.PreserveAsmComments = PreserveComments; + Options.MCOptions.ABIName = MABI; std::unique_ptr Target( TheTarget->createTargetMachine(TheTriple.getTriple(), CPUStr, FeaturesStr, Index: tools/llvm-mc/llvm-mc.cpp =================================================================== --- tools/llvm-mc/llvm-mc.cpp +++ tools/llvm-mc/llvm-mc.cpp @@ -124,6 +124,12 @@ cl::value_desc("cpu-name"), cl::init("")); +static cl::opt +MABI("mabi", + cl::desc("Target ABI to assemble for"), + cl::value_desc("abi"), + cl::init("")); + static cl::list MAttrs("mattr", cl::CommaSeparated, @@ -455,7 +461,6 @@ cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion); cl::ParseCommandLineOptions(argc, argv, "llvm machine code playground\n"); - MCTargetOptions MCOptions = InitMCTargetOptionsFromFlags(); TripleName = Triple::normalize(TripleName); setDwarfDebugFlags(argc, argv); @@ -465,6 +470,10 @@ const Target *TheTarget = GetTarget(ProgName); if (!TheTarget) return 1; + + MCTargetOptions MCOptions = InitMCTargetOptionsFromFlags(); + MCOptions.ABIName = MABI; + // Now that GetTarget() has (potentially) replaced TripleName, it's safe to // construct the Triple object. Triple TheTriple(TripleName);