[llvm] r174011 - Filecheckized 2x tests in SimplifyCFG and removed their date prefix to fit with current llvm style for test names.

[Michael Gottesman]

Author: mgottesman
Date: Wed Jan 30 19:04:23 2013
New Revision: 174011

URL: http://llvm.org/viewvc/llvm-project?rev=174011&view=rev
Log:
Filecheckized 2x tests in SimplifyCFG and removed their date prefix to fit with current llvm style for test names.

Added:
    llvm/trunk/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
      - copied, changed from r173998, llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
    llvm/trunk/test/Transforms/SimplifyCFG/PHINode.ll
      - copied, changed from r173998, llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
Removed:
    llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
    llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll

Removed: llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll?rev=174010&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll (removed)
@@ -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
-}
-

Removed: llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll?rev=174010&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll (removed)
@@ -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
-}
-

Copied: llvm/trunk/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll (from r173998, llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll?p2=llvm/trunk/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll&p1=llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll&r1=173998&r2=174011&rev=174011&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll Wed Jan 30 19:04:23 2013
@@ -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 @@ bb0:
 	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]

Copied: llvm/trunk/test/Transforms/SimplifyCFG/PHINode.ll (from r173998, llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/PHINode.ll?p2=llvm/trunk/test/Transforms/SimplifyCFG/PHINode.ll&p1=llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll&r1=173998&r2=174011&rev=174011&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/PHINode.ll Wed Jan 30 19:04:23 2013
@@ -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]