RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

[InstCombine] Move the checks for pointer types in getMaskedTypeForICmpPair earlier in the function

Browse Source 
I don't think there's any reason to have them scattered about and on all 4 operands. We already have an early check that both compares must be the same type. And within a given compare the LHS and RHS must have the same type. Beyond that I don't think there's anyway this function returns anything valid for pointer types. So let's just return early and be done with it.

Differential Revision: https://reviews.llvm.org/D36561

llvm-svn: 311383
This commit is contained in:
Craig Topper 2017-08-21 21:00:45 +00:00
parent 41fb068d8d
commit f241c0c2b9
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
View File

@ -314,8 +314,8 @@ static unsigned getMaskedTypeForICmpPair(Value *&A, Value *&B, Value *&C,
ICmpInst::Predicate &PredR) { ICmpInst::Predicate &PredR) {
if (LHS->getOperand(0)->getType() != RHS->getOperand(0)->getType()) if (LHS->getOperand(0)->getType() != RHS->getOperand(0)->getType())
return 0; return 0;
// vectors are not (yet?) supported // vectors are not (yet?) supported. Don't support pointers either.
if (LHS->getOperand(0)->getType()->isVectorTy()) if (!LHS->getOperand(0)->getType()->isIntegerTy())
return 0; return 0;
// Here comes the tricky part: // Here comes the tricky part:
@ -332,20 +332,14 @@ static unsigned getMaskedTypeForICmpPair(Value *&A, Value *&B, Value *&C,
L21 = L22 = L1 = nullptr; L21 = L22 = L1 = nullptr;
} else { } else {
// Look for ANDs in the LHS icmp. // Look for ANDs in the LHS icmp.
if (!L1->getType()->isIntegerTy()) { if (!match(L1, m_And(m_Value(L11), m_Value(L12)))) {
// You can icmp pointers, for example. They really aren't masks.
L11 = L12 = nullptr;
} else if (!match(L1, m_And(m_Value(L11), m_Value(L12)))) {
// Any icmp can be viewed as being trivially masked; if it allows us to // Any icmp can be viewed as being trivially masked; if it allows us to
// remove one, it's worth it. // remove one, it's worth it.
L11 = L1; L11 = L1;
L12 = Constant::getAllOnesValue(L1->getType()); L12 = Constant::getAllOnesValue(L1->getType());
} }
if (!L2->getType()->isIntegerTy()) { if (!match(L2, m_And(m_Value(L21), m_Value(L22)))) {
// You can icmp pointers, for example. They really aren't masks.
L21 = L22 = nullptr;
} else if (!match(L2, m_And(m_Value(L21), m_Value(L22)))) {
L21 = L2; L21 = L2;
L22 = Constant::getAllOnesValue(L2->getType()); L22 = Constant::getAllOnesValue(L2->getType());
} }
@ -372,7 +366,7 @@ static unsigned getMaskedTypeForICmpPair(Value *&A, Value *&B, Value *&C,
E = R2; E = R2;
R1 = nullptr; R1 = nullptr;
Ok = true; Ok = true;
} else if (R1->getType()->isIntegerTy()) { } else {
if (!match(R1, m_And(m_Value(R11), m_Value(R12)))) { if (!match(R1, m_And(m_Value(R11), m_Value(R12)))) {
// As before, model no mask as a trivial mask if it'll let us do an // As before, model no mask as a trivial mask if it'll let us do an
// optimization. // optimization.
@ -398,7 +392,7 @@ static unsigned getMaskedTypeForICmpPair(Value *&A, Value *&B, Value *&C,
return 0; return 0;
// Look for ANDs on the right side of the RHS icmp. // Look for ANDs on the right side of the RHS icmp.
if (!Ok && R2->getType()->isIntegerTy()) { if (!Ok) {
if (!match(R2, m_And(m_Value(R11), m_Value(R12)))) { if (!match(R2, m_And(m_Value(R11), m_Value(R12)))) {
R11 = R2; R11 = R2;
R12 = Constant::getAllOnesValue(R2->getType()); R12 = Constant::getAllOnesValue(R2->getType());