Filecheckized 2x tests in SimplifyCFG and removed their date prefix to fit with curre...

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

diff --git a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
deleted file mode 100644 (file)
index feffb4e..0000000
--- a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
+++ /dev/null
@@ -1,22 +0,0 @@
-; Basic block #2 should not be merged into BB #3!
-;
-; RUN: opt < %s -simplifycfg -S | \
-; RUN:   grep "br label"
-;
-
-declare void @foo()
-
-define void @cprop_test12(i32* %data) {
-bb0:
-       %reg108 = load i32* %data               ; <i32> [#uses=2]
-       %cond218 = icmp ne i32 %reg108, 5               ; <i1> [#uses=1]
-       br i1 %cond218, label %bb3, label %bb2
-bb2:           ; preds = %bb0
-       call void @foo( )
-       br label %bb3
-bb3:           ; preds = %bb2, %bb0
-       %reg117 = phi i32 [ 110, %bb2 ], [ %reg108, %bb0 ]              ; <i32> [#uses=1]
-       store i32 %reg117, i32* %data
-       ret void
-}
-

diff --git a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
deleted file mode 100644 (file)
index 88f32bc..0000000
--- a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ /dev/null
@@ -1,14 +0,0 @@
-; -simplifycfg is not folding blocks if there is a PHI node involved.  This 
-; should be fixed eventually
-
-; RUN: opt < %s -simplifycfg -S | not grep br
-
-define i32 @main(i32 %argc) {
-; <label>:0
-       br label %InlinedFunctionReturnNode
-InlinedFunctionReturnNode:             ; preds = %0
-       %X = phi i32 [ 7, %0 ]          ; <i32> [#uses=1]
-       %Y = add i32 %X, %argc          ; <i32> [#uses=1]
-       ret i32 %Y
-}
-

diff --git a/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll b/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
new file mode 100644 (file)
index 0000000..aba08dc
--- /dev/null
+++ b/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
@@ -0,0 +1,21 @@
+; Basic block #2 should not be merged into BB #3!
+;
+; RUN: opt < %s -simplifycfg -S | FileCheck %s
+
+declare void @foo()
+
+define void @cprop_test12(i32* %data) {
+bb0:
+       %reg108 = load i32* %data               ; <i32> [#uses=2]
+       %cond218 = icmp ne i32 %reg108, 5               ; <i1> [#uses=1]
+       br i1 %cond218, label %bb3, label %bb2
+bb2:           ; preds = %bb0
+       call void @foo( )
+; CHECK: br label %bb3
+       br label %bb3
+bb3:           ; preds = %bb2, %bb0
+       %reg117 = phi i32 [ 110, %bb2 ], [ %reg108, %bb0 ]              ; <i32> [#uses=1]
+       store i32 %reg117, i32* %data
+       ret void
+}
+

diff --git a/test/Transforms/SimplifyCFG/PHINode.ll b/test/Transforms/SimplifyCFG/PHINode.ll
new file mode 100644 (file)
index 0000000..25a242a
--- /dev/null
+++ b/test/Transforms/SimplifyCFG/PHINode.ll
@@ -0,0 +1,15 @@
+; -simplifycfg is not folding blocks if there is a PHI node involved.  This 
+; should be fixed eventually
+
+; RUN: opt < %s -simplifycfg -S | FileCheck %s
+
+define i32 @main(i32 %argc) {
+; <label>:0
+; CHECK-NOT: br label %InlinedFunctionReturnNode
+       br label %InlinedFunctionReturnNode
+InlinedFunctionReturnNode:             ; preds = %0
+       %X = phi i32 [ 7, %0 ]          ; <i32> [#uses=1]
+       %Y = add i32 %X, %argc          ; <i32> [#uses=1]
+       ret i32 %Y
+}
+