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