For PR1070:
Tweak the RUN: lines of these tests to accommodate the renaming of
variables done by llvm-upgrade. The renaming occurs as a result of avoiding
name collisons for collapsed type planes. Conflicting names have a .u
(unsigned) or .s (signed) suffix added. This patch updates the grep
expression to accommodate the new names.
llvm-svn: 32815
diff --git a/llvm/test/Regression/Transforms/InstCombine/sub.ll b/llvm/test/Regression/Transforms/InstCombine/sub.ll
index ebc1a6d..be38da9 100644
--- a/llvm/test/Regression/Transforms/InstCombine/sub.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/sub.ll
@@ -1,7 +1,8 @@
; This test makes sure that these instructions are properly eliminated.
;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'sub i32 %Cok, %Bok' | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN: grep -v 'sub i32 %Cok.s, %Bok.s' | not grep sub
implementation
diff --git a/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll b/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll
index 2d30f91..e171f3a 100644
--- a/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll
+++ b/llvm/test/Regression/Transforms/InstCombine/zeroext-and-reduce.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and i32 %Y, 8'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN: grep 'and i32 %Y.s, 8'
int %test1(ubyte %X) {
%Y = cast ubyte %X to int
diff --git a/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll b/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
index e694ecf..e88660a 100644
--- a/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X.1.lcssa" &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | not grep "%X.1.lcssa1"
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: grep "%X.1.s.lcssa" &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: not grep "%X.1.s.lcssa1"
declare bool %c1()
declare bool %c2()
diff --git a/llvm/test/Regression/Transforms/LCSSA/basictest.ll b/llvm/test/Regression/Transforms/LCSSA/basictest.ll
index 7d12aee..92f754a 100644
--- a/llvm/test/Regression/Transforms/LCSSA/basictest.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/basictest.ll
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "X3.lcssa = phi i32" &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X4 = add i32 3, %X3.lcssa"
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: grep "X3.s.lcssa = phi i32" &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: grep "%X4.s = add i32 3, %X3.s.lcssa"
void %lcssa(bool %S2) {
entry: