From 009d0e96b7029b7de6451ced692a0527d7e4c21c Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 2 Apr 2014 21:22:03 +0000 Subject: [PATCH] ARM: fixup tests to specify the target more explicitly This changes the tests that were targeting ARM EABI to explicitly specify the environment rather than relying on the default. This breaks with the new Windows on ARM support when running the tests on Windows where the default environment is no longer EABI. Take the opportunity to avoid a pointless redirect (helps when trying to debug with providing a command line invocation which can be copy and pasted) and removing a few greps in favour of FileCheck. llvm-svn: 205465 --- llvm/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll | 2 +- llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll | 5 ++++- llvm/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll | 2 +- llvm/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll | 5 ++++- llvm/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll | 5 ++++- llvm/test/CodeGen/ARM/2008-07-17-Fdiv.ll | 2 +- llvm/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll | 2 +- llvm/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll | 2 +- llvm/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll | 2 +- llvm/test/CodeGen/ARM/2009-04-06-AsmModifier.ll | 5 ++++- llvm/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll | 2 +- llvm/test/CodeGen/ARM/2009-04-08-FREM.ll | 2 +- llvm/test/CodeGen/ARM/2009-04-08-FloatUndef.ll | 2 +- llvm/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll | 2 +- llvm/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll | 3 ++- llvm/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll | 4 ++-- llvm/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll | 2 +- llvm/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll | 2 +- llvm/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll | 3 ++- llvm/test/CodeGen/ARM/2009-09-10-postdec.ll | 2 +- 20 files changed, 35 insertions(+), 21 deletions(-) diff --git a/llvm/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll b/llvm/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll index a0235f787061..f8bd886aa9e1 100644 --- a/llvm/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll +++ b/llvm/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm -mattr=+v6 +; RUN: llc -mtriple=arm-eabi -mattr=+v6 %s -o /dev/null %struct.layer_data = type { i32, [2048 x i8], i8*, [16 x i8], i32, i8*, i32, i32, [64 x i32], [64 x i32], [64 x i32], [64 x i32], i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, [12 x [64 x i16]] } @ld = external global %struct.layer_data* ; <%struct.layer_data**> [#uses=1] diff --git a/llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll b/llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll index 8d3337c29fcf..cf5094fb3800 100644 --- a/llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll +++ b/llvm/test/CodeGen/ARM/2007-04-03-PEIBug.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm | not grep "add.*#0" +; RUN: llc -mtriple=arm-eabi %s -o - | FileCheck %s define i32 @foo() { entry: @@ -10,3 +10,6 @@ entry: } declare i32 @bar(...) + +; CHECK-NOT: add{{.*}}#0 + diff --git a/llvm/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll b/llvm/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll index b3b0769347f1..99e67d501ca0 100644 --- a/llvm/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll +++ b/llvm/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm -mattr=+v6 +; RUN: llc -mtriple=arm-eabi -mattr=+v6 %s -o /dev/null define i32 @test3() { tail call void asm sideeffect "/* number: ${0:c} */", "i"( i32 1 ) diff --git a/llvm/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll b/llvm/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll index 670048bf25c4..5988c65dae6c 100644 --- a/llvm/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll +++ b/llvm/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm | not grep "str.*\!" +; RUN: llc -mtriple=arm-eabi %s -o - | FileCheck %s %struct.shape_edge_t = type { %struct.shape_edge_t*, %struct.shape_edge_t*, i32, i32, i32, i32 } %struct.shape_path_t = type { %struct.shape_edge_t*, %struct.shape_edge_t*, i32, i32, i32, i32, i32, i32 } @@ -32,3 +32,6 @@ bb140: ; preds = %bb140, %cond_false bb174: ; preds = %bb140, %cond_false ret %struct.shape_path_t* null } + +; CHECK-NOT: str{{.*}}! + diff --git a/llvm/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll b/llvm/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll index a604c5cd574e..95aa5958cf27 100644 --- a/llvm/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll +++ b/llvm/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm -mattr=+v6 | not grep 255 +; RUN: llc -mtriple=arm-eabi -mattr=+v6 %s -o - | FileCheck %s define i32 @main(i32 %argc, i8** %argv) { entry: @@ -12,3 +12,6 @@ bb2: ; preds = %bb1 bb3: ; preds = %bb1 ret i32 0 } + +; CHECK-NOT: 255 + diff --git a/llvm/test/CodeGen/ARM/2008-07-17-Fdiv.ll b/llvm/test/CodeGen/ARM/2008-07-17-Fdiv.ll index 4cb768ef5b6d..9f50d92a4d8e 100644 --- a/llvm/test/CodeGen/ARM/2008-07-17-Fdiv.ll +++ b/llvm/test/CodeGen/ARM/2008-07-17-Fdiv.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null define float @f(float %a, float %b) nounwind { %tmp = fdiv float %a, %b diff --git a/llvm/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll b/llvm/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll index 83fde07779bc..e86bc1ba5ccc 100644 --- a/llvm/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll +++ b/llvm/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null ; PR2589 define void @main({ i32 }*) { diff --git a/llvm/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll b/llvm/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll index 601a516eb09a..d16ad8cfbabf 100644 --- a/llvm/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll +++ b/llvm/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm -mattr=+v6,+vfp2 +; RUN: llc -mtriple=arm-eabi -mattr=+v6,+vfp2 %s -o /dev/null define hidden i64 @__muldi3(i64 %u, i64 %v) nounwind { entry: diff --git a/llvm/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll b/llvm/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll index a1ce384b5345..7bb1429872b9 100644 --- a/llvm/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll +++ b/llvm/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null %struct.hit_t = type { %struct.v_t, double } %struct.node_t = type { %struct.hit_t, %struct.hit_t, i32 } diff --git a/llvm/test/CodeGen/ARM/2009-04-06-AsmModifier.ll b/llvm/test/CodeGen/ARM/2009-04-06-AsmModifier.ll index a8ea6f007c7f..e90c5b322db7 100644 --- a/llvm/test/CodeGen/ARM/2009-04-06-AsmModifier.ll +++ b/llvm/test/CodeGen/ARM/2009-04-06-AsmModifier.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm -no-integrated-as | grep "swi 107" +; RUN: llc -mtriple=arm-eabi -no-integrated-as %s -o - | FileCheck %s define i32 @_swilseek(i32) nounwind { entry: @@ -18,3 +18,6 @@ return: ; preds = %entry %4 = load i32* %retval ; [#uses=1] ret i32 %4 } + +; CHECK: swi 107 + diff --git a/llvm/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll b/llvm/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll index f6b3d2c0147b..ade6a10afef6 100644 --- a/llvm/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll +++ b/llvm/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null ; PR3795 define fastcc void @_D3foo3fooFAriZv({ i32, { double, double }* } %d_arg, i32 %x_arg) { diff --git a/llvm/test/CodeGen/ARM/2009-04-08-FREM.ll b/llvm/test/CodeGen/ARM/2009-04-08-FREM.ll index 99907fc697bd..606c6b1471b4 100644 --- a/llvm/test/CodeGen/ARM/2009-04-08-FREM.ll +++ b/llvm/test/CodeGen/ARM/2009-04-08-FREM.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null declare i32 @printf(i8*, ...) diff --git a/llvm/test/CodeGen/ARM/2009-04-08-FloatUndef.ll b/llvm/test/CodeGen/ARM/2009-04-08-FloatUndef.ll index 05d2f26be0b7..9e32e05b040b 100644 --- a/llvm/test/CodeGen/ARM/2009-04-08-FloatUndef.ll +++ b/llvm/test/CodeGen/ARM/2009-04-08-FloatUndef.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null define void @execute_shader(<4 x float>* %OUT, <4 x float>* %IN, <4 x float>* %CONST) { entry: diff --git a/llvm/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll b/llvm/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll index deb092bbf86e..5b1746301f4e 100644 --- a/llvm/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll +++ b/llvm/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null ; PR3954 define void @foo(...) nounwind { diff --git a/llvm/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll b/llvm/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll index 7046fccb5ee9..2bc7df028534 100644 --- a/llvm/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll +++ b/llvm/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll @@ -1,4 +1,5 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null + %struct.List = type { %struct.List*, i32 } @Node5 = external constant %struct.List ; <%struct.List*> [#uses=1] @"\01LC" = external constant [7 x i8] ; <[7 x i8]*> [#uses=1] diff --git a/llvm/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll b/llvm/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll index 1e2707f7b5bb..5d59fc64d922 100644 --- a/llvm/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll +++ b/llvm/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll @@ -1,5 +1,5 @@ -; RUN: llc < %s -march=arm | FileCheck %s -; RUN: llc < %s -march=thumb | FileCheck %s +; RUN: llc -mtriple=arm-eabi %s -o - | FileCheck %s +; RUN: llc -mtriple=thumb-eabi %s -o - | FileCheck %s ; PR4091 define void @foo(i32 %i, i32* %p) nounwind { diff --git a/llvm/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll b/llvm/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll index e1e94b641214..3cef0aa546a5 100644 --- a/llvm/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll +++ b/llvm/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm -mattr=+v6 +; RUN: llc -mtriple=arm-eabi -mattr=+v6 %s -o /dev/null define void @test(i8* %x) nounwind { entry: diff --git a/llvm/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll b/llvm/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll index 67616877beb2..bc4a95c3e00b 100644 --- a/llvm/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll +++ b/llvm/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll @@ -1,4 +1,4 @@ -; RUN: llc < %s -march=arm +; RUN: llc -mtriple=arm-eabi %s -o /dev/null %struct.cli_ac_alt = type { i8, i8*, i16, i16, %struct.cli_ac_alt* } %struct.cli_ac_node = type { i8, i8, %struct.cli_ac_patt*, %struct.cli_ac_node**, %struct.cli_ac_node* } diff --git a/llvm/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll b/llvm/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll index ee99c70ff0e6..b078ec06dbb8 100644 --- a/llvm/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll +++ b/llvm/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll @@ -1,5 +1,6 @@ -; RUN: llc < %s -march=arm -mattr=+neon | FileCheck %s +; RUN: llc -mtriple=arm-eabi -mattr=+neon %s -o - | FileCheck %s ; pr4843 + define <4 x i16> @v2regbug(<4 x i16>* %B) nounwind { ;CHECK-LABEL: v2regbug: ;CHECK: vzip.16 diff --git a/llvm/test/CodeGen/ARM/2009-09-10-postdec.ll b/llvm/test/CodeGen/ARM/2009-09-10-postdec.ll index 10653b51c146..66ffe6a1a0fb 100644 --- a/llvm/test/CodeGen/ARM/2009-09-10-postdec.ll +++ b/llvm/test/CodeGen/ARM/2009-09-10-postdec.ll @@ -1,4 +1,4 @@ -; RUN: llc -march=arm < %s | FileCheck %s +; RUN: llc -mtriple=arm-eabi %s -o - | FileCheck %s ; Radar 7213850 define i32 @test(i8* %d, i32 %x, i32 %y) nounwind {