[llvm] r205465 - ARM: fixup tests to specify the target more explicitly

Saleem Abdulrasool compnerd at compnerd.org
Wed Apr 2 14:22:04 PDT 2014


Author: compnerd
Date: Wed Apr  2 16:22:03 2014
New Revision: 205465

URL: http://llvm.org/viewvc/llvm-project?rev=205465&view=rev
Log:
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.

Modified:
    llvm/trunk/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll
    llvm/trunk/test/CodeGen/ARM/2007-04-03-PEIBug.ll
    llvm/trunk/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll
    llvm/trunk/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll
    llvm/trunk/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll
    llvm/trunk/test/CodeGen/ARM/2008-07-17-Fdiv.ll
    llvm/trunk/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll
    llvm/trunk/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll
    llvm/trunk/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll
    llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll
    llvm/trunk/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll
    llvm/trunk/test/CodeGen/ARM/2009-04-08-FREM.ll
    llvm/trunk/test/CodeGen/ARM/2009-04-08-FloatUndef.ll
    llvm/trunk/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll
    llvm/trunk/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll
    llvm/trunk/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll
    llvm/trunk/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll
    llvm/trunk/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll
    llvm/trunk/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll
    llvm/trunk/test/CodeGen/ARM/2009-09-10-postdec.ll

Modified: llvm/trunk/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2006-11-10-CycleInDAG.ll Wed Apr  2 16:22:03 2014
@@ -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]

Modified: llvm/trunk/test/CodeGen/ARM/2007-04-03-PEIBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2007-04-03-PEIBug.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2007-04-03-PEIBug.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2007-04-03-PEIBug.ll Wed Apr  2 16:22:03 2014
@@ -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
+

Modified: llvm/trunk/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2007-05-14-InlineAsmCstCrash.ll Wed Apr  2 16:22:03 2014
@@ -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 )

Modified: llvm/trunk/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2007-05-23-BadPreIndexedStore.ll Wed Apr  2 16:22:03 2014
@@ -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{{.*}}!
+

Modified: llvm/trunk/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2008-03-05-SxtInRegBug.ll Wed Apr  2 16:22:03 2014
@@ -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
+

Modified: llvm/trunk/test/CodeGen/ARM/2008-07-17-Fdiv.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2008-07-17-Fdiv.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2008-07-17-Fdiv.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2008-07-17-Fdiv.ll Wed Apr  2 16:22:03 2014
@@ -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

Modified: llvm/trunk/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2008-07-24-CodeGenPrepCrash.ll Wed Apr  2 16:22:03 2014
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=arm
+; RUN: llc -mtriple=arm-eabi %s -o /dev/null
 ; PR2589
 
 define void @main({ i32 }*) {

Modified: llvm/trunk/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2008-11-18-ScavengerAssert.ll Wed Apr  2 16:22:03 2014
@@ -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:

Modified: llvm/trunk/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-03-09-AddrModeBug.ll Wed Apr  2 16:22:03 2014
@@ -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 }

Modified: llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll Wed Apr  2 16:22:03 2014
@@ -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		; <i32> [#uses=1]
 	ret i32 %4
 }
+
+; CHECK: swi 107
+

Modified: llvm/trunk/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-04-08-AggregateAddr.ll Wed Apr  2 16:22:03 2014
@@ -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) {

Modified: llvm/trunk/test/CodeGen/ARM/2009-04-08-FREM.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-04-08-FREM.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-04-08-FREM.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-04-08-FREM.ll Wed Apr  2 16:22:03 2014
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=arm
+; RUN: llc -mtriple=arm-eabi %s -o /dev/null
 
 declare i32 @printf(i8*, ...)
 

Modified: llvm/trunk/test/CodeGen/ARM/2009-04-08-FloatUndef.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-04-08-FloatUndef.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-04-08-FloatUndef.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-04-08-FloatUndef.ll Wed Apr  2 16:22:03 2014
@@ -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:

Modified: llvm/trunk/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-04-09-RegScavengerAsm.ll Wed Apr  2 16:22:03 2014
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=arm
+; RUN: llc -mtriple=arm-eabi %s -o /dev/null
 ; PR3954
 
 define void @foo(...) nounwind {

Modified: llvm/trunk/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-05-11-CodePlacementCrash.ll Wed Apr  2 16:22:03 2014
@@ -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]

Modified: llvm/trunk/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-05-18-InlineAsmMem.ll Wed Apr  2 16:22:03 2014
@@ -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 {

Modified: llvm/trunk/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-07-09-asm-p-constraint.ll Wed Apr  2 16:22:03 2014
@@ -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:

Modified: llvm/trunk/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-07-22-SchedulerAssert.ll Wed Apr  2 16:22:03 2014
@@ -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* }

Modified: llvm/trunk/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-08-31-TwoRegShuffle.ll Wed Apr  2 16:22:03 2014
@@ -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

Modified: llvm/trunk/test/CodeGen/ARM/2009-09-10-postdec.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-09-10-postdec.ll?rev=205465&r1=205464&r2=205465&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-09-10-postdec.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-09-10-postdec.ll Wed Apr  2 16:22:03 2014
@@ -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 {





More information about the llvm-commits mailing list