Update test cases that grepped for register names that have now changed
as a result of llvm-upgrade handling collapsed type planes better.
llvm-svn: 32849
diff --git a/llvm/test/Regression/CodeGen/ARM/section.ll b/llvm/test/Regression/CodeGen/ARM/section.ll
index 924323f..469b935 100644
--- a/llvm/test/Regression/CodeGen/ARM/section.ll
+++ b/llvm/test/Regression/CodeGen/ARM/section.ll
@@ -1,5 +1,6 @@
; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "__DTOR_END__:" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep '.section .dtors,"aw",.progbits'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "__DTOR_END__.s:" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
+; RUN: grep '.section .dtors,"aw",.progbits'
%__DTOR_END__ = internal global [1 x int] zeroinitializer, section ".dtors"
diff --git a/llvm/test/Regression/CodeGen/X86/loop-hoist.ll b/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
index ccbf53f..32ed381 100644
--- a/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
+++ b/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
@@ -1,5 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | grep L_Arr.non_lazy_ptr &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 | %prcontext L_Arr.non_lazy_ptr 1 | grep '4(%esp)'
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 |\
+; RUN: grep L_Arr.s.non_lazy_ptr &&
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 |\
+; RUN: %prcontext L_Arr.s.non_lazy_ptr 1 | grep '4(%esp)'
%Arr = external global [0 x int] ; <[0 x int]*> [#uses=2]
diff --git a/llvm/test/Regression/CodeGen/X86/packed_struct.ll b/llvm/test/Regression/CodeGen/X86/packed_struct.ll
index 94548b8..c0aa646 100644
--- a/llvm/test/Regression/CodeGen/X86/packed_struct.ll
+++ b/llvm/test/Regression/CodeGen/X86/packed_struct.ll
@@ -1,8 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "foos+5" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "foos+1" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "foos+9" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "bara+19" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 |grep "bara+4"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos.s+5" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos.s+1" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos.s+9" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "bara+19" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "bara+4"
; make sure we compute the correct offset for a packed structure
diff --git a/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll b/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll
index c5b78cc..a55a223 100644
--- a/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll
+++ b/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll
@@ -1,6 +1,7 @@
-; RUN: echo "%G = appending global [0 x int] zeroinitializer" | llvm-upgrade | llvm-as > %t.out2.bc
+; RUN: echo "%G = appending global [0 x int] zeroinitializer" | llvm-upgrade |\
+; RUN: llvm-as > %t.out2.bc
; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc
-; RUN: llvm-link %t.out[12].bc | llvm-dis | grep '%G ='
+; RUN: llvm-link %t.out[12].bc | llvm-dis | grep '%G.s ='
; When linked, the globals should be merged, and the result should still
; be named '%G'.
diff --git a/llvm/test/Regression/Linker/weakextern.ll b/llvm/test/Regression/Linker/weakextern.ll
index f440181..882c6f7 100644
--- a/llvm/test/Regression/Linker/weakextern.ll
+++ b/llvm/test/Regression/Linker/weakextern.ll
@@ -1,7 +1,7 @@
; RUN: llvm-upgrade < %s | llvm-as > %t.bc
; RUN: llvm-upgrade < `dirname %s`/testlink1.ll | llvm-as > %t2.bc
; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc -f
-; RUN: llvm-dis < %t1.bc | grep "kallsyms_names = extern_weak" &&
+; RUN: llvm-dis < %t1.bc | grep "kallsyms_names.u = extern_weak" &&
; RUN: llvm-dis < %t1.bc | grep "MyVar.s = external global i32" &&
; RUN: llvm-dis < %t1.bc | grep "Inte.s = global i32"
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll b/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
index 2d0659b..86b7336 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | grep 'G1 = internal constant'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
+; RUN: grep 'G1.s = internal constant'
%G1 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"
diff --git a/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll b/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
index fb36b4b..342bf4c 100644
--- a/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
+++ b/llvm/test/Regression/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry" &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry"
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: grep "%SJE.0.0.u.lcssa = phi .struct.SetJmpMapEntry" &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
+; RUN: grep "%SJE.0.0.u.lcssa1 = phi .struct.SetJmpMapEntry"
%struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* }