This is an update to a previous commit (r181216).

The earlier change list introduced the following inst combines:
B * (uitofp i1 C) —> select C, B, 0
A * (1 - uitofp i1 C) —> select C, 0, A
select C, 0, B + select C, A, 0 —> select C, A, B

Together these 3 changes would simplify :
A * (1 - uitofp i1 C) + B * uitofp i1 C 
down to :
select C, B, A

In practice we found that the first two substitutions can have a
negative effect on performance, because they reduce opportunities to
use FMA contractions; between the two options FMAs are often the
better choice.  This change list amends the previous one to enable
just these inst combines:

select C, B, 0 + select C, 0, A —> select C, B, A
A * (1 - uitofp i1 C) + B * uitofp i1 C —> select C, B, A

llvm-svn: 182499

2 files changed, 43 insertions, 29 deletions

diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
index 166f8dfdb4a..a2c545f0119 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
@@ -1262,6 +1262,49 @@ Instruction *InstCombiner::visitFAdd(BinaryOperator &I) {
     }
   }
 
+  // A * (1 - uitofp i1 C) + B * (uitofp i1 C) -> select C, B, A
+  {
+    if (I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
+      Value *M1L, *M1R, *M2L, *M2R;
+      if (match(LHS, m_FMul(m_Value(M1L), m_Value(M1R))) &&
+          match(RHS, m_FMul(m_Value(M2L), m_Value(M2R)))) {
+
+        Value *A, *B, *C1, *C2;
+        if (!match(M1R, m_FSub(m_FPOne(), m_UIToFp(m_Value(C1)))))
+          std::swap(M1L, M1R);
+        if (!match(M2R, m_UIToFp(m_Value(C2)))) 
+          std::swap(M2L, M2R);
+
+        if (match(M1R, m_FSub(m_FPOne(), m_UIToFp(m_Value(C1)))) &&
+            match(M2R, m_UIToFp(m_Value(C2))) &&
+            C2->getType()->isIntegerTy(1) &&
+            C1 == C2) {
+          A = M1L;
+          B = M2L;
+          return SelectInst::Create(C1, B, A);
+        }
+        
+        std::swap(M1L, M2L);
+        std::swap(M1R, M2R);
+        
+        if (!match(M1R, m_FSub(m_FPOne(), m_UIToFp(m_Value(C1)))))
+          std::swap(M1L, M1R);
+        if (!match(M2R, m_UIToFp(m_Value(C2)))) 
+          std::swap(M2L, M2R);
+
+        if (match(M1R, m_FSub(m_FPOne(), m_UIToFp(m_Value(C1)))) &&
+            match(M2R, m_UIToFp(m_Value(C2))) &&
+            C2->getType()->isIntegerTy(1) &&
+            C1 == C2) {
+          A = M1L;
+          B = M2L;
+          return SelectInst::Create(C1, B, A);
+        }
+      }
+    }
+  }
+
+  
   if (I.hasUnsafeAlgebra()) {
     if (Value *V = FAddCombine(Builder).simplify(&I))
       return ReplaceInstUsesWith(I, V);
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
index 51ca29bc071..2628f4b86ba 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -524,35 +524,6 @@ Instruction *InstCombiner::visitFMul(BinaryOperator &I) {
       }
     }
 
-    // B * (uitofp i1 C) -> select C, B, 0
-    if (I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
-      Value *LHS = Op0, *RHS = Op1;
-      Value *B, *C;
-      if (!match(RHS, m_UIToFp(m_Value(C))))
-        std::swap(LHS, RHS);
-
-      if (match(RHS, m_UIToFp(m_Value(C))) && C->getType()->isIntegerTy(1)) {
-        B = LHS;
-        Value *Zero = ConstantFP::getNegativeZero(B->getType());
-        return SelectInst::Create(C, B, Zero);
-      }
-    }
-
-    // A * (1 - uitofp i1 C) -> select C, 0, A
-    if (I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
-      Value *LHS = Op0, *RHS = Op1;
-      Value *A, *C;
-      if (!match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C)))))
-        std::swap(LHS, RHS);
-
-      if (match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C)))) &&
-          C->getType()->isIntegerTy(1)) {
-        A = LHS;
-        Value *Zero = ConstantFP::getNegativeZero(A->getType());
-        return SelectInst::Create(C, Zero, A);
-      }
-    }
-
     if (!isa<Constant>(Op1))
       std::swap(Opnd0, Opnd1);
     else