Merging r181586:

------------------------------------------------------------------------
r181586 | d0k | 2013-05-10 02:16:52 -0700 (Fri, 10 May 2013) | 3 lines

InstCombine: Verify the type before transforming uitofp into select.

PR15952.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_33@181813 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2013-05-14 18:30:01 +00:00
parent 30b015f044
commit 06362e2450
2 changed files with 39 additions and 20 deletions

View File

@ -525,31 +525,32 @@ 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 (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)))) {
B=LHS;
Value *Zero = ConstantFP::getNegativeZero(B->getType());
return SelectInst::Create(C, B, Zero);
}
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 (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))))) {
A=LHS;
Value *Zero = ConstantFP::getNegativeZero(A->getType());
return SelectInst::Create(C, Zero, A);
}
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))

View File

@ -38,3 +38,21 @@ EntryBlock:
; CHECK: select i1 %C, float %B, float %A
}
; PR15952
define float @test4(float %A, float %B, i32 %C) {
%cf = uitofp i32 %C to float
%mc = fsub float 1.000000e+00, %cf
%p1 = fmul fast float %A, %mc
ret float %p1
; CHECK: @test4
; CHECK: uitofp
}
define float @test5(float %A, float %B, i32 %C) {
%cf = uitofp i32 %C to float
%p2 = fmul fast float %B, %cf
ret float %p2
; CHECK: @test5
; CHECK: uitofp
}