RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-03-03 01:48:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore r181216, which was partially reverted in r182499.

Browse Source 
llvm-svn: 186533
This commit is contained in:
Stephen Lin 2013-07-17 20:06:03 +00:00
parent 427930499c
commit a7fd9682cd
3 changed files with 73 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Transforms/InstCombine/InstCombineAddSub.cpp
View File

@ -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);

29
lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
View File

@ -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

53
test/Transforms/InstCombine/add4.ll
View File

@ -1,10 +1,27 @@
; RUN: opt < %s -instcombine -S | FileCheck %s
;; Target triple for gep raising case below.
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
target triple = "i686-apple-darwin8"
define float @test1(float %A, float %B, i1 %C) {
EntryBlock:
;; A*(1 - uitofp i1 C) -> select C, 0, A
%cf = uitofp i1 %C to float
%mc = fsub float 1.000000e+00, %cf
%p1 = fmul fast float %A, %mc
ret float %p1
; CHECK-LABEL: @test1(
; CHECK: select i1 %C, float -0.000000e+00, float %A
}
define float @test2(float %A, float %B, i1 %C) {
EntryBlock:
;; B*(uitofp i1 C) -> select C, B, 0
%cf = uitofp i1 %C to float
%p2 = fmul fast float %B, %cf
ret float %p2
; CHECK-LABEL: @test2(
; CHECK: select i1 %C, float %B, float -0.000000e+00
}
define float @test3(float %A, float %B, i1 %C) {
EntryBlock:
;; select C, 0, B + select C, A, 0 -> select C, A, B
%cf = uitofp i1 %C to float
@ -12,11 +29,11 @@ EntryBlock:
%s2 = select i1 %C, float %A, float 0.000000e+00
%sum = fadd fast float %s1, %s2
ret float %sum
; CHECK-LABEL: @test1(
; CHECK-LABEL: @test3(
; CHECK: select i1 %C, float %A, float %B
}
define float @test2(float %A, float %B, i1 %C) {
define float @test4(float %A, float %B, i1 %C) {
EntryBlock:
;; B*(uitofp i1 C) + A*(1 - uitofp i1 C) -> select C, A, B
%cf = uitofp i1 %C to float
@ -25,11 +42,11 @@ EntryBlock:
%p2 = fmul fast float %B, %cf
%s1 = fadd fast float %p2, %p1
ret float %s1
; CHECK-LABEL: @test2(
; CHECK-LABEL: @test4(
; CHECK: select i1 %C, float %B, float %A
}
define float @test3(float %A, float %B, i1 %C) {
define float @test5(float %A, float %B, i1 %C) {
EntryBlock:
;; A*(1 - uitofp i1 C) + B*(uitofp i1 C) -> select C, A, B
%cf = uitofp i1 %C to float
@ -38,7 +55,25 @@ EntryBlock:
%p2 = fmul fast float %B, %cf
%s1 = fadd fast float %p1, %p2
ret float %s1
; CHECK-LABEL: @test3(
; CHECK-LABEL: @test5(
; CHECK: select i1 %C, float %B, float %A
}
; PR15952
define float @test6(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-LABEL: @test6(
; CHECK: uitofp
}
define float @test7(float %A, float %B, i32 %C) {
%cf = uitofp i32 %C to float
%p2 = fmul fast float %B, %cf
ret float %p2
; CHECK-LABEL: @test7(
; CHECK: uitofp
}