Filecheckized 2x tests in SimplifyCFG and removed their date prefix to fit with current llvm style for test names.
llvm-svn: 174011
diff --git a/llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/llvm/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
similarity index 86%
rename from llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
rename to llvm/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
index feffb4e..aba08dc 100644
--- a/llvm/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
+++ b/llvm/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
@@ -1,8 +1,6 @@
; Basic block #2 should not be merged into BB #3!
;
-; RUN: opt < %s -simplifycfg -S | \
-; RUN: grep "br label"
-;
+; RUN: opt < %s -simplifycfg -S | FileCheck %s
declare void @foo()
@@ -13,6 +11,7 @@
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]
diff --git a/llvm/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/llvm/test/Transforms/SimplifyCFG/PHINode.ll
similarity index 77%
rename from llvm/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
rename to llvm/test/Transforms/SimplifyCFG/PHINode.ll
index 88f32bc..25a242a 100644
--- a/llvm/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ b/llvm/test/Transforms/SimplifyCFG/PHINode.ll
@@ -1,10 +1,11 @@
; -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
+; 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]