Update old-style syntax in some "not grep" tests.
llvm-svn: 50560
diff --git a/llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c b/llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c
index ef12122..b1e1421 100644
--- a/llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c
+++ b/llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c
@@ -1,5 +1,5 @@
// RUN: %llvmgcc -c -emit-llvm %s -o - | \
-// RUN: opt -std-compile-opts | llvm-dis | not grep {declare int.*func}
+// RUN: opt -std-compile-opts | llvm-dis | not grep {declare i32.*func}
// There should not be an unresolved reference to func here. Believe it or not,
// the "expected result" is a function named 'func' which is internal and
diff --git a/llvm/test/Linker/2003-05-31-LinkerRename.ll b/llvm/test/Linker/2003-05-31-LinkerRename.ll
index 3e8b2c8..c3661ae 100644
--- a/llvm/test/Linker/2003-05-31-LinkerRename.ll
+++ b/llvm/test/Linker/2003-05-31-LinkerRename.ll
@@ -6,7 +6,7 @@
; RUN: echo { define internal i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc
; RUN: llvm-as < %s > %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep internal | not grep %foo(
+; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep internal | not grep @foo(
declare i32 @foo()
diff --git a/llvm/test/Transforms/ArgumentPromotion/control-flow.ll b/llvm/test/Transforms/ArgumentPromotion/control-flow.ll
index bb72e08..76e8fd9 100644
--- a/llvm/test/Transforms/ArgumentPromotion/control-flow.ll
+++ b/llvm/test/Transforms/ArgumentPromotion/control-flow.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | opt -argpromotion | llvm-dis | \
-; RUN: not grep {load int\* null}
+; RUN: not grep {load i32\* null}
define internal i32 @callee(i1 %C, i32* %P) {
br i1 %C, label %T, label %F
diff --git a/llvm/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll b/llvm/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
index 660c74f..54fa078 100644
--- a/llvm/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/2004-11-28-LiveStoreDeleted.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | opt -dse -scalarrepl -instcombine | \
-; RUN: llvm-dis | not grep {ret int undef}
+; RUN: llvm-dis | not grep {ret i32 undef}
define i32 @test(double %__x) {
%__u = alloca { [3 x i32] } ; <{ [3 x i32] }*> [#uses=2]
diff --git a/llvm/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll b/llvm/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll
index a0ddd41..cf8c804 100644
--- a/llvm/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll
+++ b/llvm/test/Transforms/IndVarsSimplify/2003-12-21-IndVarSize.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar | not grep uint
+; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep indvar | not grep i32
@G = global i64 0 ; <i64*> [#uses=1]
diff --git a/llvm/test/Transforms/Inline/inline_dce.ll b/llvm/test/Transforms/Inline/inline_dce.ll
index b48a9a7..dd971be 100644
--- a/llvm/test/Transforms/Inline/inline_dce.ll
+++ b/llvm/test/Transforms/Inline/inline_dce.ll
@@ -2,7 +2,7 @@
; inlined into all of their callers.
; RUN: llvm-as < %s | opt -inline | llvm-dis | \
-; RUN: not grep %reallysmall
+; RUN: not grep @reallysmall
define internal i32 @reallysmall(i32 %A) {
ret i32 %A
diff --git a/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.ll b/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.ll
index 3585659..b89bd22 100644
--- a/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.ll
+++ b/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | opt -instcombine -mem2reg -simplifycfg | \
-; RUN: llvm-dis | grep -v store | not grep {int 1}
+; RUN: llvm-dis | grep -v store | not grep {i32 1}
; Test to make sure that instcombine does not accidentally propagate the load
; into the PHI, which would break the program.
diff --git a/llvm/test/Transforms/InstCombine/bittest.ll b/llvm/test/Transforms/InstCombine/bittest.ll
index ad4f236..8d45a48 100644
--- a/llvm/test/Transforms/InstCombine/bittest.ll
+++ b/llvm/test/Transforms/InstCombine/bittest.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | opt -instcombine -simplifycfg | llvm-dis |\
-; RUN: not grep {call void %abort}
+; RUN: not grep {call void @abort}
@b_rec.0 = external global i32 ; <i32*> [#uses=2]
diff --git a/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll b/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll
index 844d4c8..ed2e2be 100644
--- a/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll
+++ b/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll
@@ -2,7 +2,7 @@
; that folding doesn't happen in case a zext is applied where a sext should have
; been when a setcc is used with two casts.
; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN: not grep {br bool false}
+; RUN: not grep {br i1 false}
; END.
define i32 @bug(i8 %inbuff) {
diff --git a/llvm/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll b/llvm/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
index 56773ac..5209507 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/dont-hoist-simple-loop-constants.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | opt -loop-reduce | llvm-dis | \
-; RUN: not grep {cast uint 1 to uint}
+; RUN: not grep {bitcast i32 1 to i32}
; END.
; The setlt wants to use a value that is incremented one more than the dominant
; IV. Don't insert the 1 outside the loop, preventing folding it into the add.
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
index d1de65c..ea74692 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
@@ -2,7 +2,7 @@
; 'br Dest'
; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | \
-; RUN: not grep {br bool %c2}
+; RUN: not grep {br i1 %c2}
declare void @noop()
diff --git a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
index 7564cfac..a307573 100644
--- a/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
+++ b/llvm/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
@@ -4,7 +4,7 @@
; the ConstantFoldTerminator function.
; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | \
-; RUN: not grep {br bool %c2}
+; RUN: not grep {br i1 %c2}
declare void @noop()
diff --git a/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll b/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll
index abad19c..c536b6c 100644
--- a/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll
+++ b/llvm/test/Transforms/SimplifyCFG/branch-phi-thread.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | opt -simplifycfg -adce | llvm-dis | \
-; RUN: not grep {call void %f1}
+; RUN: not grep {call void @f1}
; END.
declare void @f1()
diff --git a/llvm/test/Transforms/SimplifyCFG/switch_thread.ll b/llvm/test/Transforms/SimplifyCFG/switch_thread.ll
index bf9c90d..a92528a 100644
--- a/llvm/test/Transforms/SimplifyCFG/switch_thread.ll
+++ b/llvm/test/Transforms/SimplifyCFG/switch_thread.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | \
-; RUN: not grep {call void %DEAD}
+; RUN: not grep {call void @DEAD}
; Test that we can thread a simple known condition through switch statements.
diff --git a/llvm/test/Transforms/SimplifyLibCalls/FFS.ll b/llvm/test/Transforms/SimplifyLibCalls/FFS.ll
index 94228f0..bdf43ef 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/FFS.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/FFS.ll
@@ -1,6 +1,6 @@
; Test that the ToAsciiOptimizer works correctly
; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
-; RUN: not grep {call.*%ffs}
+; RUN: not grep {call.*@ffs}
@non_const = external global i32 ; <i32*> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll b/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll
index f526db4..802639f 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrChr.ll
@@ -1,6 +1,6 @@
; Test that the StrChrOptimizer works correctly
; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | \
-; RUN: not grep {call.*%strchr}
+; RUN: not grep {call.*@strchr}
@hello = constant [14 x i8] c"hello world\5Cn\00" ; <[14 x i8]*> [#uses=1]
@null = constant [1 x i8] zeroinitializer ; <[1 x i8]*> [#uses=1]