simplify some run lines, convert a test to filecheck.

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

diff --git a/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll b/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
index 8a852de0a6d5a16394e3f713c749365e52c8bc1b..b5d1065e67936dff338e4a3407f0cd997f4f5088 100644 (file)
--- a/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
+++ b/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -simplifycfg -S | grep {ret i32 0}
+; RUN: opt < %s -jump-threading -S | grep {ret i32 0}
 ; PR3138
 
 define i32 @jt() {

diff --git a/test/Transforms/JumpThreading/2008-11-28-InfLoop.ll b/test/Transforms/JumpThreading/2008-11-28-InfLoop.ll
index dfb6251c6764eb1a7cfa0bcb179a5b3aa6f62ef0..306b2d5435fc61c0de4048c82a96abc55a766364 100644 (file)
--- a/test/Transforms/JumpThreading/2008-11-28-InfLoop.ll
+++ b/test/Transforms/JumpThreading/2008-11-28-InfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading | llvm-dis
+; RUN: opt < %s -jump-threading -S
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin9.5"

diff --git a/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll b/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll
index 5c1f77b6eea04ab752115442d33d61ca1e85ff57..05a3ef9017dbdd6ba6fcd7bdbbce3021ca2b86c1 100644 (file)
--- a/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll
+++ b/test/Transforms/JumpThreading/2009-01-19-InfSwitchLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading | llvm-dis
+; RUN: opt < %s -jump-threading -S
 ; PR3353
 
 define i32 @test(i8 %X) {

diff --git a/test/Transforms/JumpThreading/basic.ll b/test/Transforms/JumpThreading/basic.ll
index 0a6155fa8f4b344a318a12e37ea8854e4648050a..16c34185ec4721f4609b6c7d6dd9baf9295a1ae7 100644 (file)
--- a/test/Transforms/JumpThreading/basic.ll
+++ b/test/Transforms/JumpThreading/basic.ll
@@ -1,6 +1,6 @@
-; RUN: opt < %s -jump-threading -simplifycfg -mem2reg -S | grep {ret i32 %v1}
+; RUN: opt < %s -jump-threading -S | FileCheck %s
 ; There should be no uncond branches left.
-; RUN: opt < %s -jump-threading -simplifycfg -mem2reg -S | not grep {br label}
+; RUN: opt < %s -jump-threading -S | not grep {br label}
 
 declare i32 @f1()
 declare i32 @f2()
@@ -23,10 +23,14 @@ Merge:
        br i1 %A, label %T2, label %F2
 
 T2:
+; CHECK: T2:
+; CHECK: ret i32 %v1
        call void @f3()
        ret i32 %B
 
 F2:
+; CHECK: F2:
+; CHECK: ret i32 %v2
        ret i32 %B
 }
 
@@ -37,6 +41,8 @@ Entry:
        br i1 %cond, label %T1, label %F1
 
 T1:
+; CHECK: %v1 = call i32 @f1()
+; CHECK: ret i32 47
        %v1 = call i32 @f1()
        br label %Merge
 

diff --git a/test/Transforms/JumpThreading/compare.ll b/test/Transforms/JumpThreading/compare.ll
index 8784b3ffedab939a36fafbbe7c43248d57d7ad08..581785c45f5173f299bba242f14173998f24614d 100644 (file)
--- a/test/Transforms/JumpThreading/compare.ll
+++ b/test/Transforms/JumpThreading/compare.ll
@@ -1,5 +1,5 @@
 ; There should be no phi nodes left.
-; RUN: opt < %s -jump-threading -simplifycfg -mem2reg -S | not grep {phi i32}
+; RUN: opt < %s -jump-threading  -S | not grep {phi i32}
 
 declare i32 @f1()
 declare i32 @f2()

diff --git a/test/Transforms/JumpThreading/thread-loads.ll b/test/Transforms/JumpThreading/thread-loads.ll
index c8e10cae1a695b2885efd3114c5a4073dda98895..96ba701046d8222c73140ccce1b225781c45f5c1 100644 (file)
--- a/test/Transforms/JumpThreading/thread-loads.ll
+++ b/test/Transforms/JumpThreading/thread-loads.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -mem2reg -simplifycfg -S | grep {ret i32 1}
+; RUN: opt < %s -jump-threading -simplifycfg -S | grep {ret i32 1}
 ; rdar://6402033
 
 ; Test that we can thread through the block with the partially redundant load (%2).