Index: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
===================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -868,6 +868,11 @@
                                     Options, ForCodeSize, Depth + 1))
       return V;
 
+    // Ignore X * 2.0 because that is expected to be canonicalized to X + X.
+    if (auto *C = isConstOrConstSplatFP(Op.getOperand(1)))
+      if (C->isExactlyValue(2.0) && Op.getOpcode() == ISD::FMUL)
+        return 0;
+
     return isNegatibleForFree(Op.getOperand(1), LegalOperations, TLI, Options,
                               ForCodeSize, Depth + 1);
 
Index: llvm/trunk/test/CodeGen/AArch64/fadd-combines.ll
===================================================================
--- llvm/trunk/test/CodeGen/AArch64/fadd-combines.ll
+++ llvm/trunk/test/CodeGen/AArch64/fadd-combines.ll
@@ -169,10 +169,9 @@
 define double @fmul2_negated(double %a, double %b, double %c) {
 ; CHECK-LABEL: fmul2_negated:
 ; CHECK:       // %bb.0:
-; CHECK-NEXT:    fmov d3, #-2.00000000
-; CHECK-NEXT:    fmul d1, d1, d3
+; CHECK-NEXT:    fadd d1, d1, d1
 ; CHECK-NEXT:    fmul d1, d1, d2
-; CHECK-NEXT:    fadd d0, d0, d1
+; CHECK-NEXT:    fsub d0, d0, d1
 ; CHECK-NEXT:    ret
   %mul = fmul double %b, 2.0
   %mul1 = fmul double %mul, %c
@@ -183,10 +182,9 @@
 define <2 x double> @fmul2_negated_vec(<2 x double> %a, <2 x double> %b, <2 x double> %c) {
 ; CHECK-LABEL: fmul2_negated_vec:
 ; CHECK:       // %bb.0:
-; CHECK-NEXT:    fmov v3.2d, #-2.00000000
-; CHECK-NEXT:    fmul v1.2d, v1.2d, v3.2d
+; CHECK-NEXT:    fadd v1.2d, v1.2d, v1.2d
 ; CHECK-NEXT:    fmul v1.2d, v1.2d, v2.2d
-; CHECK-NEXT:    fadd v0.2d, v0.2d, v1.2d
+; CHECK-NEXT:    fsub v0.2d, v0.2d, v1.2d
 ; CHECK-NEXT:    ret
   %mul = fmul <2 x double> %b, <double 2.0, double 2.0>
   %mul1 = fmul <2 x double> %mul, %c
Index: llvm/trunk/test/CodeGen/X86/fadd-combines.ll
===================================================================
--- llvm/trunk/test/CodeGen/X86/fadd-combines.ll
+++ llvm/trunk/test/CodeGen/X86/fadd-combines.ll
@@ -252,9 +252,9 @@
 define double @fmul2_negated(double %a, double %b, double %c) {
 ; CHECK-LABEL: fmul2_negated:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    mulsd {{.*}}(%rip), %xmm1
+; CHECK-NEXT:    addsd %xmm1, %xmm1
 ; CHECK-NEXT:    mulsd %xmm2, %xmm1
-; CHECK-NEXT:    addsd %xmm1, %xmm0
+; CHECK-NEXT:    subsd %xmm1, %xmm0
 ; CHECK-NEXT:    retq
   %mul = fmul double %b, 2.0
   %mul1 = fmul double %mul, %c
@@ -265,9 +265,9 @@
 define <2 x double> @fmul2_negated_vec(<2 x double> %a, <2 x double> %b, <2 x double> %c) {
 ; CHECK-LABEL: fmul2_negated_vec:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    mulpd {{.*}}(%rip), %xmm1
+; CHECK-NEXT:    addpd %xmm1, %xmm1
 ; CHECK-NEXT:    mulpd %xmm2, %xmm1
-; CHECK-NEXT:    addpd %xmm1, %xmm0
+; CHECK-NEXT:    subpd %xmm1, %xmm0
 ; CHECK-NEXT:    retq
   %mul = fmul <2 x double> %b, <double 2.0, double 2.0>
   %mul1 = fmul <2 x double> %mul, %c