From 905b6d192cadd43401964f4ff05534a65b007cf2 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 3 Apr 2014 23:47:24 +0000 Subject: [PATCH] ARM: yet another round of ARM test clean ups llvm-svn: 205586 --- .../ARM/2013-05-07-ByteLoadSameAddress.ll | 2 +- llvm/test/CodeGen/ARM/misched-copy-arm.ll | 2 +- llvm/test/CodeGen/ARM/t2-imm.ll | 2 +- llvm/test/CodeGen/ARM/thumb2-it-block.ll | 4 ++-- .../Thumb/2009-06-18-ThumbCommuteMul.ll | 4 +++- .../CodeGen/Thumb/2010-06-18-SibCallCrash.ll | 2 +- .../CodeGen/Thumb/DbgValueOtherTargets.test | 2 +- llvm/test/CodeGen/Thumb/barrier.ll | 6 +++--- llvm/test/CodeGen/Thumb/fpconv.ll | 2 +- llvm/test/CodeGen/Thumb/fpow.ll | 2 +- .../test/CodeGen/Thumb/inlineasm-imm-thumb.ll | 2 +- llvm/test/CodeGen/Thumb/inlineasm-thumb.ll | 3 ++- llvm/test/CodeGen/Thumb/ispositive.ll | 2 +- llvm/test/CodeGen/Thumb/ldr_ext.ll | 4 ++-- llvm/test/CodeGen/Thumb/ldr_frame.ll | 2 +- llvm/test/CodeGen/Thumb/long-setcc.ll | 9 +++++++-- llvm/test/CodeGen/Thumb/long.ll | 20 ++++++++++++------- llvm/test/CodeGen/Thumb/long_shift.ll | 2 +- llvm/test/CodeGen/Thumb/mul.ll | 14 +++++++++++-- llvm/test/CodeGen/Thumb/rev.ll | 2 +- .../Thumb/stack-coloring-without-frame-ptr.ll | 2 +- llvm/test/CodeGen/Thumb/stack-frame.ll | 5 +++-- llvm/test/CodeGen/Thumb/thumb-imm.ll | 6 ++++-- llvm/test/CodeGen/Thumb/trap.ll | 2 +- llvm/test/CodeGen/Thumb/tst_teq.ll | 5 ++++- llvm/test/CodeGen/Thumb/vargs.ll | 11 +++++++--- llvm/test/CodeGen/Thumb2/bfi.ll | 2 +- llvm/test/CodeGen/Thumb2/bfx.ll | 2 +- llvm/test/CodeGen/Thumb2/carry.ll | 2 +- llvm/test/CodeGen/Thumb2/div.ll | 8 ++++---- llvm/test/CodeGen/Thumb2/ifcvt-neon.ll | 2 +- llvm/test/CodeGen/Thumb2/longMACt.ll | 2 +- llvm/test/CodeGen/Thumb2/mul_const.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-adc.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-add.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-add2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-add3.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-add4.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-add5.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-add6.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-and.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-and2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-asr.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-asr2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-bcc.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-bfc.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-bic.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-clz.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-cmn.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-cmn2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-cmp.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-cmp2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-eor.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-eor2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-jtb.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-ldr.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-ldr_ext.ll | 18 +++++++++++++---- llvm/test/CodeGen/Thumb2/thumb2-ldr_post.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-ldr_pre.ll | 12 +++++++---- llvm/test/CodeGen/Thumb2/thumb2-ldrb.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-ldrh.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-lsl.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-lsl2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-lsr.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-lsr2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-lsr3.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-mla.ll | 6 +++--- llvm/test/CodeGen/Thumb2/thumb2-mls.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-mov.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-mul.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-mvn.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-mvn2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-neg.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-orn.ll | 3 +-- llvm/test/CodeGen/Thumb2/thumb2-orn2.ll | 3 +-- llvm/test/CodeGen/Thumb2/thumb2-orr.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-orr2.ll | 3 +-- llvm/test/CodeGen/Thumb2/thumb2-pack.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-rev.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-ror.ll | 4 ++-- llvm/test/CodeGen/Thumb2/thumb2-rsb.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-rsb2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sbc.ll | 2 +- .../CodeGen/Thumb2/thumb2-select_xform.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-shifter.ll | 4 ++-- llvm/test/CodeGen/Thumb2/thumb2-smla.ll | 4 ++-- llvm/test/CodeGen/Thumb2/thumb2-smul.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-str.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-str_post.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-str_pre.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-strb.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-strh.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sub.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sub2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sub3.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sub4.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sub5.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sxt-uxt.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-sxt_rot.ll | 3 ++- llvm/test/CodeGen/Thumb2/thumb2-teq.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-teq2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-tst.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-tst2.ll | 2 +- llvm/test/CodeGen/Thumb2/thumb2-uxt_rot.ll | 4 ++-- llvm/test/CodeGen/Thumb2/thumb2-uxtb.ll | 4 ++-- .../ARM/2012-06-15-lsr-noaddrmode.ll | 2 +- .../LoopStrengthReduce/ARM/ivchain-ARM.ll | 2 +- 108 files changed, 190 insertions(+), 143 deletions(-) diff --git a/llvm/test/CodeGen/ARM/2013-05-07-ByteLoadSameAddress.ll b/llvm/test/CodeGen/ARM/2013-05-07-ByteLoadSameAddress.ll index defb94601141..efb82027b70d 100644 --- a/llvm/test/CodeGen/ARM/2013-05-07-ByteLoadSameAddress.ll +++ b/llvm/test/CodeGen/ARM/2013-05-07-ByteLoadSameAddress.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mattr=+v7,+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mattr=+v7,+thumb2 %s -o - | FileCheck %s define i8 @f1(i8* %call1, i8* %call3, i32 %h, i32 %w, i32 %Width) { ; CHECK: f1: diff --git a/llvm/test/CodeGen/ARM/misched-copy-arm.ll b/llvm/test/CodeGen/ARM/misched-copy-arm.ll index 5da335fa2030..26adf0c2ad04 100644 --- a/llvm/test/CodeGen/ARM/misched-copy-arm.ll +++ b/llvm/test/CodeGen/ARM/misched-copy-arm.ll @@ -1,5 +1,5 @@ ; REQUIRES: asserts -; RUN: llc < %s -march=thumb -mcpu=swift -pre-RA-sched=source -join-globalcopies -enable-misched -verify-misched -debug-only=misched -o - 2>&1 > /dev/null | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=swift -pre-RA-sched=source -join-globalcopies -enable-misched -verify-misched -debug-only=misched %s -o - 2>&1 | FileCheck %s ; ; Loop counter copies should be eliminated. ; There is also a MUL here, but we don't care where it is scheduled. diff --git a/llvm/test/CodeGen/ARM/t2-imm.ll b/llvm/test/CodeGen/ARM/t2-imm.ll index dd75cd1783ba..23463b8a9e3a 100644 --- a/llvm/test/CodeGen/ARM/t2-imm.ll +++ b/llvm/test/CodeGen/ARM/t2-imm.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f6(i32 %a) { ; CHECK:f6 diff --git a/llvm/test/CodeGen/ARM/thumb2-it-block.ll b/llvm/test/CodeGen/ARM/thumb2-it-block.ll index d95476017399..c5e699c155a1 100644 --- a/llvm/test/CodeGen/ARM/thumb2-it-block.ll +++ b/llvm/test/CodeGen/ARM/thumb2-it-block.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s -; RUN: llc < %s -mtriple=thumbv8 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s +; RUN: llc -mtriple=thumbv8 %s -o - | FileCheck %s ; PR11107 define i32 @test(i32 %a, i32 %b) { diff --git a/llvm/test/CodeGen/Thumb/2009-06-18-ThumbCommuteMul.ll b/llvm/test/CodeGen/Thumb/2009-06-18-ThumbCommuteMul.ll index 5c883b3930dc..ca6df7cdab31 100644 --- a/llvm/test/CodeGen/Thumb/2009-06-18-ThumbCommuteMul.ll +++ b/llvm/test/CodeGen/Thumb/2009-06-18-ThumbCommuteMul.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb | grep r0 | count 1 +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define i32 @a(i32 %x, i32 %y) nounwind readnone { entry: @@ -6,3 +6,5 @@ entry: ret i32 %mul } +; CHECK: r0 + diff --git a/llvm/test/CodeGen/Thumb/2010-06-18-SibCallCrash.ll b/llvm/test/CodeGen/Thumb/2010-06-18-SibCallCrash.ll index ad8b064bf4bd..e1efd3b7238f 100644 --- a/llvm/test/CodeGen/Thumb/2010-06-18-SibCallCrash.ll +++ b/llvm/test/CodeGen/Thumb/2010-06-18-SibCallCrash.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=thumb < %s +; RUN: llc -mtriple=thumb-eabi %s -o /dev/null ; rdar://8104457 define arm_apcscc void @t(i32* %m) nounwind { diff --git a/llvm/test/CodeGen/Thumb/DbgValueOtherTargets.test b/llvm/test/CodeGen/Thumb/DbgValueOtherTargets.test index afb18a43be47..557892b06233 100644 --- a/llvm/test/CodeGen/Thumb/DbgValueOtherTargets.test +++ b/llvm/test/CodeGen/Thumb/DbgValueOtherTargets.test @@ -1 +1 @@ -RUN: llc -O0 -march=thumb -asm-verbose < %S/../Inputs/DbgValueOtherTargets.ll | FileCheck %S/../Inputs/DbgValueOtherTargets.ll +RUN: llc -O0 -mtriple=thumb-eabi -asm-verbose %S/../Inputs/DbgValueOtherTargets.ll -o - | FileCheck %S/../Inputs/DbgValueOtherTargets.ll diff --git a/llvm/test/CodeGen/Thumb/barrier.ll b/llvm/test/CodeGen/Thumb/barrier.ll index 1c27fa09884f..92d9bb2097ff 100644 --- a/llvm/test/CodeGen/Thumb/barrier.ll +++ b/llvm/test/CodeGen/Thumb/barrier.ll @@ -1,6 +1,6 @@ -; RUN: llc < %s -mtriple=thumbv6-apple-darwin | FileCheck %s -check-prefix=V6 -; RUN: llc < %s -mtriple=thumbv7-apple-darwin -mattr=-db | FileCheck %s -check-prefix=V6 -; RUN: llc < %s -march=thumb -mcpu=cortex-m0 | FileCheck %s -check-prefix=V6M +; RUN: llc -mtriple=thumbv6-apple-darwin %s -o - | FileCheck %s -check-prefix=V6 +; RUN: llc -mtriple=thumbv7-apple-darwin -mattr=-db %s -o - | FileCheck %s -check-prefix=V6 +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-m0 %s -o - | FileCheck %s -check-prefix=V6M define void @t1() { ; V6-LABEL: t1: diff --git a/llvm/test/CodeGen/Thumb/fpconv.ll b/llvm/test/CodeGen/Thumb/fpconv.ll index 7da36ddf58ed..0ade798d1471 100644 --- a/llvm/test/CodeGen/Thumb/fpconv.ll +++ b/llvm/test/CodeGen/Thumb/fpconv.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb +; RUN: llc -mtriple=thumb-eabi %s -o /dev/null define float @f1(double %x) { entry: diff --git a/llvm/test/CodeGen/Thumb/fpow.ll b/llvm/test/CodeGen/Thumb/fpow.ll index be3dc0b3c1f8..18b1c91098f5 100644 --- a/llvm/test/CodeGen/Thumb/fpow.ll +++ b/llvm/test/CodeGen/Thumb/fpow.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb +; RUN: llc -mtriple=thumb-eabi %s -o /dev/null define double @t(double %x, double %y) nounwind optsize { entry: diff --git a/llvm/test/CodeGen/Thumb/inlineasm-imm-thumb.ll b/llvm/test/CodeGen/Thumb/inlineasm-imm-thumb.ll index d557b9d5a1f6..4e4f8fad25f8 100644 --- a/llvm/test/CodeGen/Thumb/inlineasm-imm-thumb.ll +++ b/llvm/test/CodeGen/Thumb/inlineasm-imm-thumb.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -no-integrated-as +; RUN: llc -mtriple=thumb-eabi -no-integrated-as %s -o /dev/null ; Test Thumb-mode "I" constraint, for ADD immediate. define i32 @testI(i32 %x) { diff --git a/llvm/test/CodeGen/Thumb/inlineasm-thumb.ll b/llvm/test/CodeGen/Thumb/inlineasm-thumb.ll index f2683c8dd8cc..2547ce8d6beb 100644 --- a/llvm/test/CodeGen/Thumb/inlineasm-thumb.ll +++ b/llvm/test/CodeGen/Thumb/inlineasm-thumb.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=thumb | FileCheck %s +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s + define i32 @t1(i32 %x, i32 %y) nounwind { entry: ; CHECK: mov r0, r12 diff --git a/llvm/test/CodeGen/Thumb/ispositive.ll b/llvm/test/CodeGen/Thumb/ispositive.ll index 7b2822707745..8d396878932b 100644 --- a/llvm/test/CodeGen/Thumb/ispositive.ll +++ b/llvm/test/CodeGen/Thumb/ispositive.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb | FileCheck %s +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define i32 @test1(i32 %X) { entry: diff --git a/llvm/test/CodeGen/Thumb/ldr_ext.ll b/llvm/test/CodeGen/Thumb/ldr_ext.ll index 9a28124b84ce..2d25af35b513 100644 --- a/llvm/test/CodeGen/Thumb/ldr_ext.ll +++ b/llvm/test/CodeGen/Thumb/ldr_ext.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=thumb | FileCheck %s -check-prefix=V5 -; RUN: llc < %s -march=thumb -mattr=+v6 | FileCheck %s -check-prefix=V6 +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s -check-prefix=V5 +; RUN: llc -mtriple=thumb-eabi -mattr=+v6 %s -o - | FileCheck %s -check-prefix=V6 ; rdar://7176514 diff --git a/llvm/test/CodeGen/Thumb/ldr_frame.ll b/llvm/test/CodeGen/Thumb/ldr_frame.ll index 6c586385b1bc..0e879d7379a8 100644 --- a/llvm/test/CodeGen/Thumb/ldr_frame.ll +++ b/llvm/test/CodeGen/Thumb/ldr_frame.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb | FileCheck %s +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define i32 @f1() { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb/long-setcc.ll b/llvm/test/CodeGen/Thumb/long-setcc.ll index 8f2d98fc43c9..3460edb96f0d 100644 --- a/llvm/test/CodeGen/Thumb/long-setcc.ll +++ b/llvm/test/CodeGen/Thumb/long-setcc.ll @@ -1,5 +1,4 @@ -; RUN: llc < %s -march=thumb | grep cmp | count 1 - +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define i1 @t1(i64 %x) { %B = icmp slt i64 %x, 0 @@ -15,3 +14,9 @@ define i1 @t3(i32 %x) { %tmp = icmp ugt i32 %x, -1 ret i1 %tmp } + +; CHECK: cmp +; CHECK-NOT: cmp + + + diff --git a/llvm/test/CodeGen/Thumb/long.ll b/llvm/test/CodeGen/Thumb/long.ll index 197e19e31b49..2449e5ad6777 100644 --- a/llvm/test/CodeGen/Thumb/long.ll +++ b/llvm/test/CodeGen/Thumb/long.ll @@ -1,10 +1,5 @@ -; RUN: llc < %s -march=thumb | \ -; RUN: grep mvn | count 1 -; RUN: llc < %s -march=thumb | \ -; RUN: grep adc | count 1 -; RUN: llc < %s -march=thumb | \ -; RUN: grep sbc | count 1 -; RUN: llc < %s -mtriple=thumb-apple-darwin | grep __muldi3 +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-apple-darwin %s -o - | FileCheck %s -check-prefix CHECK-DARWIN define i64 @f1() { entry: @@ -74,3 +69,14 @@ entry: ret i64 %retval } +; CHECK: mvn +; CHECK-NOT: mvn + +; CHECK: adc +; CHECK-NOT: adc + +; CHECK: sbc +; CHECK-NOT: sbc + +; CHECK-DARWIN: __muldi3 + diff --git a/llvm/test/CodeGen/Thumb/long_shift.ll b/llvm/test/CodeGen/Thumb/long_shift.ll index 24317141fca6..6aa1afd38988 100644 --- a/llvm/test/CodeGen/Thumb/long_shift.ll +++ b/llvm/test/CodeGen/Thumb/long_shift.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb +; RUN: llc -mtriple=thumb-eabi %s -o /dev/null define i64 @f0(i64 %A, i64 %B) { %tmp = bitcast i64 %A to i64 diff --git a/llvm/test/CodeGen/Thumb/mul.ll b/llvm/test/CodeGen/Thumb/mul.ll index c1a2fb29477d..13a2cfb4c242 100644 --- a/llvm/test/CodeGen/Thumb/mul.ll +++ b/llvm/test/CodeGen/Thumb/mul.ll @@ -1,22 +1,32 @@ -; RUN: llc < %s -march=thumb | grep mul | count 3 -; RUN: llc < %s -march=thumb | grep lsl | count 1 +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define i32 @f1(i32 %u) { %tmp = mul i32 %u, %u ret i32 %tmp } +; CHECK: mul{{s?}} + define i32 @f2(i32 %u, i32 %v) { %tmp = mul i32 %u, %v ret i32 %tmp } +; CHECK: mul{{s?}} + define i32 @f3(i32 %u) { %tmp = mul i32 %u, 5 ret i32 %tmp } +; CHECK: mul{{s?}} + define i32 @f4(i32 %u) { %tmp = mul i32 %u, 4 ret i32 %tmp } + +; CHECK: lsl +; CHECK-NOT: mul{{s?}} +; CHECK-NOT: lsl + diff --git a/llvm/test/CodeGen/Thumb/rev.ll b/llvm/test/CodeGen/Thumb/rev.ll index dcba00e49663..3e947022e601 100644 --- a/llvm/test/CodeGen/Thumb/rev.ll +++ b/llvm/test/CodeGen/Thumb/rev.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mattr=+v6 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mattr=+v6 %s -o - | FileCheck %s define i32 @test1(i32 %X) nounwind { ; CHECK: test1 diff --git a/llvm/test/CodeGen/Thumb/stack-coloring-without-frame-ptr.ll b/llvm/test/CodeGen/Thumb/stack-coloring-without-frame-ptr.ll index 3f6407a0a3c0..97c66d9dc865 100644 --- a/llvm/test/CodeGen/Thumb/stack-coloring-without-frame-ptr.ll +++ b/llvm/test/CodeGen/Thumb/stack-coloring-without-frame-ptr.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1022e +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1022e %s -o /dev/null %iterator = type { i8**, i8**, i8**, i8*** } %insert_iterator = type { %deque*, %iterator } diff --git a/llvm/test/CodeGen/Thumb/stack-frame.ll b/llvm/test/CodeGen/Thumb/stack-frame.ll index b103b331b797..fda7267016d1 100644 --- a/llvm/test/CodeGen/Thumb/stack-frame.ll +++ b/llvm/test/CodeGen/Thumb/stack-frame.ll @@ -1,5 +1,4 @@ -; RUN: llc < %s -march=thumb -; RUN: llc < %s -march=thumb | grep add | count 1 +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define void @f1() { %c = alloca i8, align 1 @@ -10,4 +9,6 @@ define i32 @f2() { ret i32 1 } +; CHECK: add +; CHECK-NOT: add diff --git a/llvm/test/CodeGen/Thumb/thumb-imm.ll b/llvm/test/CodeGen/Thumb/thumb-imm.ll index 74a57ff271be..592e694e0277 100644 --- a/llvm/test/CodeGen/Thumb/thumb-imm.ll +++ b/llvm/test/CodeGen/Thumb/thumb-imm.ll @@ -1,5 +1,4 @@ -; RUN: llc < %s -march=thumb | not grep CPI - +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define i32 @test1() { ret i32 1000 @@ -8,3 +7,6 @@ define i32 @test1() { define i32 @test2() { ret i32 -256 } + +; CHECK-NOT: CPI + diff --git a/llvm/test/CodeGen/Thumb/trap.ll b/llvm/test/CodeGen/Thumb/trap.ll index e04059c4b021..7d2f6f11a4d1 100644 --- a/llvm/test/CodeGen/Thumb/trap.ll +++ b/llvm/test/CodeGen/Thumb/trap.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb | FileCheck %s +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s ; rdar://7961298 define void @t() nounwind { diff --git a/llvm/test/CodeGen/Thumb/tst_teq.ll b/llvm/test/CodeGen/Thumb/tst_teq.ll index 21ada3ed83a0..2b6d9a3706a3 100644 --- a/llvm/test/CodeGen/Thumb/tst_teq.ll +++ b/llvm/test/CodeGen/Thumb/tst_teq.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb | grep tst +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s define i32 @f(i32 %a) { entry: @@ -15,3 +15,6 @@ entry: %retval = select i1 %0, i32 20, i32 10 ; [#uses=1] ret i32 %retval } + +; CHECK: tst + diff --git a/llvm/test/CodeGen/Thumb/vargs.ll b/llvm/test/CodeGen/Thumb/vargs.ll index 50a1a0728846..4078b01ba30c 100644 --- a/llvm/test/CodeGen/Thumb/vargs.ll +++ b/llvm/test/CodeGen/Thumb/vargs.ll @@ -1,6 +1,6 @@ -; RUN: llc < %s -march=thumb -; RUN: llc < %s -mtriple=thumb-linux | grep pop | count 2 -; RUN: llc < %s -mtriple=thumb-darwin | grep pop | count 2 +; RUN: llc -mtriple=thumb-eabi %s -o /dev/null +; RUN: llc -mtriple=thumb-linux %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-darwin %s -o - | FileCheck %s @str = internal constant [4 x i8] c"%d\0A\00" ; <[4 x i8]*> [#uses=1] @@ -34,3 +34,8 @@ declare void @llvm.va_start(i8*) declare i32 @printf(i8*, ...) declare void @llvm.va_end(i8*) + +; CHECK: pop +; CHECK: pop +; CHECK-NOT: pop + diff --git a/llvm/test/CodeGen/Thumb2/bfi.ll b/llvm/test/CodeGen/Thumb2/bfi.ll index 3612e2752834..4f056d571c4c 100644 --- a/llvm/test/CodeGen/Thumb2/bfi.ll +++ b/llvm/test/CodeGen/Thumb2/bfi.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=thumb -mattr=+v6t2 < %s | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mattr=+v6t2 %s -o - | FileCheck %s %struct.F = type { [3 x i8], i8 } diff --git a/llvm/test/CodeGen/Thumb2/bfx.ll b/llvm/test/CodeGen/Thumb2/bfx.ll index e380b8f858aa..9bd8d70275b9 100644 --- a/llvm/test/CodeGen/Thumb2/bfx.ll +++ b/llvm/test/CodeGen/Thumb2/bfx.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @sbfx1(i32 %a) { ; CHECK: sbfx1 diff --git a/llvm/test/CodeGen/Thumb2/carry.ll b/llvm/test/CodeGen/Thumb2/carry.ll index 48fba4ed4a91..26622e23dd44 100644 --- a/llvm/test/CodeGen/Thumb2/carry.ll +++ b/llvm/test/CodeGen/Thumb2/carry.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i64 @f1(i64 %a, i64 %b) { entry: diff --git a/llvm/test/CodeGen/Thumb2/div.ll b/llvm/test/CodeGen/Thumb2/div.ll index e783c8892397..b273a8903265 100644 --- a/llvm/test/CodeGen/Thumb2/div.ll +++ b/llvm/test/CodeGen/Thumb2/div.ll @@ -1,10 +1,10 @@ -; RUN: llc < %s -mtriple=thumb-apple-darwin -mcpu=arm1156t2-s -mattr=+thumb2 \ +; RUN: llc -mtriple=thumb-apple-darwin -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - \ ; RUN: | FileCheck %s -check-prefix=CHECK-THUMB -; RUN: llc < %s -march=thumb -mcpu=cortex-m3 -mattr=+thumb2 \ +; RUN: llc -mtriple=thumb-apple-darwin -mcpu=cortex-m3 -mattr=+thumb2 %s -o - \ ; RUN: | FileCheck %s -check-prefix=CHECK-THUMBV7M -; RUN: llc < %s -march=thumb -mcpu=swift \ +; RUN: llc -mtriple=thumb-apple-darwin -mcpu=swift %s -o - \ ; RUN: | FileCheck %s -check-prefix=CHECK-HWDIV -; RUN: llc < %s -march=thumb -mcpu=cortex-r5 \ +; RUN: llc -mtriple=thumb-apple-darwin -mcpu=cortex-r5 %s -o - \ ; RUN: | FileCheck %s -check-prefix=CHECK-HWDIV define i32 @f1(i32 %a, i32 %b) { diff --git a/llvm/test/CodeGen/Thumb2/ifcvt-neon.ll b/llvm/test/CodeGen/Thumb2/ifcvt-neon.ll index 68320539693d..501b0b6a007c 100644 --- a/llvm/test/CodeGen/Thumb2/ifcvt-neon.ll +++ b/llvm/test/CodeGen/Thumb2/ifcvt-neon.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=cortex-a8 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-a8 %s -o - | FileCheck %s ; rdar://7368193 @a = common global float 0.000000e+00 ; [#uses=2] diff --git a/llvm/test/CodeGen/Thumb2/longMACt.ll b/llvm/test/CodeGen/Thumb2/longMACt.ll index abe65f2248be..7322d0fe93d2 100644 --- a/llvm/test/CodeGen/Thumb2/longMACt.ll +++ b/llvm/test/CodeGen/Thumb2/longMACt.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; Check generated signed and unsigned multiply accumulate long. define i64 @MACLongTest1(i32 %a, i32 %b, i64 %c) { diff --git a/llvm/test/CodeGen/Thumb2/mul_const.ll b/llvm/test/CodeGen/Thumb2/mul_const.ll index 41de47731da5..7064798051e3 100644 --- a/llvm/test/CodeGen/Thumb2/mul_const.ll +++ b/llvm/test/CodeGen/Thumb2/mul_const.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; rdar://7069502 define i32 @t1(i32 %v) nounwind readnone { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-adc.ll b/llvm/test/CodeGen/Thumb2/thumb2-adc.ll index 58e4c59c8f9a..a97654c0f043 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-adc.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-adc.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 734439407618 = 0x000000ab00000002 define i64 @f1(i64 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-add.ll b/llvm/test/CodeGen/Thumb2/thumb2-add.ll index 5e81fcfb49ef..8ff931a4490d 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-add.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-add.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @t2ADDrc_255(i32 %lhs) { ; CHECK-LABEL: t2ADDrc_255: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-add2.ll b/llvm/test/CodeGen/Thumb2/thumb2-add2.ll index ff0e0879e9da..9d64fd2e27fc 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-add2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-add2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 171 = 0x000000ab define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-add3.ll b/llvm/test/CodeGen/Thumb2/thumb2-add3.ll index bb7788f2b76c..03a817003afd 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-add3.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-add3.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a) { %tmp = add i32 %a, 4095 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-add4.ll b/llvm/test/CodeGen/Thumb2/thumb2-add4.ll index ed68d62a9f40..ad9642d0706d 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-add4.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-add4.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 171 = 0x000000ab define i64 @f1(i64 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-add5.ll b/llvm/test/CodeGen/Thumb2/thumb2-add5.ll index 7ef756fa18bd..f60e0be7876f 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-add5.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-add5.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-add6.ll b/llvm/test/CodeGen/Thumb2/thumb2-add6.ll index c4a13be7ffef..af092937344c 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-add6.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-add6.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i64 @f1(i64 %a, i64 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-and.ll b/llvm/test/CodeGen/Thumb2/thumb2-and.ll index 3ffcfd706dab..1984b3ffb356 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-and.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-and.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-and2.ll b/llvm/test/CodeGen/Thumb2/thumb2-and2.ll index 3bfe9b265d09..70de9c96082f 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-and2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-and2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 171 = 0x000000ab define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-asr.ll b/llvm/test/CodeGen/Thumb2/thumb2-asr.ll index fbe39718f5d8..a4cccd554215 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-asr.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-asr.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-asr2.ll b/llvm/test/CodeGen/Thumb2/thumb2-asr2.ll index 321b3f5ffe38..da050fb670c4 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-asr2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-asr2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll b/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll index 61171acd0a04..e7b38221b00d 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; If-conversion defeats the purpose of this test, which is to check CBZ ; generation, so use memory barrier instruction to make sure it doesn't ; happen and we get actual branches. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-bfc.ll b/llvm/test/CodeGen/Thumb2/thumb2-bfc.ll index 844fb4a1a637..dbf697cd51dc 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-bfc.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-bfc.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 4278190095 = 0xff00000f define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-bic.ll b/llvm/test/CodeGen/Thumb2/thumb2-bic.ll index fc57ec8c16a8..68d92b8771cc 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-bic.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-bic.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-clz.ll b/llvm/test/CodeGen/Thumb2/thumb2-clz.ll index a5cd0747f153..52b540b2bdd0 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-clz.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-clz.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+v7 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+v7 %s -o - | FileCheck %s define i32 @f1(i32 %a) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-cmn.ll b/llvm/test/CodeGen/Thumb2/thumb2-cmn.ll index da7d4b1ec31f..efa150529ad6 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-cmn.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-cmn.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; These tests could be improved by 'movs r0, #0' being rematerialized below the ; test as 'mov.w r0, #0'. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-cmn2.ll b/llvm/test/CodeGen/Thumb2/thumb2-cmn2.ll index a09a1493e980..42473c2dcade 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-cmn2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-cmn2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; -0x000000bb = 4294967109 define i1 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-cmp.ll b/llvm/test/CodeGen/Thumb2/thumb2-cmp.ll index 06c611da4295..8f08617125c2 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-cmp.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-cmp.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; These tests would be improved by 'movs r0, #0' being rematerialized below the ; test as 'mov.w r0, #0'. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-cmp2.ll b/llvm/test/CodeGen/Thumb2/thumb2-cmp2.ll index 8ca3caf0a088..4d840030f825 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-cmp2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-cmp2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; These tests would be improved by 'movs r0, #0' being rematerialized below the ; test as 'mov.w r0, #0'. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-eor.ll b/llvm/test/CodeGen/Thumb2/thumb2-eor.ll index 6dfc5cd5de69..20282993e817 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-eor.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-eor.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-eor2.ll b/llvm/test/CodeGen/Thumb2/thumb2-eor2.ll index cf27448e36cf..f26aafeff340 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-eor2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-eor2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 0x000000bb = 187 define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll b/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll index 11620c2f1f92..ce7fb9f10fec 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-jtb.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 -arm-adjust-jump-tables=0 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 -arm-adjust-jump-tables=0 %s -o - | FileCheck %s ; Do not use tbb / tbh if any destination is before the jumptable. ; rdar://7102917 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-ldr.ll b/llvm/test/CodeGen/Thumb2/thumb2-ldr.ll index 09212d34a29e..c25ed789de04 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-ldr.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-ldr.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32* %v) { entry: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-ldr_ext.ll b/llvm/test/CodeGen/Thumb2/thumb2-ldr_ext.ll index b865cf428170..b50b33320597 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-ldr_ext.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-ldr_ext.ll @@ -1,7 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | grep ldrb | count 1 -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | grep ldrh | count 1 -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | grep ldrsb | count 1 -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | grep ldrsh | count 1 +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @test1(i8* %v.pntr.s0.u1) { %tmp.u = load i8* %v.pntr.s0.u1 @@ -26,3 +23,16 @@ define i32 @test4() { %tmp1.s = sext i16 %tmp.s to i32 ret i32 %tmp1.s } + +; CHECK: ldrb +; CHECK-NOT: ldrb + +; CHECK: ldrh +; CHECK-NOT: ldrh + +; CHECK: ldrsb +; CHECK-NOT: ldrsb + +; CHECK: ldrsh +; CHECK-NOT: ldrsh + diff --git a/llvm/test/CodeGen/Thumb2/thumb2-ldr_post.ll b/llvm/test/CodeGen/Thumb2/thumb2-ldr_post.ll index 4f04647d7af7..c26e6b154e55 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-ldr_post.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-ldr_post.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @test(i32 %a, i32 %b, i32 %c) { %tmp1 = mul i32 %a, %b ; [#uses=2] diff --git a/llvm/test/CodeGen/Thumb2/thumb2-ldr_pre.ll b/llvm/test/CodeGen/Thumb2/thumb2-ldr_pre.ll index 4907dec19dfb..cafb02a4984f 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-ldr_pre.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-ldr_pre.ll @@ -1,7 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | \ -; RUN: grep "ldr.*\!" | count 3 -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | \ -; RUN: grep "ldrsb.*\!" | count 1 +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32* @test1(i32* %X, i32* %dest) { %Y = getelementptr i32* %X, i32 4 ; [#uses=2] @@ -10,6 +7,8 @@ define i32* @test1(i32* %X, i32* %dest) { ret i32* %Y } +; CHECK: ldr{{.*}}! + define i32 @test2(i32 %a, i32 %b) { %tmp1 = sub i32 %a, 64 ; [#uses=2] %tmp2 = inttoptr i32 %tmp1 to i32* ; [#uses=1] @@ -19,6 +18,8 @@ define i32 @test2(i32 %a, i32 %b) { ret i32 %tmp5 } +; CHECK: ldr{{.*}}! + define i8* @test3(i8* %X, i32* %dest) { %tmp1 = getelementptr i8* %X, i32 4 %tmp2 = load i8* %tmp1 @@ -26,3 +27,6 @@ define i8* @test3(i8* %X, i32* %dest) { store i32 %tmp3, i32* %dest ret i8* %tmp1 } + +; CHECK: ldrsb{{.*}}! + diff --git a/llvm/test/CodeGen/Thumb2/thumb2-ldrb.ll b/llvm/test/CodeGen/Thumb2/thumb2-ldrb.ll index c79f7327b150..0b3441eb1e22 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-ldrb.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-ldrb.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i8 @f1(i8* %v) { entry: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-ldrh.ll b/llvm/test/CodeGen/Thumb2/thumb2-ldrh.ll index 7ba9f2230d43..db5dcfac2ba1 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-ldrh.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-ldrh.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i16 @f1(i16* %v) { entry: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-lsl.ll b/llvm/test/CodeGen/Thumb2/thumb2-lsl.ll index 015a9dd471a4..05441c856472 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-lsl.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-lsl.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-lsl2.ll b/llvm/test/CodeGen/Thumb2/thumb2-lsl2.ll index c64897a11580..5a456b024dc5 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-lsl2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-lsl2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-lsr.ll b/llvm/test/CodeGen/Thumb2/thumb2-lsr.ll index 24973c7b5331..48c2ec42e6cf 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-lsr.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-lsr.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-lsr2.ll b/llvm/test/CodeGen/Thumb2/thumb2-lsr2.ll index 0b199bb46b27..5d158afc08a1 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-lsr2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-lsr2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-lsr3.ll b/llvm/test/CodeGen/Thumb2/thumb2-lsr3.ll index c81412317ccb..c9344c89fb78 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-lsr3.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-lsr3.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i1 @test1(i64 %poscnt, i32 %work) { entry: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mla.ll b/llvm/test/CodeGen/Thumb2/thumb2-mla.ll index a99ffe7a7668..6137872db58e 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mla.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mla.ll @@ -1,6 +1,6 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 \ -; RUN: -arm-use-mulops=false | FileCheck %s -check-prefix=NO_MULOPS +; RUN: llc -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s +; RUN: llc -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 \ +; RUN: -arm-use-mulops=false %s -o - | FileCheck %s -check-prefix=NO_MULOPS define i32 @f1(i32 %a, i32 %b, i32 %c) { %tmp1 = mul i32 %a, %b diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mls.ll b/llvm/test/CodeGen/Thumb2/thumb2-mls.ll index 45d6d135c6d8..9b0e7ff37b69 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mls.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mls.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b, i32 %c) { %tmp1 = mul i32 %a, %b diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mov.ll b/llvm/test/CodeGen/Thumb2/thumb2-mov.ll index 7c0dc01ccf16..e5633624dbfc 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mov.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mov.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; Test # diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mul.ll b/llvm/test/CodeGen/Thumb2/thumb2-mul.ll index 5f6825072d4c..4815f4b5f751 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mul.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mul.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b, i32 %c) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll b/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll index e32bd26ae9b7..db9b644d4f92 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mulhi.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+t2dsp | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2dsp %s -o - | FileCheck %s define i32 @smulhi(i32 %x, i32 %y) { ; CHECK: smulhi diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mvn.ll b/llvm/test/CodeGen/Thumb2/thumb2-mvn.ll index a5592f6b9276..adf982f4a342 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mvn.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mvn.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -mtriple=thumbv7-apple-darwin | FileCheck %s +; RUN: llc -mtriple=thumbv7-apple-darwin %s -o - | FileCheck %s ; 0x000000bb = 187 define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-mvn2.ll b/llvm/test/CodeGen/Thumb2/thumb2-mvn2.ll index cee6f235a2ac..323c2ccf32de 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-mvn2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-mvn2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-neg.ll b/llvm/test/CodeGen/Thumb2/thumb2-neg.ll index 491e4de93157..bec609724876 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-neg.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-neg.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-orn.ll b/llvm/test/CodeGen/Thumb2/thumb2-orn.ll index 08676b1e34e6..e1f0bba7c4b8 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-orn.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-orn.ll @@ -1,5 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s - +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { %tmp = xor i32 %b, 4294967295 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll b/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll index a8f4a84e65e1..c8347df2d8a5 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-orn2.ll @@ -1,5 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s - +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 0x000000bb = 187 define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-orr.ll b/llvm/test/CodeGen/Thumb2/thumb2-orr.ll index 776d7fe790ae..f9628668a6b0 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-orr.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-orr.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-orr2.ll b/llvm/test/CodeGen/Thumb2/thumb2-orr2.ll index 37885e277c8a..045cc1dfea1a 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-orr2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-orr2.ll @@ -1,5 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s - +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 0x000000bb = 187 define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-pack.ll b/llvm/test/CodeGen/Thumb2/thumb2-pack.ll index 9a0d8892ccea..4825628f3014 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-pack.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-pack.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk %s -o - | FileCheck %s ; CHECK: test1 ; CHECK: pkhbt r0, r0, r1, lsl #16 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-rev.ll b/llvm/test/CodeGen/Thumb2/thumb2-rev.ll index d71011382a74..873a2d4cf7de 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-rev.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-rev.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+v7,+t2xtpk | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+v7,+t2xtpk %s -o - | FileCheck %s define i32 @f1(i32 %a) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-ror.ll b/llvm/test/CodeGen/Thumb2/thumb2-ror.ll index 3a21560ae8b1..71b00153c298 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-ror.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-ror.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s -; RUN: llc < %s -march=thumb | FileCheck %s -check-prefix=THUMB1 +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s -check-prefix=THUMB1 ; CHECK-LABEL: f1: ; CHECK: ror.w r0, r0, #22 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-rsb.ll b/llvm/test/CodeGen/Thumb2/thumb2-rsb.ll index 94a1fb0a4a1a..1c5acadcf40e 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-rsb.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-rsb.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { %tmp = shl i32 %b, 5 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-rsb2.ll b/llvm/test/CodeGen/Thumb2/thumb2-rsb2.ll index 248ab165a492..838e55e28eb2 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-rsb2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-rsb2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 171 = 0x000000ab define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sbc.ll b/llvm/test/CodeGen/Thumb2/thumb2-sbc.ll index 7c69451b1bd7..b04dae61cef7 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sbc.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sbc.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 < %s | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i64 @f1(i64 %a, i64 %b) { ; CHECK: f1 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-select_xform.ll b/llvm/test/CodeGen/Thumb2/thumb2-select_xform.ll index f8ceba220aec..20f0e5ef4a40 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-select_xform.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-select_xform.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @t1(i32 %a, i32 %b, i32 %c) nounwind { ; CHECK: t1 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-shifter.ll b/llvm/test/CodeGen/Thumb2/thumb2-shifter.ll index 05dd90cfbfed..538fc2214d2c 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-shifter.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-shifter.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=thumb -mcpu=cortex-a8 | FileCheck %s --check-prefix=A8 -; RUN: llc < %s -march=thumb -mcpu=swift | FileCheck %s --check-prefix=SWIFT +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-a8 %s -o - | FileCheck %s --check-prefix=A8 +; RUN: llc -mtriple=thumb-eabi -mcpu=swift %s -o - | FileCheck %s --check-prefix=SWIFT ; rdar://12892707 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-smla.ll b/llvm/test/CodeGen/Thumb2/thumb2-smla.ll index f96263ee9ce7..8573d39f09f6 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-smla.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-smla.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp | FileCheck %s -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp -arm-use-mulops=false | FileCheck %s -check-prefix=NO_MULOPS +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp -arm-use-mulops=false %s -o - | FileCheck %s -check-prefix=NO_MULOPS define i32 @f3(i32 %a, i16 %x, i32 %y) { ; CHECK: f3 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-smul.ll b/llvm/test/CodeGen/Thumb2/thumb2-smul.ll index 742e7662b91c..67783d284e9c 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-smul.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-smul.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk,+t2dsp %s -o - | FileCheck %s @x = weak global i16 0 ; [#uses=1] @y = weak global i16 0 ; [#uses=0] diff --git a/llvm/test/CodeGen/Thumb2/thumb2-str.ll b/llvm/test/CodeGen/Thumb2/thumb2-str.ll index f800974ed991..4008145b0732 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-str.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-str.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32* %v) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-str_post.ll b/llvm/test/CodeGen/Thumb2/thumb2-str_post.ll index 716c2d2e240e..aed849e50f74 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-str_post.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-str_post.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i16 @test1(i32* %X, i16* %A) { ; CHECK-LABEL: test1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-str_pre.ll b/llvm/test/CodeGen/Thumb2/thumb2-str_pre.ll index 83b3779c1d6e..e957400fe28f 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-str_pre.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-str_pre.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define void @test1(i32* %X, i32* %A, i32** %dest) { ; CHECK: test1 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-strb.ll b/llvm/test/CodeGen/Thumb2/thumb2-strb.ll index 39e376d1a735..a2558eccc2b1 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-strb.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-strb.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i8 @f1(i8 %a, i8* %v) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-strh.ll b/llvm/test/CodeGen/Thumb2/thumb2-strh.ll index 944438361138..cbe73d5cf057 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-strh.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-strh.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i16 @f1(i16 %a, i16* %v) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sub.ll b/llvm/test/CodeGen/Thumb2/thumb2-sub.ll index ad5eda187769..1c69aebccb60 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sub.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sub.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 171 = 0x000000ab define i32 @f1(i32 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sub2.ll b/llvm/test/CodeGen/Thumb2/thumb2-sub2.ll index f11489259b9b..8afc4cbf5d31 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sub2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sub2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a) { %tmp = sub i32 %a, 4095 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sub3.ll b/llvm/test/CodeGen/Thumb2/thumb2-sub3.ll index ae12b28e93c3..a3702f442c42 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sub3.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sub3.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 < %s | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; 171 = 0x000000ab define i64 @f1(i64 %a) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sub4.ll b/llvm/test/CodeGen/Thumb2/thumb2-sub4.ll index 873080a2cad1..0ff75670da03 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sub4.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sub4.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s define i32 @f1(i32 %a, i32 %b) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sub5.ll b/llvm/test/CodeGen/Thumb2/thumb2-sub5.ll index 02c83f6629d5..e12d3e1c7fdd 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sub5.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sub5.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+32bit \ +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+32bit %s -o - \ ; RUN: | FileCheck %s define i64 @f1(i64 %a, i64 %b) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sxt-uxt.ll b/llvm/test/CodeGen/Thumb2/thumb2-sxt-uxt.ll index 792ebef5f9bc..47b94c5a4a83 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sxt-uxt.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sxt-uxt.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=cortex-m3 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-m3 %s -o - | FileCheck %s define i32 @test1(i16 zeroext %z) nounwind { ; CHECK-LABEL: test1: diff --git a/llvm/test/CodeGen/Thumb2/thumb2-sxt_rot.ll b/llvm/test/CodeGen/Thumb2/thumb2-sxt_rot.ll index 75bbd83558a0..cef3490e2a38 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-sxt_rot.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-sxt_rot.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2,+t2xtpk %s -o - \ +; RUN: | FileCheck %s define i32 @test0(i8 %A) { ; CHECK: test0 diff --git a/llvm/test/CodeGen/Thumb2/thumb2-teq.ll b/llvm/test/CodeGen/Thumb2/thumb2-teq.ll index 6b34e703f3d3..258b7e48af85 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-teq.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-teq.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; These tests would be improved by 'movs r0, #0' being rematerialized below the ; test as 'mov.w r0, #0'. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-teq2.ll b/llvm/test/CodeGen/Thumb2/thumb2-teq2.ll index ea43e5606caf..3b4970b87844 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-teq2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-teq2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; These tests would be improved by 'movs r0, #0' being rematerialized below the ; tst as 'mov.w r0, #0'. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-tst.ll b/llvm/test/CodeGen/Thumb2/thumb2-tst.ll index c17510d42d54..8cf6f144a1f6 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-tst.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-tst.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; These tests would be improved by 'movs r0, #0' being rematerialized below the ; tst as 'mov.w r0, #0'. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-tst2.ll b/llvm/test/CodeGen/Thumb2/thumb2-tst2.ll index 764e3d4d3832..178a2a5f3298 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-tst2.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-tst2.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=thumb -mcpu=arm1156t2-s -mattr=+thumb2 | FileCheck %s +; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - | FileCheck %s ; These tests would be improved by 'movs r0, #0' being rematerialized below the ; tst as 'mov.w r0, #0'. diff --git a/llvm/test/CodeGen/Thumb2/thumb2-uxt_rot.ll b/llvm/test/CodeGen/Thumb2/thumb2-uxt_rot.ll index 61e849ef4a43..bcd4a0fa38ff 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-uxt_rot.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-uxt_rot.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=thumb -mcpu=cortex-a8 | FileCheck %s --check-prefix=A8 -; RUN: llc < %s -march=thumb -mcpu=cortex-m3 | FileCheck %s --check-prefix=M3 +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-a8 %s -o - | FileCheck %s --check-prefix=A8 +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-m3 %s -o - | FileCheck %s --check-prefix=M3 ; rdar://11318438 define zeroext i8 @test1(i32 %A.u) { diff --git a/llvm/test/CodeGen/Thumb2/thumb2-uxtb.ll b/llvm/test/CodeGen/Thumb2/thumb2-uxtb.ll index 2074f98cb608..b8b1bc832d96 100644 --- a/llvm/test/CodeGen/Thumb2/thumb2-uxtb.ll +++ b/llvm/test/CodeGen/Thumb2/thumb2-uxtb.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=thumb -mcpu=cortex-a8 | FileCheck %s -check-prefix=ARMv7A -; RUN: llc < %s -march=thumb -mcpu=cortex-m3 | FileCheck %s -check-prefix=ARMv7M +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-a8 %s -o - | FileCheck %s -check-prefix=ARMv7A +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-m3 %s -o - | FileCheck %s -check-prefix=ARMv7M define i32 @test1(i32 %x) { ; ARMv7A: test1 diff --git a/llvm/test/Transforms/LoopStrengthReduce/ARM/2012-06-15-lsr-noaddrmode.ll b/llvm/test/Transforms/LoopStrengthReduce/ARM/2012-06-15-lsr-noaddrmode.ll index 5d728b528ea5..756ea82f37fb 100644 --- a/llvm/test/Transforms/LoopStrengthReduce/ARM/2012-06-15-lsr-noaddrmode.ll +++ b/llvm/test/Transforms/LoopStrengthReduce/ARM/2012-06-15-lsr-noaddrmode.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -O3 -march=thumb -mcpu=cortex-a8 | FileCheck %s +; RUN: llc -O3 -mtriple=thumb-eabi -mcpu=cortex-a8 %s -o - | FileCheck %s ; ; LSR should only check for valid address modes when the IV user is a ; memory address. diff --git a/llvm/test/Transforms/LoopStrengthReduce/ARM/ivchain-ARM.ll b/llvm/test/Transforms/LoopStrengthReduce/ARM/ivchain-ARM.ll index ab7f20f0129b..c24eda3ddc8d 100644 --- a/llvm/test/Transforms/LoopStrengthReduce/ARM/ivchain-ARM.ll +++ b/llvm/test/Transforms/LoopStrengthReduce/ARM/ivchain-ARM.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -O3 -march=thumb -mcpu=cortex-a9 | FileCheck %s -check-prefix=A9 +; RUN: llc -O3 -mtriple=thumb-eabi -mcpu=cortex-a9 %s -o - | FileCheck %s -check-prefix=A9 ; @simple is the most basic chain of address induction variables. Chaining ; saves at least one register and avoids complex addressing and setup