aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Transforms
diff options
context:
space:
mode:
authorStephen Lin <stephenwlin@gmail.com>2013-07-17 20:06:03 +0000
committerStephen Lin <stephenwlin@gmail.com>2013-07-17 20:06:03 +0000
commit54bf58a0325993a423dbad337ff709080157faf2 (patch)
tree1e1e2a6ea43c24c2ad98994a2d230fc05d16ee8c /lib/Transforms
parentc889c8fd0f7a94a9737e91e19aa4f522b9ddfd80 (diff)
downloadexternal_llvm-54bf58a0325993a423dbad337ff709080157faf2.zip
external_llvm-54bf58a0325993a423dbad337ff709080157faf2.tar.gz
external_llvm-54bf58a0325993a423dbad337ff709080157faf2.tar.bz2
Restore r181216, which was partially reverted in r182499.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186533 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
-rw-r--r--lib/Transforms/InstCombine/InstCombineAddSub.cpp43
-rw-r--r--lib/Transforms/InstCombine/InstCombineMulDivRem.cpp29
2 files changed, 29 insertions, 43 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineAddSub.cpp b/lib/Transforms/InstCombine/InstCombineAddSub.cpp
index 686978a..fecbd5c 100644
--- a/lib/Transforms/InstCombine/InstCombineAddSub.cpp
+++ b/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/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
index eac24c6..c3621af 100644
--- a/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/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