From 03f9fbbcd7d4d9b97350fbe454b7a96fe570adf4 Mon Sep 17 00:00:00 2001
From: Stephen Lin <stephenwlin@gmail.com>
Date: Wed, 17 Jul 2013 20:06:03 +0000
Subject: Restore r181216, which was partially reverted in r182499.

llvm-svn: 186533
---
 .../Transforms/InstCombine/InstCombineAddSub.cpp   | 43 ----------------------
 .../InstCombine/InstCombineMulDivRem.cpp           | 29 +++++++++++++++
 2 files changed, 29 insertions(+), 43 deletions(-)

(limited to 'llvm/lib')

diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
index 686978ac985..fecbd5c3010 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
@@ -1263,49 +1263,6 @@ 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 eac24c63451..c3621af638b 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -556,6 +556,35 @@ 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
-- 
cgit v1.2.3