[llvm-commits] [llvm] r173506 - in /llvm/trunk/test: CodeGen/Thumb2/thumb2-ldr_post.ll TableGen/Slice.td Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll

[Reid Kleckner]

Author: rnk
Date: Fri Jan 25 16:11:46 2013
New Revision: 173506

URL: http://llvm.org/viewvc/llvm-project?rev=173506&view=rev
Log:
FileCheck-ify some grep tests

These tests in particular try to use escaped square brackets as an
argument to grep, which is failing for me with native win32 python.  It
appears the backslash is being lost near the CreateProcess*() call.

Modified:
    llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_post.ll
    llvm/trunk/test/TableGen/Slice.td
    llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll

Modified: llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_post.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_post.ll?rev=173506&r1=173505&r2=173506&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_post.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_post.ll Fri Jan 25 16:11:46 2013
@@ -1,5 +1,4 @@
-; RUN: llc < %s -march=thumb -mattr=+thumb2 | \
-; RUN:   grep "ldr.*\[.*\]," | count 1
+; RUN: llc < %s -march=thumb -mattr=+thumb2 | FileCheck %s
 
 define i32 @test(i32 %a, i32 %b, i32 %c) {
         %tmp1 = mul i32 %a, %b          ; <i32> [#uses=2]
@@ -9,4 +8,5 @@
         %tmp5 = mul i32 %tmp4, %tmp3            ; <i32> [#uses=1]
         ret i32 %tmp5
 }
+; CHECK: 	ldr	r{{.*}},	[{{.*}}],
 

Modified: llvm/trunk/test/TableGen/Slice.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/Slice.td?rev=173506&r1=173505&r2=173506&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/Slice.td (original)
+++ llvm/trunk/test/TableGen/Slice.td Fri Jan 25 16:11:46 2013
@@ -1,5 +1,4 @@
-// RUN: llvm-tblgen %s | grep "\[(set" | count 2
-// RUN: llvm-tblgen %s | grep "\[\]" | count 2
+// RUN: llvm-tblgen %s | FileCheck %s
 
 class ValueType<int size, int value> {
   int Size = size;
@@ -85,3 +84,8 @@
   vscalar<opcode, asmstr, patterns>;
 
 defm NOT : myscalar<0x10, "not", [[], [(set FR32:$dst, (f32 (not FR32:$src)))]]>;
+
+// CHECK: Pattern = [(set FR32:$dst, (f32 (not FR32:$src)))];
+// CHECK: Pattern = [];
+// CHECK: Pattern = [(set FR32:$dst, (f32 (not FR32:$src)))];
+// CHECK: Pattern = [];

Modified: llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll?rev=173506&r1=173505&r2=173506&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll Fri Jan 25 16:11:46 2013
@@ -1,7 +1,6 @@
 ; Scalar replacement was incorrectly promoting this alloca!!
 ;
-; RUN: opt < %s -scalarrepl -S | \
-; RUN:   sed "s/;.*//g" | grep "\["
+; RUN: opt < %s -scalarrepl -S | FileCheck %s
 
 define i8* @test() {
 	%A = alloca [30 x i8]		; <[30 x i8]*> [#uses=1]
@@ -10,4 +9,4 @@
 	store i8 0, i8* %B
 	ret i8* %C
 }
-
+; CHECK: alloca [