merge and filecheckize

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@84672 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 67 insertions, 47 deletions

diff --git a/test/Transforms/SCCP/ipsccp-basic.ll b/test/Transforms/SCCP/ipsccp-basic.ll
index 7f0772e53d..29d052a25b 100644
--- a/test/Transforms/SCCP/ipsccp-basic.ll
+++ b/test/Transforms/SCCP/ipsccp-basic.ll
@@ -1,13 +1,74 @@
-; RUN: opt < %s -ipsccp -S | \
-; RUN:   grep -v {ret i32 17} | grep -v {ret i32 undef} | not grep ret
+; RUN: opt < %s -ipsccp -S | FileCheck %s
 
-define internal i32 @bar(i32 %A) {
-	%X = add i32 1, 2		; <i32> [#uses=0]
+;;======================== test1
+
+define internal i32 @test1a(i32 %A) {
+	%X = add i32 1, 2
 	ret i32 %A
 }
+; CHECK: define internal i32 @test1a
+; CHECK: ret i32 undef
+
+define i32 @test1b() {
+	%X = call i32 @test1a( i32 17 )
+	ret i32 %X
+
+; CHECK: define i32 @test1b
+; CHECK: ret i32 17
+}
+
+
+
+;;======================== test2
+
+define internal i32 @test2a(i32 %A) {
+	%C = icmp eq i32 %A, 0	
+	br i1 %C, label %T, label %F
+T:
+	%B = call i32 @test2a( i32 0 )
+	ret i32 0
+F:
+	%C.upgrd.1 = call i32 @test2a(i32 1)
+	ret i32 %C.upgrd.1
+}
+; CHECK: define internal i32 @test2a
+; CHECK-NEXT: br label %T
+; CHECK: ret i32 undef
+
 
-define i32 @foo() {
-	%X = call i32 @bar( i32 17 )		; <i32> [#uses=1]
+define i32 @test2b() {
+	%X = call i32 @test2a(i32 0)
 	ret i32 %X
 }
+; CHECK: define i32 @test2b
+; CHECK-NEXT: %X = call i32 @test2a(i32 0)
+; CHECK-NEXT: ret i32 0
+
+
+;;======================== test3
+
+@G = internal global i32 undef
 
+define void @test3a() {
+	%X = load i32* @G
+	store i32 %X, i32* @G
+	ret void
+}
+; CHECK: define void @test3a
+; CHECK-NEXT: ret void
+
+
+define i32 @test3b() {
+	%V = load i32* @G
+	%C = icmp eq i32 %V, 17
+	br i1 %C, label %T, label %F
+T:
+	store i32 17, i32* @G
+	ret i32 %V
+F:	
+	store i32 123, i32* @G
+	ret i32 0
+}
+; CHECK: define i32 @test3b
+; CHECK-NOT: store
+; CHECK: ret i32 0
diff --git a/test/Transforms/SCCP/ipsccp-conditional.ll b/test/Transforms/SCCP/ipsccp-conditional.ll
deleted file mode 100644
index 07a427ea91..0000000000
--- a/test/Transforms/SCCP/ipsccp-conditional.ll
+++ /dev/null
@@ -1,19 +0,0 @@
-; RUN: opt < %s -ipsccp -S | \
-; RUN:   grep -v {ret i32 0} | grep -v {ret i32 undef} | not grep ret
-
-define internal i32 @bar(i32 %A) {
-	%C = icmp eq i32 %A, 0		; <i1> [#uses=1]
-	br i1 %C, label %T, label %F
-T:		; preds = %0
-	%B = call i32 @bar( i32 0 )		; <i32> [#uses=0]
-	ret i32 0
-F:		; preds = %0
-	%C.upgrd.1 = call i32 @bar( i32 1 )		; <i32> [#uses=1]
-	ret i32 %C.upgrd.1
-}
-
-define i32 @foo() {
-	%X = call i32 @bar( i32 0 )		; <i32> [#uses=1]
-	ret i32 %X
-}
-
diff --git a/test/Transforms/SCCP/ipsccp-gvar.ll b/test/Transforms/SCCP/ipsccp-gvar.ll
deleted file mode 100644
index ecbd959695..0000000000
--- a/test/Transforms/SCCP/ipsccp-gvar.ll
+++ /dev/null
@@ -1,22 +0,0 @@
-; RUN: opt < %s -ipsccp -S | not grep global
-
-@G = internal global i32 undef		; <i32*> [#uses=5]
-
-define void @foo() {
-	%X = load i32* @G		; <i32> [#uses=1]
-	store i32 %X, i32* @G
-	ret void
-}
-
-define i32 @bar() {
-	%V = load i32* @G		; <i32> [#uses=2]
-	%C = icmp eq i32 %V, 17		; <i1> [#uses=1]
-	br i1 %C, label %T, label %F
-T:		; preds = %0
-	store i32 17, i32* @G
-	ret i32 %V
-F:		; preds = %0
-	store i32 123, i32* @G
-	ret i32 0
-}
-