wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Somehow I forgot about one / une. 

- Renumber fcmp predicates to match their icmp counterparts.
- Try swapping operands to expose more optimization opportunities.

llvm-svn: 57513
This commit is contained in:
Evan Cheng 2008-10-14 18:13:38 +00:00
parent 23d5426c67
commit ce70752b11
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
llvm/lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -3124,14 +3124,16 @@ static unsigned getFCmpCode(FCmpInst::Predicate CC, bool &isOrdered) {
switch (CC) { switch (CC) {
case FCmpInst::FCMP_ORD: isOrdered = true; return 0; // 000 case FCmpInst::FCMP_ORD: isOrdered = true; return 0; // 000
case FCmpInst::FCMP_UNO: return 0; // 000 case FCmpInst::FCMP_UNO: return 0; // 000
case FCmpInst::FCMP_OEQ: isOrdered = true; return 1; // 001 case FCmpInst::FCMP_OGT: isOrdered = true; return 1; // 001
case FCmpInst::FCMP_UEQ: return 1; // 001 case FCmpInst::FCMP_UGT: return 1; // 001
case FCmpInst::FCMP_OGT: isOrdered = true; return 2; // 010 case FCmpInst::FCMP_OEQ: isOrdered = true; return 2; // 010
case FCmpInst::FCMP_UGT: return 2; // 010 case FCmpInst::FCMP_UEQ: return 2; // 010
case FCmpInst::FCMP_OGE: isOrdered = true; return 3; // 011 case FCmpInst::FCMP_OGE: isOrdered = true; return 3; // 011
case FCmpInst::FCMP_UGE: return 3; // 011 case FCmpInst::FCMP_UGE: return 3; // 011
case FCmpInst::FCMP_OLT: isOrdered = true; return 4; // 100 case FCmpInst::FCMP_OLT: isOrdered = true; return 4; // 100
case FCmpInst::FCMP_ULT: return 4; // 100 case FCmpInst::FCMP_ULT: return 4; // 100
case FCmpInst::FCMP_ONE: isOrdered = true; return 5; // 101
case FCmpInst::FCMP_UNE: return 5; // 101
case FCmpInst::FCMP_OLE: isOrdered = true; return 6; // 110 case FCmpInst::FCMP_OLE: isOrdered = true; return 6; // 110
case FCmpInst::FCMP_ULE: return 6; // 110 case FCmpInst::FCMP_ULE: return 6; // 110
default: default:
@ -3181,22 +3183,22 @@ static Value *getICmpValue(bool sign, unsigned code, Value *LHS, Value *RHS) {
static Value *getFCmpValue(bool isordered, unsigned code, static Value *getFCmpValue(bool isordered, unsigned code,
Value *LHS, Value *RHS) { Value *LHS, Value *RHS) {
switch (code) { switch (code) {
default: assert(0 && "Illegal ICmp code!"); default: assert(0 && "Illegal FCmp code!");
case 0: case 0:
if (isordered) if (isordered)
return new FCmpInst(FCmpInst::FCMP_ORD, LHS, RHS); return new FCmpInst(FCmpInst::FCMP_ORD, LHS, RHS);
else else
return new FCmpInst(FCmpInst::FCMP_UNO, LHS, RHS); return new FCmpInst(FCmpInst::FCMP_UNO, LHS, RHS);
case 1: case 1:
if (isordered)
return new FCmpInst(FCmpInst::FCMP_OEQ, LHS, RHS);
else
return new FCmpInst(FCmpInst::FCMP_UEQ, LHS, RHS);
case 2:
if (isordered) if (isordered)
return new FCmpInst(FCmpInst::FCMP_OGT, LHS, RHS); return new FCmpInst(FCmpInst::FCMP_OGT, LHS, RHS);
else else
return new FCmpInst(FCmpInst::FCMP_UGT, LHS, RHS); return new FCmpInst(FCmpInst::FCMP_UGT, LHS, RHS);
case 2:
if (isordered)
return new FCmpInst(FCmpInst::FCMP_OEQ, LHS, RHS);
else
return new FCmpInst(FCmpInst::FCMP_UEQ, LHS, RHS);
case 3: case 3:
if (isordered) if (isordered)
return new FCmpInst(FCmpInst::FCMP_OGE, LHS, RHS); return new FCmpInst(FCmpInst::FCMP_OGE, LHS, RHS);
@ -3208,6 +3210,11 @@ static Value *getFCmpValue(bool isordered, unsigned code,
else else
return new FCmpInst(FCmpInst::FCMP_ULT, LHS, RHS); return new FCmpInst(FCmpInst::FCMP_ULT, LHS, RHS);
case 5: case 5:
if (isordered)
return new FCmpInst(FCmpInst::FCMP_ONE, LHS, RHS);
else
return new FCmpInst(FCmpInst::FCMP_UNE, LHS, RHS);
case 6:
if (isordered) if (isordered)
return new FCmpInst(FCmpInst::FCMP_OLE, LHS, RHS); return new FCmpInst(FCmpInst::FCMP_OLE, LHS, RHS);
else else
@ -3973,6 +3980,11 @@ Instruction *InstCombiner::visitAnd(BinaryOperator &I) {
FCmpInst::Predicate Op0CC, Op1CC; FCmpInst::Predicate Op0CC, Op1CC;
if (match(Op0, m_FCmp(Op0CC, m_Value(Op0LHS), m_Value(Op0RHS))) && if (match(Op0, m_FCmp(Op0CC, m_Value(Op0LHS), m_Value(Op0RHS))) &&
match(Op1, m_FCmp(Op1CC, m_Value(Op1LHS), m_Value(Op1RHS)))) { match(Op1, m_FCmp(Op1CC, m_Value(Op1LHS), m_Value(Op1RHS)))) {
if (Op0LHS == Op1RHS && Op0RHS == Op1LHS) {
// Swap RHS operands to match LHS.
Op1CC = FCmpInst::getSwappedPredicate(Op1CC);
std::swap(Op1LHS, Op1RHS);
}
if (Op0LHS == Op1LHS && Op0RHS == Op1RHS) { if (Op0LHS == Op1LHS && Op0RHS == Op1RHS) {
// Simplify (fcmp cc0 x, y) & (fcmp cc1 x, y). // Simplify (fcmp cc0 x, y) & (fcmp cc1 x, y).
if (Op0CC == Op1CC) if (Op0CC == Op1CC)

10
llvm/test/Transforms/InstCombine/and-fcmp.ll
View File

@ -1,4 +1,4 @@
; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep fcmp | count 2 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep fcmp | count 3
; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep ret | grep 0 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep ret | grep 0
define zeroext i8 @t1(float %x, float %y) nounwind { define zeroext i8 @t1(float %x, float %y) nounwind {
@ -24,3 +24,11 @@ define zeroext i8 @t3(float %x, float %y) nounwind {
%retval = zext i1 %c to i8 %retval = zext i1 %c to i8
ret i8 %retval ret i8 %retval
} }
define zeroext i8 @t4(float %x, float %y) nounwind {
%a = fcmp one float %y, %x
%b = fcmp ord float %x, %y
%c = and i1 %a, %b
%retval = zext i1 %c to i8
ret i8 %retval
}