Index: lib/Target/Mips/Mips.td =================================================================== --- lib/Target/Mips/Mips.td +++ lib/Target/Mips/Mips.td @@ -198,7 +198,6 @@ def : Proc<"mips64r3", [FeatureMips64r3]>; def : Proc<"mips64r5", [FeatureMips64r5]>; def : Proc<"mips64r6", [FeatureMips64r6]>; -def : Proc<"mips16", [FeatureMips16]>; def : Proc<"octeon", [FeatureMips64r2, FeatureCnMips]>; def : ProcessorModel<"p5600", MipsP5600Model, [ImplP5600]>; Index: test/CodeGen/MIR/Mips/expected-global-value-or-symbol-after-call-entry.mir =================================================================== --- test/CodeGen/MIR/Mips/expected-global-value-or-symbol-after-call-entry.mir +++ test/CodeGen/MIR/Mips/expected-global-value-or-symbol-after-call-entry.mir @@ -1,4 +1,4 @@ -# RUN: not llc -march=mipsel -mcpu=mips16 -relocation-model=pic -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s +# RUN: not llc -march=mipsel -mattr=mips16 -relocation-model=pic -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s --- | define i32 @test(i32 %a) { entry: Index: test/CodeGen/MIR/Mips/memory-operands.mir =================================================================== --- test/CodeGen/MIR/Mips/memory-operands.mir +++ test/CodeGen/MIR/Mips/memory-operands.mir @@ -1,4 +1,4 @@ -# RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -start-after branch-folder -stop-after branch-folder -o /dev/null %s | FileCheck %s +# RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -start-after branch-folder -stop-after branch-folder -o /dev/null %s | FileCheck %s # This test ensures that the MIR parser parses the call entry pseudo source # values in memory operands correctly. Index: test/CodeGen/Mips/addi.ll =================================================================== --- test/CodeGen/Mips/addi.ll +++ test/CodeGen/Mips/addi.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=16 @i = global i32 6, align 4 @j = global i32 12, align 4 Index: test/CodeGen/Mips/adjust-callstack-sp.ll =================================================================== --- test/CodeGen/Mips/adjust-callstack-sp.ll +++ test/CodeGen/Mips/adjust-callstack-sp.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=mips -mcpu=mips16 | FileCheck %s -check-prefix=M16 +; RUN: llc < %s -march=mips -mattr=mips16 | FileCheck %s -check-prefix=M16 ; 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 Index: test/CodeGen/Mips/align16.ll =================================================================== --- test/CodeGen/Mips/align16.ll +++ test/CodeGen/Mips/align16.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=16 @i = global i32 25, align 4 @.str = private unnamed_addr constant [5 x i8] c"%i \0A\00", align 1 Index: test/CodeGen/Mips/alloca16.ll =================================================================== --- test/CodeGen/Mips/alloca16.ll +++ test/CodeGen/Mips/alloca16.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 25, align 4 @jjjj = global i32 35, align 4 Index: test/CodeGen/Mips/and1.ll =================================================================== --- test/CodeGen/Mips/and1.ll +++ test/CodeGen/Mips/and1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @x = global i32 65504, align 4 @y = global i32 60929, align 4 Index: test/CodeGen/Mips/atomicops.ll =================================================================== --- test/CodeGen/Mips/atomicops.ll +++ test/CodeGen/Mips/atomicops.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @.str = private unnamed_addr constant [8 x i8] c"%d, %d\0A\00", align 1 Index: test/CodeGen/Mips/beqzc.ll =================================================================== --- test/CodeGen/Mips/beqzc.ll +++ test/CodeGen/Mips/beqzc.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short @i = global i32 0, align 4 @j = common global i32 0, align 4 Index: test/CodeGen/Mips/beqzc1.ll =================================================================== --- test/CodeGen/Mips/beqzc1.ll +++ test/CodeGen/Mips/beqzc1.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short @i = global i32 0, align 4 @j = common global i32 0, align 4 Index: test/CodeGen/Mips/br-jmp.ll =================================================================== --- test/CodeGen/Mips/br-jmp.ll +++ test/CodeGen/Mips/br-jmp.ll @@ -1,7 +1,7 @@ ; RUN: llc -march=mipsel -relocation-model=pic < %s | FileCheck %s -check-prefix=CHECK-PIC ; RUN: llc -march=mipsel -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=CHECK-PIC16 -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=CHECK-PIC16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 define void @count(i32 %x, i32 %y, i32 %z) noreturn nounwind readnone { entry: Index: test/CodeGen/Mips/brconeq.ll =================================================================== --- test/CodeGen/Mips/brconeq.ll +++ test/CodeGen/Mips/brconeq.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 5, align 4 @j = global i32 10, align 4 Index: test/CodeGen/Mips/brconeqk.ll =================================================================== --- test/CodeGen/Mips/brconeqk.ll +++ test/CodeGen/Mips/brconeqk.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 5, align 4 @result = global i32 0, align 4 Index: test/CodeGen/Mips/brconeqz.ll =================================================================== --- test/CodeGen/Mips/brconeqz.ll +++ test/CodeGen/Mips/brconeqz.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 5, align 4 @result = global i32 0, align 4 Index: test/CodeGen/Mips/brconge.ll =================================================================== --- test/CodeGen/Mips/brconge.ll +++ test/CodeGen/Mips/brconge.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 5, align 4 @j = global i32 10, align 4 Index: test/CodeGen/Mips/brcongt.ll =================================================================== --- test/CodeGen/Mips/brcongt.ll +++ test/CodeGen/Mips/brcongt.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 5, align 4 @j = global i32 10, align 4 Index: test/CodeGen/Mips/brconle.ll =================================================================== --- test/CodeGen/Mips/brconle.ll +++ test/CodeGen/Mips/brconle.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 -5, align 4 @j = global i32 10, align 4 Index: test/CodeGen/Mips/brconlt.ll =================================================================== --- test/CodeGen/Mips/brconlt.ll +++ test/CodeGen/Mips/brconlt.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 5, align 4 @j = global i32 10, align 4 Index: test/CodeGen/Mips/brconne.ll =================================================================== --- test/CodeGen/Mips/brconne.ll +++ test/CodeGen/Mips/brconne.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 5, align 4 @j = global i32 5, align 4 Index: test/CodeGen/Mips/brconnek.ll =================================================================== --- test/CodeGen/Mips/brconnek.ll +++ test/CodeGen/Mips/brconnek.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 5, align 4 @result = global i32 0, align 4 Index: test/CodeGen/Mips/brconnez.ll =================================================================== --- test/CodeGen/Mips/brconnez.ll +++ test/CodeGen/Mips/brconnez.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 0, align 4 @result = global i32 0, align 4 Index: test/CodeGen/Mips/brind.ll =================================================================== --- test/CodeGen/Mips/brind.ll +++ test/CodeGen/Mips/brind.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @main.L = internal unnamed_addr constant [5 x i8*] [i8* blockaddress(@main, %L1), i8* blockaddress(@main, %L2), i8* blockaddress(@main, %L3), i8* blockaddress(@main, %L4), i8* null], align 4 @str = private unnamed_addr constant [2 x i8] c"A\00" Index: test/CodeGen/Mips/brsize3.ll =================================================================== --- test/CodeGen/Mips/brsize3.ll +++ test/CodeGen/Mips/brsize3.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-no-short +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-no-short -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-long +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-long ; ModuleID = 'brsize3.c' target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" Index: test/CodeGen/Mips/brsize3a.ll =================================================================== --- test/CodeGen/Mips/brsize3a.ll +++ test/CodeGen/Mips/brsize3a.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-short +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-short ; ModuleID = 'brsize3.c' target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" Index: test/CodeGen/Mips/ci2.ll =================================================================== --- test/CodeGen/Mips/ci2.ll +++ test/CodeGen/Mips/ci2.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands < %s | FileCheck %s -check-prefix=constisle +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands < %s | FileCheck %s -check-prefix=constisle @i = common global i32 0, align 4 @b = common global i32 0, align 4 Index: test/CodeGen/Mips/cmplarge.ll =================================================================== --- test/CodeGen/Mips/cmplarge.ll +++ test/CodeGen/Mips/cmplarge.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=cmp16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=cmp16 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" target triple = "mipsel--linux-gnu" Index: test/CodeGen/Mips/const1.ll =================================================================== --- test/CodeGen/Mips/const1.ll +++ test/CodeGen/Mips/const1.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands < %s | FileCheck %s +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands < %s | FileCheck %s ; ModuleID = 'const1.c' target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" Index: test/CodeGen/Mips/const4a.ll =================================================================== --- test/CodeGen/Mips/const4a.ll +++ test/CodeGen/Mips/const4a.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands -mips-constant-islands-no-load-relaxation < %s | FileCheck %s -check-prefix=no-load-relax +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands -mips-constant-islands-no-load-relaxation < %s | FileCheck %s -check-prefix=no-load-relax ; ModuleID = 'const4.c' target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" Index: test/CodeGen/Mips/const6.ll =================================================================== --- test/CodeGen/Mips/const6.ll +++ test/CodeGen/Mips/const6.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=load-relax +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=load-relax -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands -mips-constant-islands-no-load-relaxation < %s | FileCheck %s -check-prefix=no-load-relax +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands -mips-constant-islands-no-load-relaxation < %s | FileCheck %s -check-prefix=no-load-relax ; ModuleID = 'const6.c' target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" Index: test/CodeGen/Mips/const6a.ll =================================================================== --- test/CodeGen/Mips/const6a.ll +++ test/CodeGen/Mips/const6a.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=load-relax1 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=load-relax1 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=load-relax +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=load-relax ; ModuleID = 'const6a.c' target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" Index: test/CodeGen/Mips/div.ll =================================================================== --- test/CodeGen/Mips/div.ll +++ test/CodeGen/Mips/div.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 100, align 4 @jjjj = global i32 -4, align 4 Index: test/CodeGen/Mips/div_rem.ll =================================================================== --- test/CodeGen/Mips/div_rem.ll +++ test/CodeGen/Mips/div_rem.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 103, align 4 @jjjj = global i32 -4, align 4 Index: test/CodeGen/Mips/divu.ll =================================================================== --- test/CodeGen/Mips/divu.ll +++ test/CodeGen/Mips/divu.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 100, align 4 @jjjj = global i32 4, align 4 Index: test/CodeGen/Mips/divu_remu.ll =================================================================== --- test/CodeGen/Mips/divu_remu.ll +++ test/CodeGen/Mips/divu_remu.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 103, align 4 @jjjj = global i32 4, align 4 Index: test/CodeGen/Mips/ex2.ll =================================================================== --- test/CodeGen/Mips/ex2.ll +++ test/CodeGen/Mips/ex2.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @.str = private unnamed_addr constant [6 x i8] c"hello\00", align 1 @_ZTIPKc = external constant i8* Index: test/CodeGen/Mips/extins.ll =================================================================== --- test/CodeGen/Mips/extins.ll +++ test/CodeGen/Mips/extins.ll @@ -1,5 +1,5 @@ ; RUN: llc < %s -march=mips -mcpu=mips32r2 | FileCheck %s -check-prefix=32R2 -; RUN: llc < %s -march=mips -mcpu=mips16 | FileCheck %s -check-prefix=16 +; RUN: llc < %s -march=mips -mattr=mips16 | FileCheck %s -check-prefix=16 define i32 @ext0_5_9(i32 %s, i32 %pos, i32 %sz) nounwind readnone { entry: Index: test/CodeGen/Mips/f16abs.ll =================================================================== --- test/CodeGen/Mips/f16abs.ll +++ test/CodeGen/Mips/f16abs.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=static +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=static @y = global double -1.450000e+00, align 8 @x = common global double 0.000000e+00, align 8 Index: test/CodeGen/Mips/fixdfsf.ll =================================================================== --- test/CodeGen/Mips/fixdfsf.ll +++ test/CodeGen/Mips/fixdfsf.ll @@ -1,5 +1,5 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic1 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic2 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic1 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic2 @x = common global double 0.000000e+00, align 8 @y = common global i32 0, align 4 Index: test/CodeGen/Mips/fp16instrinsmc.ll =================================================================== --- test/CodeGen/Mips/fp16instrinsmc.ll +++ test/CodeGen/Mips/fp16instrinsmc.ll @@ -1,5 +1,5 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static -mips32-function-mask=1010111 -mips-os16 < %s | FileCheck %s -check-prefix=fmask +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static -mips32-function-mask=1010111 -mips-os16 < %s | FileCheck %s -check-prefix=fmask @x = global float 1.500000e+00, align 4 @xn = global float -1.900000e+01, align 4 Index: test/CodeGen/Mips/fp16mix.ll =================================================================== --- test/CodeGen/Mips/fp16mix.ll +++ test/CodeGen/Mips/fp16mix.ll @@ -1,8 +1,8 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static -mips32-function-mask=10 -mips-os16 < %s | FileCheck %s -check-prefix=fmask1 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static -mips32-function-mask=10 -mips-os16 < %s | FileCheck %s -check-prefix=fmask1 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static -mips32-function-mask=01 -mips-os16 < %s | FileCheck %s -check-prefix=fmask2 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static -mips32-function-mask=01 -mips-os16 < %s | FileCheck %s -check-prefix=fmask2 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static -mips32-function-mask=10. -mips-os16 < %s | FileCheck %s -check-prefix=fmask1nr +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static -mips32-function-mask=10. -mips-os16 < %s | FileCheck %s -check-prefix=fmask1nr ; Function Attrs: nounwind optsize readnone define void @foo1() { Index: test/CodeGen/Mips/fp16static.ll =================================================================== --- test/CodeGen/Mips/fp16static.ll +++ test/CodeGen/Mips/fp16static.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 @x = common global float 0.000000e+00, align 4 Index: test/CodeGen/Mips/helloworld.ll =================================================================== --- test/CodeGen/Mips/helloworld.ll +++ test/CodeGen/Mips/helloworld.ll @@ -1,10 +1,10 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=C1 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=C2 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=PE -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s | FileCheck %s -check-prefix=ST1 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s | FileCheck %s -check-prefix=ST2 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=C1 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=C2 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=PE +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s | FileCheck %s -check-prefix=ST1 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s | FileCheck %s -check-prefix=ST2 ; -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=SR +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=SR ; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips32 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=SR32 Index: test/CodeGen/Mips/hf16_1.ll =================================================================== --- test/CodeGen/Mips/hf16_1.ll +++ test/CodeGen/Mips/hf16_1.ll @@ -1,5 +1,5 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=1 -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=2 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=1 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=2 @x = common global float 0.000000e+00, align 4 Index: test/CodeGen/Mips/hf16call32.ll =================================================================== --- test/CodeGen/Mips/hf16call32.ll +++ test/CodeGen/Mips/hf16call32.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=stel +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=stel @x = common global float 0.000000e+00, align 4 @y = common global float 0.000000e+00, align 4 Index: test/CodeGen/Mips/hf16call32_body.ll =================================================================== --- test/CodeGen/Mips/hf16call32_body.ll +++ test/CodeGen/Mips/hf16call32_body.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=stel +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=stel @x = external global float @xd = external global double Index: test/CodeGen/Mips/hf1_body.ll =================================================================== --- test/CodeGen/Mips/hf1_body.ll +++ test/CodeGen/Mips/hf1_body.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=picfp16 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=picfp16 @x = external global float Index: test/CodeGen/Mips/hfptrcall.ll =================================================================== --- test/CodeGen/Mips/hfptrcall.ll +++ test/CodeGen/Mips/hfptrcall.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=picel +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=picel @ptrsv = global float ()* @sv, align 4 @ptrdv = global double ()* @dv, align 4 Index: test/CodeGen/Mips/i32k.ll =================================================================== --- test/CodeGen/Mips/i32k.ll +++ test/CodeGen/Mips/i32k.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic -mips16-constant-islands=false -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic -mips16-constant-islands=false -O3 < %s | FileCheck %s -check-prefix=16 @.str = private unnamed_addr constant [4 x i8] c"%i\0A\00", align 1 Index: test/CodeGen/Mips/insn-zero-size-bb.ll =================================================================== --- test/CodeGen/Mips/insn-zero-size-bb.ll +++ test/CodeGen/Mips/insn-zero-size-bb.ll @@ -1,6 +1,6 @@ ; RUN: llc < %s -march=mips -mcpu=mips32 | FileCheck %s ; RUN: llc < %s -march=mips -mcpu=mips32r3 -mattr=+micromips | FileCheck %s -; RUN: llc < %s -march=mips -mcpu=mips16 | FileCheck %s +; RUN: llc < %s -march=mips -mattr=mips16 | FileCheck %s ; Verify that we emit the .insn directive for zero-sized (empty) basic blocks. ; This only really matters for microMIPS and MIPS16. Index: test/CodeGen/Mips/jtstat.ll =================================================================== --- test/CodeGen/Mips/jtstat.ll +++ test/CodeGen/Mips/jtstat.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 @s = global i8 115, align 1 @c = common global i8 0, align 1 Index: test/CodeGen/Mips/l3mc.ll =================================================================== --- test/CodeGen/Mips/l3mc.ll +++ test/CodeGen/Mips/l3mc.ll @@ -1,22 +1,22 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunsdfsi +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunsdfsi -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatdidf +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatdidf -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatdisf +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatdisf -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatundidf +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatundidf -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixsfdi +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixsfdi -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunsdfdi +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunsdfdi -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixdfdi +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixdfdi -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunssfsi +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunssfsi -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunssfdi +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___fixunssfdi -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatundisf +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=__call_stub_fp___floatundisf @ll1 = global i64 0, align 8 @ll2 = global i64 0, align 8 Index: test/CodeGen/Mips/lb1.ll =================================================================== --- test/CodeGen/Mips/lb1.ll +++ test/CodeGen/Mips/lb1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @c = global i8 -1, align 1 @.str = private unnamed_addr constant [5 x i8] c"%i \0A\00", align 1 Index: test/CodeGen/Mips/lbu1.ll =================================================================== --- test/CodeGen/Mips/lbu1.ll +++ test/CodeGen/Mips/lbu1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @c = global i8 97, align 1 @.str = private unnamed_addr constant [5 x i8] c"%c \0A\00", align 1 Index: test/CodeGen/Mips/lcb2.ll =================================================================== --- test/CodeGen/Mips/lcb2.ll +++ test/CodeGen/Mips/lcb2.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands=true < %s | FileCheck %s -check-prefix=lcb +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands=true < %s | FileCheck %s -check-prefix=lcb -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands=true < %s | FileCheck %s -check-prefix=lcbn +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands=true < %s | FileCheck %s -check-prefix=lcbn @i = global i32 0, align 4 @j = common global i32 0, align 4 Index: test/CodeGen/Mips/lcb3c.ll =================================================================== --- test/CodeGen/Mips/lcb3c.ll +++ test/CodeGen/Mips/lcb3c.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -O0 < %s | FileCheck %s -check-prefix=lcb +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -O0 < %s | FileCheck %s -check-prefix=lcb @i = global i32 0, align 4 @j = common global i32 0, align 4 Index: test/CodeGen/Mips/lcb4a.ll =================================================================== --- test/CodeGen/Mips/lcb4a.ll +++ test/CodeGen/Mips/lcb4a.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=ci +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=ci @i = global i32 0, align 4 @j = common global i32 0, align 4 Index: test/CodeGen/Mips/lcb5.ll =================================================================== --- test/CodeGen/Mips/lcb5.ll +++ test/CodeGen/Mips/lcb5.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=ci +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static < %s | FileCheck %s -check-prefix=ci @i = global i32 0, align 4 @j = common global i32 0, align 4 Index: test/CodeGen/Mips/lh1.ll =================================================================== --- test/CodeGen/Mips/lh1.ll +++ test/CodeGen/Mips/lh1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @s = global i16 -1, align 2 @.str = private unnamed_addr constant [5 x i8] c"%i \0A\00", align 1 Index: test/CodeGen/Mips/lhu1.ll =================================================================== --- test/CodeGen/Mips/lhu1.ll +++ test/CodeGen/Mips/lhu1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @s = global i16 255, align 2 Index: test/CodeGen/Mips/llcarry.ll =================================================================== --- test/CodeGen/Mips/llcarry.ll +++ test/CodeGen/Mips/llcarry.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i64 4294967295, align 8 @j = global i64 15, align 8 Index: test/CodeGen/Mips/madd-msub.ll =================================================================== --- test/CodeGen/Mips/madd-msub.ll +++ test/CodeGen/Mips/madd-msub.ll @@ -7,7 +7,7 @@ ; RUN: llc -march=mips -mcpu=mips64r6 < %s | FileCheck %s -check-prefix=ALL -check-prefix=64R6 ; FIXME: The MIPS16 test should check its output -; RUN: llc -march=mips -mcpu=mips16 < %s +; RUN: llc -march=mips -mattr=mips16 < %s ; ALL-LABEL: madd1: Index: test/CodeGen/Mips/mbrsize4a.ll =================================================================== --- test/CodeGen/Mips/mbrsize4a.ll +++ test/CodeGen/Mips/mbrsize4a.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands < %s | FileCheck %s -check-prefix=jal16 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=static -mips16-constant-islands < %s | FileCheck %s -check-prefix=jal16 @j = global i32 10, align 4 @.str = private unnamed_addr constant [11 x i8] c"at bottom\0A\00", align 1 Index: test/CodeGen/Mips/mips16-hf-attr-2.ll =================================================================== --- test/CodeGen/Mips/mips16-hf-attr-2.ll +++ test/CodeGen/Mips/mips16-hf-attr-2.ll @@ -1,7 +1,7 @@ ; Check that stubs generation for mips16 hard-float mode does not depend ; on the function 'use-soft-float' attribute's value. ; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel \ -; RUN: -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s +; RUN: -mattr=mips16 -relocation-model=pic < %s | FileCheck %s define void @bar_sf() #1 { ; CHECK: bar_sf: Index: test/CodeGen/Mips/mips16-hf-attr.ll =================================================================== --- test/CodeGen/Mips/mips16-hf-attr.ll +++ test/CodeGen/Mips/mips16-hf-attr.ll @@ -1,7 +1,7 @@ ; Check that stubs generation for mips16 hard-float mode does not depend ; on the function 'use-soft-float' attribute's value. ; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel \ -; RUN: -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s +; RUN: -mattr=mips16 -relocation-model=pic < %s | FileCheck %s define void @bar_hf() #0 { ; CHECK: bar_hf: Index: test/CodeGen/Mips/mips16_32_1.ll =================================================================== --- test/CodeGen/Mips/mips16_32_1.ll +++ test/CodeGen/Mips/mips16_32_1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s -mips-mixed-16-32 | FileCheck %s +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s -mips-mixed-16-32 | FileCheck %s ; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=pic -O3 < %s -mips-mixed-16-32 | FileCheck %s define void @foo() #0 { Index: test/CodeGen/Mips/mips16_32_10.ll =================================================================== --- test/CodeGen/Mips/mips16_32_10.ll +++ test/CodeGen/Mips/mips16_32_10.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 define void @foo() #0 { entry: Index: test/CodeGen/Mips/mips16_32_3.ll =================================================================== --- test/CodeGen/Mips/mips16_32_3.ll +++ test/CodeGen/Mips/mips16_32_3.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 ; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=32 define void @foo() #0 { Index: test/CodeGen/Mips/mips16_32_4.ll =================================================================== --- test/CodeGen/Mips/mips16_32_4.ll +++ test/CodeGen/Mips/mips16_32_4.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 ; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=32 define void @foo() #0 { Index: test/CodeGen/Mips/mips16_32_5.ll =================================================================== --- test/CodeGen/Mips/mips16_32_5.ll +++ test/CodeGen/Mips/mips16_32_5.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 ; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=32 define void @foo() #0 { Index: test/CodeGen/Mips/mips16_32_6.ll =================================================================== --- test/CodeGen/Mips/mips16_32_6.ll +++ test/CodeGen/Mips/mips16_32_6.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 ; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=32 define void @foo() #0 { Index: test/CodeGen/Mips/mips16_32_7.ll =================================================================== --- test/CodeGen/Mips/mips16_32_7.ll +++ test/CodeGen/Mips/mips16_32_7.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=16 ; RUN: llc -march=mipsel -mcpu=mips32 -relocation-model=static -O3 < %s -mips-mixed-16-32 | FileCheck %s -check-prefix=32 define void @foo() #0 { Index: test/CodeGen/Mips/mips16_fpret.ll =================================================================== --- test/CodeGen/Mips/mips16_fpret.ll +++ test/CodeGen/Mips/mips16_fpret.ll @@ -1,7 +1,7 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=1 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=2 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=3 -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=4 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=1 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=2 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=3 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=4 @x = global float 0x41F487E980000000, align 4 Index: test/CodeGen/Mips/mips16ex.ll =================================================================== --- test/CodeGen/Mips/mips16ex.ll +++ test/CodeGen/Mips/mips16ex.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 ;16: main: ;16-NEXT: [[TMP:.*]]: Index: test/CodeGen/Mips/mips16fpe.ll =================================================================== --- test/CodeGen/Mips/mips16fpe.ll +++ test/CodeGen/Mips/mips16fpe.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16hf +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16hf @x = global float 5.000000e+00, align 4 @y = global float 1.500000e+01, align 4 Index: test/CodeGen/Mips/misha.ll =================================================================== --- test/CodeGen/Mips/misha.ll +++ test/CodeGen/Mips/misha.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 define i32 @sumc(i8* nocapture %to, i8* nocapture %from, i32) nounwind { entry: Index: test/CodeGen/Mips/mul.ll =================================================================== --- test/CodeGen/Mips/mul.ll +++ test/CodeGen/Mips/mul.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 5, align 4 @jjjj = global i32 -6, align 4 Index: test/CodeGen/Mips/mulll.ll =================================================================== --- test/CodeGen/Mips/mulll.ll +++ test/CodeGen/Mips/mulll.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i64 5, align 8 @jjjj = global i64 -6, align 8 Index: test/CodeGen/Mips/mulull.ll =================================================================== --- test/CodeGen/Mips/mulull.ll +++ test/CodeGen/Mips/mulull.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i64 5, align 8 @jjjj = global i64 6, align 8 Index: test/CodeGen/Mips/neg1.ll =================================================================== --- test/CodeGen/Mips/neg1.ll +++ test/CodeGen/Mips/neg1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 10, align 4 @.str = private unnamed_addr constant [5 x i8] c"%i \0A\00", align 1 Index: test/CodeGen/Mips/nomips16.ll =================================================================== --- test/CodeGen/Mips/nomips16.ll +++ test/CodeGen/Mips/nomips16.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s @x = global float 0.000000e+00, align 4 @.str = private unnamed_addr constant [20 x i8] c"in main: mips16 %f\0A\00", align 1 Index: test/CodeGen/Mips/not1.ll =================================================================== --- test/CodeGen/Mips/not1.ll +++ test/CodeGen/Mips/not1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @x = global i32 65504, align 4 @y = global i32 60929, align 4 Index: test/CodeGen/Mips/null.ll =================================================================== --- test/CodeGen/Mips/null.ll +++ test/CodeGen/Mips/null.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 < %s | FileCheck %s -check-prefix=16 define i32 @main() nounwind { Index: test/CodeGen/Mips/or1.ll =================================================================== --- test/CodeGen/Mips/or1.ll +++ test/CodeGen/Mips/or1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @x = global i32 65504, align 4 @y = global i32 60929, align 4 Index: test/CodeGen/Mips/powif64_16.ll =================================================================== --- test/CodeGen/Mips/powif64_16.ll +++ test/CodeGen/Mips/powif64_16.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s declare float @llvm.powi.f32(float %Val, i32 %power) declare double @llvm.powi.f64(double %Val, i32 %power) Index: test/CodeGen/Mips/rem.ll =================================================================== --- test/CodeGen/Mips/rem.ll +++ test/CodeGen/Mips/rem.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 103, align 4 @jjjj = global i32 -4, align 4 Index: test/CodeGen/Mips/remu.ll =================================================================== --- test/CodeGen/Mips/remu.ll +++ test/CodeGen/Mips/remu.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @iiii = global i32 103, align 4 @jjjj = global i32 4, align 4 Index: test/CodeGen/Mips/s2rem.ll =================================================================== --- test/CodeGen/Mips/s2rem.ll +++ test/CodeGen/Mips/s2rem.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=PIC -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=STATIC @xi = common global i32 0, align 4 Index: test/CodeGen/Mips/sb1.ll =================================================================== --- test/CodeGen/Mips/sb1.ll +++ test/CodeGen/Mips/sb1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 97, align 4 @c = common global i8 0, align 1 Index: test/CodeGen/Mips/sel1c.ll =================================================================== --- test/CodeGen/Mips/sel1c.ll +++ test/CodeGen/Mips/sel1c.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short @i = global i32 1, align 4 @j = global i32 2, align 4 Index: test/CodeGen/Mips/sel2c.ll =================================================================== --- test/CodeGen/Mips/sel2c.ll +++ test/CodeGen/Mips/sel2c.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=cond-b-short @i = global i32 1, align 4 @j = global i32 2, align 4 Index: test/CodeGen/Mips/selTBteqzCmpi.ll =================================================================== --- test/CodeGen/Mips/selTBteqzCmpi.ll +++ test/CodeGen/Mips/selTBteqzCmpi.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @i = global i32 1, align 4 @j = global i32 2, align 4 Index: test/CodeGen/Mips/selTBtnezCmpi.ll =================================================================== --- test/CodeGen/Mips/selTBtnezCmpi.ll +++ test/CodeGen/Mips/selTBtnezCmpi.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @i = global i32 1, align 4 @j = global i32 2, align 4 Index: test/CodeGen/Mips/selTBtnezSlti.ll =================================================================== --- test/CodeGen/Mips/selTBtnezSlti.ll +++ test/CodeGen/Mips/selTBtnezSlti.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @i = global i32 1, align 4 @j = global i32 2, align 4 Index: test/CodeGen/Mips/seleq.ll =================================================================== --- test/CodeGen/Mips/seleq.ll +++ test/CodeGen/Mips/seleq.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/seleqk.ll =================================================================== --- test/CodeGen/Mips/seleqk.ll +++ test/CodeGen/Mips/seleqk.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/selgek.ll =================================================================== --- test/CodeGen/Mips/selgek.ll +++ test/CodeGen/Mips/selgek.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/selgt.ll =================================================================== --- test/CodeGen/Mips/selgt.ll +++ test/CodeGen/Mips/selgt.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/selle.ll =================================================================== --- test/CodeGen/Mips/selle.ll +++ test/CodeGen/Mips/selle.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/selltk.ll =================================================================== --- test/CodeGen/Mips/selltk.ll +++ test/CodeGen/Mips/selltk.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/selne.ll =================================================================== --- test/CodeGen/Mips/selne.ll +++ test/CodeGen/Mips/selne.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/selnek.ll =================================================================== --- test/CodeGen/Mips/selnek.ll +++ test/CodeGen/Mips/selnek.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/selpat.ll =================================================================== --- test/CodeGen/Mips/selpat.ll +++ test/CodeGen/Mips/selpat.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @t = global i32 10, align 4 @f = global i32 199, align 4 Index: test/CodeGen/Mips/seteq.ll =================================================================== --- test/CodeGen/Mips/seteq.ll +++ test/CodeGen/Mips/seteq.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 1, align 4 @j = global i32 10, align 4 Index: test/CodeGen/Mips/seteqz.ll =================================================================== --- test/CodeGen/Mips/seteqz.ll +++ test/CodeGen/Mips/seteqz.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 0, align 4 @j = global i32 99, align 4 Index: test/CodeGen/Mips/setge.ll =================================================================== --- test/CodeGen/Mips/setge.ll +++ test/CodeGen/Mips/setge.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 -5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setgek.ll =================================================================== --- test/CodeGen/Mips/setgek.ll +++ test/CodeGen/Mips/setgek.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @k = global i32 10, align 4 @r1 = common global i32 0, align 4 Index: test/CodeGen/Mips/setle.ll =================================================================== --- test/CodeGen/Mips/setle.ll +++ test/CodeGen/Mips/setle.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 -5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setlt.ll =================================================================== --- test/CodeGen/Mips/setlt.ll +++ test/CodeGen/Mips/setlt.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 -5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setltk.ll =================================================================== --- test/CodeGen/Mips/setltk.ll +++ test/CodeGen/Mips/setltk.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 -5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setne.ll =================================================================== --- test/CodeGen/Mips/setne.ll +++ test/CodeGen/Mips/setne.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 1, align 4 @j = global i32 10, align 4 Index: test/CodeGen/Mips/setuge.ll =================================================================== --- test/CodeGen/Mips/setuge.ll +++ test/CodeGen/Mips/setuge.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setugt.ll =================================================================== --- test/CodeGen/Mips/setugt.ll +++ test/CodeGen/Mips/setugt.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setule.ll =================================================================== --- test/CodeGen/Mips/setule.ll +++ test/CodeGen/Mips/setule.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setult.ll =================================================================== --- test/CodeGen/Mips/setult.ll +++ test/CodeGen/Mips/setult.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/setultk.ll =================================================================== --- test/CodeGen/Mips/setultk.ll +++ test/CodeGen/Mips/setultk.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @j = global i32 5, align 4 @k = global i32 10, align 4 Index: test/CodeGen/Mips/sh1.ll =================================================================== --- test/CodeGen/Mips/sh1.ll +++ test/CodeGen/Mips/sh1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 97, align 4 @s = common global i16 0, align 2 Index: test/CodeGen/Mips/simplebr.ll =================================================================== --- test/CodeGen/Mips/simplebr.ll +++ test/CodeGen/Mips/simplebr.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mips16-hard-float -mattr=+soft-float -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mips16-hard-float -mattr=+soft-float -relocation-model=static < %s | FileCheck %s -check-prefix=CHECK-STATIC16 ; ModuleID = 'simplebr.c' target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64" Index: test/CodeGen/Mips/sll1.ll =================================================================== --- test/CodeGen/Mips/sll1.ll +++ test/CodeGen/Mips/sll1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 10, align 4 @j = global i32 0, align 4 Index: test/CodeGen/Mips/sll2.ll =================================================================== --- test/CodeGen/Mips/sll2.ll +++ test/CodeGen/Mips/sll2.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 10, align 4 @j = global i32 4, align 4 Index: test/CodeGen/Mips/sr1.ll =================================================================== --- test/CodeGen/Mips/sr1.ll +++ test/CodeGen/Mips/sr1.ll @@ -1,6 +1,6 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=NEG +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=static < %s | FileCheck %s -check-prefix=NEG @f = common global float 0.000000e+00, align 4 Index: test/CodeGen/Mips/sra1.ll =================================================================== --- test/CodeGen/Mips/sra1.ll +++ test/CodeGen/Mips/sra1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 -354, align 4 @.str = private unnamed_addr constant [5 x i8] c"%i \0A\00", align 1 Index: test/CodeGen/Mips/sra2.ll =================================================================== --- test/CodeGen/Mips/sra2.ll +++ test/CodeGen/Mips/sra2.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 -354, align 4 @j = global i32 3, align 4 Index: test/CodeGen/Mips/srl1.ll =================================================================== --- test/CodeGen/Mips/srl1.ll +++ test/CodeGen/Mips/srl1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 10654, align 4 @j = global i32 0, align 4 Index: test/CodeGen/Mips/srl2.ll =================================================================== --- test/CodeGen/Mips/srl2.ll +++ test/CodeGen/Mips/srl2.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 10654, align 4 @j = global i32 0, align 4 Index: test/CodeGen/Mips/stchar.ll =================================================================== --- test/CodeGen/Mips/stchar.ll +++ test/CodeGen/Mips/stchar.ll @@ -1,5 +1,5 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16_h -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16_b +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16_h +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16_b @.str = private unnamed_addr constant [9 x i8] c"%hd %c \0A\00", align 1 @sp = common global i16* null, align 4 Index: test/CodeGen/Mips/stldst.ll =================================================================== --- test/CodeGen/Mips/stldst.ll +++ test/CodeGen/Mips/stldst.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @kkkk = global i32 67, align 4 @llll = global i32 33, align 4 Index: test/CodeGen/Mips/sub1.ll =================================================================== --- test/CodeGen/Mips/sub1.ll +++ test/CodeGen/Mips/sub1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 10, align 4 @.str = private unnamed_addr constant [4 x i8] c"%i\0A\00", align 1 Index: test/CodeGen/Mips/sub2.ll =================================================================== --- test/CodeGen/Mips/sub2.ll +++ test/CodeGen/Mips/sub2.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @i = global i32 10, align 4 @j = global i32 20, align 4 Index: test/CodeGen/Mips/tail16.ll =================================================================== --- test/CodeGen/Mips/tail16.ll +++ test/CodeGen/Mips/tail16.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic < %s | FileCheck %s +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -mattr=+soft-float -mips16-hard-float -relocation-model=pic < %s | FileCheck %s ; Function Attrs: nounwind optsize define float @h() { Index: test/CodeGen/Mips/tailcall.ll =================================================================== --- test/CodeGen/Mips/tailcall.ll +++ test/CodeGen/Mips/tailcall.ll @@ -4,7 +4,7 @@ ; RUN: -enable-mips-tail-calls < %s | FileCheck %s -check-prefix=STATIC32 ; RUN: llc -march=mips64el -mcpu=mips64r2 -mattr=+n64 -enable-mips-tail-calls \ ; RUN: < %s | FileCheck %s -check-prefix=N64 -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic \ +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic \ ; RUN: -enable-mips-tail-calls < %s | FileCheck %s -check-prefix=PIC16 @g0 = common global i32 0, align 4 Index: test/CodeGen/Mips/tls16.ll =================================================================== --- test/CodeGen/Mips/tls16.ll +++ test/CodeGen/Mips/tls16.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=PIC16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=PIC16 @a = thread_local global i32 4, align 4 Index: test/CodeGen/Mips/tls16_2.ll =================================================================== --- test/CodeGen/Mips/tls16_2.ll +++ test/CodeGen/Mips/tls16_2.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=PIC16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=PIC16 @f.i = internal thread_local unnamed_addr global i32 1, align 4 Index: test/CodeGen/Mips/trap1.ll =================================================================== --- test/CodeGen/Mips/trap1.ll +++ test/CodeGen/Mips/trap1.ll @@ -1,4 +1,4 @@ -; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic +; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mattr=mips16 -relocation-model=pic < %s | FileCheck %s -check-prefix=pic declare void @llvm.trap() Index: test/CodeGen/Mips/ul1.ll =================================================================== --- test/CodeGen/Mips/ul1.ll +++ test/CodeGen/Mips/ul1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 %struct.ua = type <{ i16, i32 }> @foo = common global %struct.ua zeroinitializer, align 1 Index: test/CodeGen/Mips/xor1.ll =================================================================== --- test/CodeGen/Mips/xor1.ll +++ test/CodeGen/Mips/xor1.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=mipsel -mcpu=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 +; RUN: llc -march=mipsel -mattr=mips16 -relocation-model=pic -O3 < %s | FileCheck %s -check-prefix=16 @x = global i32 65504, align 4 @y = global i32 60929, align 4