Prep for merging 3.4: Undo changes from 3.3 branch

test/CodeGen/PowerPC/optcmp.ll

 ; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -mcpu=a2 -disable-ppc-cmp-opt=0 | FileCheck %s
 target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-v128:128:128-n32:64"
 target triple = "powerpc64-unknown-linux-gnu"
 
 define signext i32 @foo(i32 signext %a, i32 signext %b, i32* nocapture %c) #0 {
 entry:
   %sub = sub nsw i32 %a, %b
   store i32 %sub, i32* %c, align 4, !tbaa !0
   %cmp = icmp sgt i32 %a, %b
   %cond = select i1 %cmp, i32 %a, i32 %b
@@ skipping 100 matching lines @@
 
 define double @food(double %a, double %b, double* nocapture %c) #0 {
 entry:
   %sub = fsub double %a, %b
   store double %sub, double* %c, align 8, !tbaa !3
   %cmp = fcmp ogt double %a, %b
   %cond = select i1 %cmp, double %a, double %b
   ret double %cond
 
 ; CHECK: @food
-; CHECK-NOT: fsub. 0, 1, 2
+; CHECK: fsub. 0, 1, 2
 ; CHECK: stfd 0, 0(5)
 }
 
 define float @foof(float %a, float %b, float* nocapture %c) #0 {
 entry:
   %sub = fsub float %a, %b
   store float %sub, float* %c, align 4, !tbaa !3
   %cmp = fcmp ogt float %a, %b
   %cond = select i1 %cmp, float %a, float %b
   ret float %cond
 
 ; CHECK: @foof
-; CHECK-NOT: fsubs. 0, 1, 2
+; CHECK: fsubs. 0, 1, 2
 ; CHECK: stfs 0, 0(5)
 }
 
 !0 = metadata !{metadata !"int", metadata !1}
 !1 = metadata !{metadata !"omnipotent char", metadata !2}
 !2 = metadata !{metadata !"Simple C/C++ TBAA"}
 !3 = metadata !{metadata !"long", metadata !1}
 !4 = metadata !{metadata !"any pointer", metadata !1}