Index: llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll
===================================================================
--- llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll
+++ llvm/trunk/test/CodeGen/AArch64/fdiv-combine.ll
@@ -6,8 +6,8 @@
 ;   recip = 1.0 / D; a * recip; b * recip; c * recip;
 define void @three_fdiv_float(float %D, float %a, float %b, float %c) #0 {
 ; CHECK-LABEL: three_fdiv_float:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv s
+; CHECK-NOT: fdiv
 ; CHECK: fmul
 ; CHECK: fmul
 ; CHECK: fmul
@@ -20,8 +20,8 @@
 
 define void @three_fdiv_double(double %D, double %a, double %b, double %c) #0 {
 ; CHECK-LABEL: three_fdiv_double:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv d
+; CHECK-NOT: fdiv
 ; CHECK: fmul
 ; CHECK: fmul
 ; CHECK: fmul
@@ -34,8 +34,8 @@
 
 define void @three_fdiv_4xfloat(<4 x float> %D, <4 x float> %a, <4 x float> %b, <4 x float> %c) #0 {
 ; CHECK-LABEL: three_fdiv_4xfloat:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv v
+; CHECK-NOT: fdiv
 ; CHECK: fmul
 ; CHECK: fmul
 ; CHECK: fmul
@@ -48,8 +48,8 @@
 
 define void @three_fdiv_2xdouble(<2 x double> %D, <2 x double> %a, <2 x double> %b, <2 x double> %c) #0 {
 ; CHECK-LABEL: three_fdiv_2xdouble:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv v
+; CHECK-NOT: fdiv
 ; CHECK: fmul
 ; CHECK: fmul
 ; CHECK: fmul
@@ -64,9 +64,9 @@
 ; calculates a reciprocal.
 define void @two_fdiv_float(float %D, float %a, float %b) #0 {
 ; CHECK-LABEL: two_fdiv_float:
-; CHECK: fdiv
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fmul
+; CHECK: fdiv s
+; CHECK: fdiv s
+; CHECK-NOT: fmul
   %div = fdiv float %a, %D
   %div1 = fdiv float %b, %D
   tail call void @foo_2f(float %div, float %div1)
@@ -75,9 +75,9 @@
 
 define void @two_fdiv_double(double %D, double %a, double %b) #0 {
 ; CHECK-LABEL: two_fdiv_double:
-; CHECK: fdiv
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fmul
+; CHECK: fdiv d
+; CHECK: fdiv d
+; CHECK-NOT: fmul
   %div = fdiv double %a, %D
   %div1 = fdiv double %b, %D
   tail call void @foo_2d(double %div, double %div1)
Index: llvm/trunk/test/CodeGen/AArch64/remat.ll
===================================================================
--- llvm/trunk/test/CodeGen/AArch64/remat.ll
+++ llvm/trunk/test/CodeGen/AArch64/remat.ll
@@ -12,9 +12,11 @@
   %tmp = alloca %X
   call void @f(%X* %tmp)
 ; CHECK: add x0, sp, #8
-; CHECK-NEXT-NOT: mov
+; CHECK-NOT: mov
+; CHECK-NEXT: bl f
   call void @f(%X* %tmp)               
 ; CHECK: add x0, sp, #8
-; CHECK-NEXT-NOT: mov
+; CHECK-NOT: mov
+; CHECK-NEXT: bl f
   ret void 
 }
Index: llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll
===================================================================
--- llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll
+++ llvm/trunk/test/CodeGen/Hexagon/rdf-copy.ll
@@ -16,7 +16,7 @@
 ; CHECK-LABEL: LBB0_1
 ; CHECK: [[DST:r[0-9]+]] = [[SRC:r[0-9]+]]
 ; CHECK-DAG: memw([[SRC]]
-; CHECK-DAG-NOT: memw([[DST]]
+; CHECK-NOT: memw([[DST]]
 ; CHECK-LABEL: LBB0_2
 
 target datalayout = "e-p:32:32:32-i64:64:64-i32:32:32-i16:16:16-i1:32:32-f64:64:64-f32:32:32-v64:64:64-v32:32:32-a0:0-n16:32"
Index: llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll
===================================================================
--- llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll
+++ llvm/trunk/test/CodeGen/Hexagon/tls_pic.ll
@@ -7,7 +7,7 @@
 ; CHECK:          = add(pc, ##_GLOBAL_OFFSET_TABLE_@PCREL)
 ; CHECK-DAG:      = ##src_ie@IEGOT
 ; CHECK-DAG:      = ##dst_ie@IEGOT
-; CHECK-DAG-NOT:  call
+; CHECK-NOT:  call
 define i32 @test_initial_exec() nounwind {
 entry:
   %0 = load i32, i32* @src_ie, align 4
Index: llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll
===================================================================
--- llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll
+++ llvm/trunk/test/CodeGen/PowerPC/fdiv-combine.ll
@@ -9,8 +9,8 @@
 
 define void @three_fdiv_double(double %D, double %a, double %b, double %c) #0 {
 ; CHECK-LABEL: three_fdiv_double:
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fdiv
+; CHECK: fdiv {{[0-9]}}
+; CHECK-NOT: fdiv
 ; CHECK: fmul
 ; CHECK: fmul
 ; CHECK: fmul
@@ -23,9 +23,9 @@
 
 define void @two_fdiv_double(double %D, double %a, double %b) #0 {
 ; CHECK-LABEL: two_fdiv_double:
-; CHECK: fdiv
-; CHECK: fdiv
-; CHECK-NEXT-NOT: fmul
+; CHECK: fdiv {{[0-9]}}
+; CHECK: fdiv {{[0-9]}}
+; CHECK-NOT: fmul
   %div = fdiv double %a, %D
   %div1 = fdiv double %b, %D
   tail call void @foo_2d(double %div, double %div1)
Index: llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll
===================================================================
--- llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll
+++ llvm/trunk/test/CodeGen/SPARC/2011-01-11-CC.ll
@@ -70,7 +70,7 @@
 ;V8: {{fbe|fbne}}
 ;V9-LABEL: test_select_int_fcc:
 ;V9: fcmps
-;V9-NEXT-NOT: nop
+;V9-NOT: nop
 ;V9-NOT: {{fbe|fbne}}
 ;V9: mov{{e|ne}} %fcc0
   %0 = fcmp une float %f, 0.000000e+00
@@ -101,7 +101,7 @@
 ;V8: {{fbne|fbe}}
 ;V9-LABEL: test_select_dfp_fcc:
 ;V9: fcmpd
-;V9-NEXT-NOT: nop
+;V9-NOT: nop
 ;V9-NOT: {{fbne|fbe}}
 ;V9: fmovd{{e|ne}} %fcc0
   %0 = fcmp une double %f, 0.000000e+00
Index: llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll
===================================================================
--- llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll
+++ llvm/trunk/test/CodeGen/Thumb/ldm-merge-struct.ll
@@ -10,7 +10,7 @@
 entry:
 ; CHECK-LABEL: f:
 ; CHECK: ldm r[[BASE:[0-9]]],
-; CHECK-NEXT-NOT: subs r[[BASE]]
+; CHECK-NOT: subs r[[BASE]]
   %0 = load i32, i32* getelementptr inbounds (%struct.S, %struct.S* @s, i32 0, i32 0), align 4
   %1 = load i32, i32* getelementptr inbounds (%struct.S, %struct.S* @s, i32 0, i32 1), align 4
   %cmp = icmp sgt i32 %0, %1
Index: llvm/trunk/test/Transforms/GVN/pre-gep-load.ll
===================================================================
--- llvm/trunk/test/Transforms/GVN/pre-gep-load.ll
+++ llvm/trunk/test/Transforms/GVN/pre-gep-load.ll
@@ -34,7 +34,7 @@
   %arrayidx5 = getelementptr inbounds double, double* %2, i64 %idxprom3
   %3 = load double, double* %arrayidx5, align 8
 ; CHECK: sw.bb2:
-; CHECK-NEXT-NOT: sext
+; CHECK-NOT: sext
 ; CHECK-NEXT: phi double [
 ; CHECK-NOT: load
   %sub6 = fsub double 3.000000e+00, %3
Index: llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll
===================================================================
--- llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll
+++ llvm/trunk/test/Transforms/LoopVectorize/PowerPC/large-loop-rdx.ll
@@ -12,7 +12,9 @@
 ; CHECK-NEXT: fadd
 ; CHECK-NEXT: fadd
 ; CHECK-NEXT: fadd
-; CHECK-NEXT-NOT: fadd
+; CHECK-NEXT: =
+; CHECK-NOT: fadd
+; CHECK-SAME: >
 
 target datalayout = "e-m:e-i64:64-n32:64"
 target triple = "powerpc64le-ibm-linux-gnu"
Index: llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll
===================================================================
--- llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll
+++ llvm/trunk/test/Transforms/LoopVectorize/PowerPC/small-loop-rdx.ll
@@ -12,7 +12,9 @@
 ; CHECK-NEXT: fadd
 ; CHECK-NEXT: fadd
 ; CHECK-NEXT: fadd
-; CHECK-NEXT-NOT: fadd
+; CHECK-NEXT: =
+; CHECK-NOT: fadd
+; CHECK-SAME: >
 
 target datalayout = "e-m:e-i64:64-n32:64"
 target triple = "powerpc64le-ibm-linux-gnu"
Index: llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll
===================================================================
--- llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll
+++ llvm/trunk/test/Transforms/SLPVectorizer/X86/ordering.ll
@@ -48,7 +48,7 @@
 ; CHECK-LABEL: invoketest
 
 ; CHECK-LABEL: cond.end60
-; CHECK-NEXT-NOT: phi <2 x double>
+; CHECK-NOT: phi <2 x double>
 ; CHECK: insertelement
 ; CHECK-LABEL: if.then63
 
Index: llvm/trunk/test/tools/dsymutil/absolute_symbol.test
===================================================================
--- llvm/trunk/test/tools/dsymutil/absolute_symbol.test
+++ llvm/trunk/test/tools/dsymutil/absolute_symbol.test
@@ -14,4 +14,4 @@
 might conflict with other real symbols in the same file.
 
 CHECK: objc_class_name_Foo
-CHECK-SAME-NOT: objAddr
+CHECK-NOT: objAddr