Skip to content

Commit

Permalink
Revert "s/grep/FileCheck/ in some tests"
Browse files Browse the repository at this point in the history
This reverts commit 8b75e6b.

The FileCheck tests are not equivalent:

test/CodeGen/X86/tailcall-structret.ll:6:10: error: expected string not found in input
; CHECK: jmp init
         ^
<stdin>:1:2: note: scanning from here
 .section __TEXT,__text,regular,pure_instructions
 ^
<stdin>:13:2: note: possible intended match here
 jmp _init ## TAILCALL
 ^

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175124 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
atrick committed Feb 14, 2013
1 parent 1d46732 commit fd1335e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 16 deletions.
3 changes: 1 addition & 2 deletions test/CodeGen/X86/tailcall-structret.ll
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
; RUN: llc < %s -march=x86 -tailcallopt | FileCheck %s
; RUN: llc < %s -march=x86 -tailcallopt | grep TAILCALL
define fastcc { { i8*, i8* }*, i8*} @init({ { i8*, i8* }*, i8*}, i32) {
entry:
%2 = tail call fastcc { { i8*, i8* }*, i8* } @init({ { i8*, i8*}*, i8*} %0, i32 %1)
ret { { i8*, i8* }*, i8*} %2
; CHECK: jmp init
}
8 changes: 2 additions & 6 deletions test/CodeGen/X86/tailcallbyval.ll
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
; RUN: llc < %s -march=x86 -tailcallopt | FileCheck %s
; RUN: llc < %s -march=x86 -tailcallopt | grep TAILCALL
; RUN: llc < %s -march=x86 -tailcallopt | grep "movl[[:space:]]*4(%esp), %eax" | count 1
%struct.s = type {i32, i32, i32, i32, i32, i32, i32, i32,
i32, i32, i32, i32, i32, i32, i32, i32,
i32, i32, i32, i32, i32, i32, i32, i32 }
Expand All @@ -8,15 +9,10 @@ entry:
%tmp2 = getelementptr %struct.s* %a, i32 0, i32 0
%tmp3 = load i32* %tmp2
ret i32 %tmp3
; CHECK: tailcallee
; CHECK: movl 4(%esp), %eax
}

define fastcc i32 @tailcaller(%struct.s* byval %a) nounwind {
entry:
%tmp4 = tail call fastcc i32 @tailcallee(%struct.s* byval %a )
ret i32 %tmp4
; CHECK: tailcaller
; CHECK: jmp tailcallee
}

3 changes: 1 addition & 2 deletions test/CodeGen/X86/tailcallfp.ll
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
; RUN: llc < %s -march=x86 -tailcallopt | FileCheck %s
; RUN: llc < %s -march=x86 -x86-asm-syntax=intel -tailcallopt | not grep call
define fastcc i32 @bar(i32 %X, i32(double, i32) *%FP) {
%Y = tail call fastcc i32 %FP(double 0.0, i32 %X)
ret i32 %Y
; CHECK: jmpl
}
3 changes: 1 addition & 2 deletions test/CodeGen/X86/tailcallpic1.ll
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: llc < %s -tailcallopt -mtriple=i686-pc-linux-gnu -relocation-model=pic | FileCheck %s
; RUN: llc < %s -tailcallopt -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep TAILCALL

define protected fastcc i32 @tailcallee(i32 %a1, i32 %a2, i32 %a3, i32 %a4) {
entry:
Expand All @@ -9,5 +9,4 @@ define fastcc i32 @tailcaller(i32 %in1, i32 %in2) {
entry:
%tmp11 = tail call fastcc i32 @tailcallee( i32 %in1, i32 %in2, i32 %in1, i32 %in2 ) ; <i32> [#uses=1]
ret i32 %tmp11
; CHECK: jmp tailcallee
}
5 changes: 1 addition & 4 deletions test/CodeGen/X86/tailcallpic2.ll
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; RUN: llc < %s -tailcallopt -mtriple=i686-pc-linux-gnu -relocation-model=pic | FileCheck %s
; RUN: llc < %s -tailcallopt -mtriple=i686-pc-linux-gnu -relocation-model=pic | grep -v TAILCALL

define fastcc i32 @tailcallee(i32 %a1, i32 %a2, i32 %a3, i32 %a4) {
entry:
Expand All @@ -9,7 +9,4 @@ define fastcc i32 @tailcaller(i32 %in1, i32 %in2) {
entry:
%tmp11 = tail call fastcc i32 @tailcallee( i32 %in1, i32 %in2, i32 %in1, i32 %in2 ) ; <i32> [#uses=1]
ret i32 %tmp11
; CHECK: movl tailcallee@GOT
; CHECK: jmpl
}

0 comments on commit fd1335e

Please sign in to comment.