-
Notifications
You must be signed in to change notification settings - Fork 13.6k
[SLP] Make getSameOpcode support different instructions if they have same semantics. #112181
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 3 commits
ad591ac
f393590
83ed351
9672f6d
b1c2047
1097781
999f45a
ee74f11
ddf7ab4
7c40025
4752ab6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -832,8 +832,103 @@ struct InstructionsState { | |||||||||||||
: OpValue(OpValue), MainOp(MainOp), AltOp(AltOp) {} | ||||||||||||||
}; | ||||||||||||||
|
||||||||||||||
struct InterchangeableInstruction { | ||||||||||||||
unsigned Opcode; | ||||||||||||||
SmallVector<Value *> Ops; | ||||||||||||||
template <class... ArgTypes> | ||||||||||||||
InterchangeableInstruction(unsigned Opcode, ArgTypes &&...Args) | ||||||||||||||
: Opcode(Opcode), Ops{std::forward<decltype(Args)>(Args)...} {} | ||||||||||||||
}; | ||||||||||||||
|
||||||||||||||
bool operator<(const InterchangeableInstruction &LHS, | ||||||||||||||
const InterchangeableInstruction &RHS) { | ||||||||||||||
return LHS.Opcode < RHS.Opcode; | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
} // end anonymous namespace | ||||||||||||||
|
||||||||||||||
/// \returns a sorted list of interchangeable instructions by instruction opcode | ||||||||||||||
/// that \p I can be converted to. | ||||||||||||||
/// e.g., | ||||||||||||||
/// x << y -> x * (2^y) | ||||||||||||||
/// x << 1 -> x * 2 | ||||||||||||||
/// x << 0 -> x * 1 -> x - 0 -> x + 0 -> x & 11...1 -> x | 0 | ||||||||||||||
/// x * 0 -> x & 0 | ||||||||||||||
/// x * -1 -> 0 - x | ||||||||||||||
/// TODO: support more patterns | ||||||||||||||
static SmallVector<InterchangeableInstruction> | ||||||||||||||
getInterchangeableInstruction(Instruction *I) { | ||||||||||||||
// PII = Possible Interchangeable Instruction | ||||||||||||||
SmallVector<InterchangeableInstruction> PII; | ||||||||||||||
unsigned Opcode = I->getOpcode(); | ||||||||||||||
PII.emplace_back(Opcode, I->operands()); | ||||||||||||||
if (!is_contained({Instruction::Shl, Instruction::Mul, Instruction::Sub, | ||||||||||||||
Instruction::Add}, | ||||||||||||||
Opcode)) | ||||||||||||||
return PII; | ||||||||||||||
Constant *C; | ||||||||||||||
if (match(I, m_BinOp(m_Value(), m_Constant(C)))) { | ||||||||||||||
ConstantInt *V = nullptr; | ||||||||||||||
if (auto *CI = dyn_cast<ConstantInt>(C)) { | ||||||||||||||
V = CI; | ||||||||||||||
} else if (auto *CDV = dyn_cast<ConstantDataVector>(C)) { | ||||||||||||||
if (auto *CI = dyn_cast_if_present<ConstantInt>(CDV->getSplatValue())) | ||||||||||||||
V = CI; | ||||||||||||||
} | ||||||||||||||
if (!V) | ||||||||||||||
return PII; | ||||||||||||||
Value *Op0 = I->getOperand(0); | ||||||||||||||
Type *Op1Ty = I->getOperand(1)->getType(); | ||||||||||||||
const APInt &Op1Int = V->getValue(); | ||||||||||||||
Constant *Zero = | ||||||||||||||
ConstantInt::get(Op1Ty, APInt::getZero(Op1Int.getBitWidth())); | ||||||||||||||
Constant *UnsignedMax = | ||||||||||||||
ConstantInt::get(Op1Ty, APInt::getMaxValue(Op1Int.getBitWidth())); | ||||||||||||||
switch (Opcode) { | ||||||||||||||
case Instruction::Shl: { | ||||||||||||||
PII.emplace_back(Instruction::Mul, Op0, | ||||||||||||||
ConstantInt::get(Op1Ty, 1 << Op1Int.getZExtValue())); | ||||||||||||||
if (Op1Int.isZero()) { | ||||||||||||||
PII.emplace_back(Instruction::Sub, Op0, Zero); | ||||||||||||||
PII.emplace_back(Instruction::Add, Op0, Zero); | ||||||||||||||
PII.emplace_back(Instruction::And, Op0, UnsignedMax); | ||||||||||||||
PII.emplace_back(Instruction::Or, Op0, Zero); | ||||||||||||||
} | ||||||||||||||
break; | ||||||||||||||
} | ||||||||||||||
case Instruction::Mul: { | ||||||||||||||
if (Op1Int.isOne()) { | ||||||||||||||
PII.emplace_back(Instruction::Sub, Op0, Zero); | ||||||||||||||
PII.emplace_back(Instruction::Add, Op0, Zero); | ||||||||||||||
PII.emplace_back(Instruction::And, Op0, UnsignedMax); | ||||||||||||||
PII.emplace_back(Instruction::Or, Op0, Zero); | ||||||||||||||
} else if (Op1Int.isZero()) { | ||||||||||||||
PII.emplace_back(Instruction::And, Op0, Zero); | ||||||||||||||
} else if (Op1Int.isAllOnes()) { | ||||||||||||||
PII.emplace_back(Instruction::Sub, Zero, Op0); | ||||||||||||||
} | ||||||||||||||
break; | ||||||||||||||
} | ||||||||||||||
case Instruction::Sub: | ||||||||||||||
if (Op1Int.isZero()) { | ||||||||||||||
PII.emplace_back(Instruction::Add, Op0, Zero); | ||||||||||||||
PII.emplace_back(Instruction::And, Op0, UnsignedMax); | ||||||||||||||
PII.emplace_back(Instruction::Or, Op0, Zero); | ||||||||||||||
} | ||||||||||||||
break; | ||||||||||||||
case Instruction::Add: | ||||||||||||||
if (Op1Int.isZero()) { | ||||||||||||||
PII.emplace_back(Instruction::And, Op0, UnsignedMax); | ||||||||||||||
PII.emplace_back(Instruction::Or, Op0, Zero); | ||||||||||||||
} | ||||||||||||||
break; | ||||||||||||||
} | ||||||||||||||
} | ||||||||||||||
// std::set_intersection requires a sorted range. | ||||||||||||||
sort(PII); | ||||||||||||||
return PII; | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
/// \returns true if \p Opcode is allowed as part of the main/alternate | ||||||||||||||
/// instruction for SLP vectorization. | ||||||||||||||
/// | ||||||||||||||
|
@@ -938,18 +1033,52 @@ static InstructionsState getSameOpcode(ArrayRef<Value *> VL, | |||||||||||||
if (!isTriviallyVectorizable(BaseID) && BaseMappings.empty()) | ||||||||||||||
return InstructionsState(VL[BaseIndex], nullptr, nullptr); | ||||||||||||||
} | ||||||||||||||
// Currently, this is only used for binary ops. | ||||||||||||||
// TODO: support all instructions | ||||||||||||||
SmallVector<InterchangeableInstruction> InterchangeableOpcode = | ||||||||||||||
getInterchangeableInstruction(cast<Instruction>(VL[BaseIndex])); | ||||||||||||||
SmallVector<InterchangeableInstruction> AlternateInterchangeableOpcode; | ||||||||||||||
auto UpdateInterchangeableOpcode = | ||||||||||||||
[](SmallVector<InterchangeableInstruction> &LHS, | ||||||||||||||
ArrayRef<InterchangeableInstruction> RHS) { | ||||||||||||||
SmallVector<InterchangeableInstruction> NewInterchangeableOpcode; | ||||||||||||||
std::set_intersection(LHS.begin(), LHS.end(), RHS.begin(), RHS.end(), | ||||||||||||||
std::back_inserter(NewInterchangeableOpcode)); | ||||||||||||||
if (NewInterchangeableOpcode.empty()) | ||||||||||||||
return false; | ||||||||||||||
LHS.swap(NewInterchangeableOpcode); | ||||||||||||||
return true; | ||||||||||||||
Comment on lines
+1084
to
+1087
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We do not want |
||||||||||||||
}; | ||||||||||||||
for (int Cnt = 0, E = VL.size(); Cnt < E; Cnt++) { | ||||||||||||||
auto *I = cast<Instruction>(VL[Cnt]); | ||||||||||||||
unsigned InstOpcode = I->getOpcode(); | ||||||||||||||
if (IsBinOp && isa<BinaryOperator>(I)) { | ||||||||||||||
if (InstOpcode == Opcode || InstOpcode == AltOpcode) | ||||||||||||||
SmallVector<InterchangeableInstruction> ThisInterchangeableOpcode( | ||||||||||||||
getInterchangeableInstruction(I)); | ||||||||||||||
if (UpdateInterchangeableOpcode(InterchangeableOpcode, | ||||||||||||||
ThisInterchangeableOpcode)) | ||||||||||||||
continue; | ||||||||||||||
if (Opcode == AltOpcode && isValidForAlternation(InstOpcode) && | ||||||||||||||
isValidForAlternation(Opcode)) { | ||||||||||||||
AltOpcode = InstOpcode; | ||||||||||||||
AltIndex = Cnt; | ||||||||||||||
if (AlternateInterchangeableOpcode.empty()) { | ||||||||||||||
InterchangeableOpcode.erase( | ||||||||||||||
remove_if(InterchangeableOpcode, | ||||||||||||||
[](const InterchangeableInstruction &I) { | ||||||||||||||
return !isValidForAlternation(I.Opcode); | ||||||||||||||
}), | ||||||||||||||
InterchangeableOpcode.end()); | ||||||||||||||
ThisInterchangeableOpcode.erase( | ||||||||||||||
remove_if(ThisInterchangeableOpcode, | ||||||||||||||
[](const InterchangeableInstruction &I) { | ||||||||||||||
return !isValidForAlternation(I.Opcode); | ||||||||||||||
}), | ||||||||||||||
ThisInterchangeableOpcode.end()); | ||||||||||||||
if (InterchangeableOpcode.empty() || ThisInterchangeableOpcode.empty()) | ||||||||||||||
return InstructionsState(VL[BaseIndex], nullptr, nullptr); | ||||||||||||||
AlternateInterchangeableOpcode.swap(ThisInterchangeableOpcode); | ||||||||||||||
continue; | ||||||||||||||
} | ||||||||||||||
if (UpdateInterchangeableOpcode(AlternateInterchangeableOpcode, | ||||||||||||||
ThisInterchangeableOpcode)) | ||||||||||||||
continue; | ||||||||||||||
} else if (IsCastOp && isa<CastInst>(I)) { | ||||||||||||||
Value *Op0 = IBase->getOperand(0); | ||||||||||||||
Type *Ty0 = Op0->getType(); | ||||||||||||||
|
@@ -1043,6 +1172,21 @@ static InstructionsState getSameOpcode(ArrayRef<Value *> VL, | |||||||||||||
return InstructionsState(VL[BaseIndex], nullptr, nullptr); | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
if (IsBinOp) { | ||||||||||||||
auto FindOp = [&](ArrayRef<InterchangeableInstruction> CandidateOp) { | ||||||||||||||
for (Value *V : VL) | ||||||||||||||
for (const InterchangeableInstruction &I : CandidateOp) | ||||||||||||||
if (cast<Instruction>(V)->getOpcode() == I.Opcode) | ||||||||||||||
return cast<Instruction>(V); | ||||||||||||||
llvm_unreachable( | ||||||||||||||
"Cannot find the candidate instruction for InstructionsState."); | ||||||||||||||
}; | ||||||||||||||
Instruction *MainOp = FindOp(InterchangeableOpcode); | ||||||||||||||
Instruction *AltOp = AlternateInterchangeableOpcode.empty() | ||||||||||||||
? MainOp | ||||||||||||||
: FindOp(AlternateInterchangeableOpcode); | ||||||||||||||
return InstructionsState(VL[BaseIndex], MainOp, AltOp); | ||||||||||||||
} | ||||||||||||||
return InstructionsState(VL[BaseIndex], cast<Instruction>(VL[BaseIndex]), | ||||||||||||||
cast<Instruction>(VL[AltIndex])); | ||||||||||||||
} | ||||||||||||||
|
@@ -2335,24 +2479,41 @@ class BoUpSLP { | |||||||||||||
: cast<Instruction>(VL[0])->getNumOperands(); | ||||||||||||||
OpsVec.resize(NumOperands); | ||||||||||||||
unsigned NumLanes = VL.size(); | ||||||||||||||
for (unsigned OpIdx = 0; OpIdx != NumOperands; ++OpIdx) { | ||||||||||||||
InstructionsState S = getSameOpcode(VL, TLI); | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Suggest to pass it to VLOperands constructor instead and use it instead of regenerating. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we only use
We need to implement the logics in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can try. But keep in mind, these elements should not be reordered at all. Otherwise, it may affect compile time. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I will do this in another PR. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. see ee74f11 |
||||||||||||||
for (unsigned OpIdx : seq<unsigned>(NumOperands)) | ||||||||||||||
OpsVec[OpIdx].resize(NumLanes); | ||||||||||||||
for (unsigned Lane = 0; Lane != NumLanes; ++Lane) { | ||||||||||||||
assert(isa<Instruction>(VL[Lane]) && "Expected instruction"); | ||||||||||||||
// Our tree has just 3 nodes: the root and two operands. | ||||||||||||||
// It is therefore trivial to get the APO. We only need to check the | ||||||||||||||
// opcode of VL[Lane] and whether the operand at OpIdx is the LHS or | ||||||||||||||
// RHS operand. The LHS operand of both add and sub is never attached | ||||||||||||||
// to an inversese operation in the linearized form, therefore its APO | ||||||||||||||
// is false. The RHS is true only if VL[Lane] is an inverse operation. | ||||||||||||||
|
||||||||||||||
// Since operand reordering is performed on groups of commutative | ||||||||||||||
// operations or alternating sequences (e.g., +, -), we can safely | ||||||||||||||
// tell the inverse operations by checking commutativity. | ||||||||||||||
bool IsInverseOperation = !isCommutative(cast<Instruction>(VL[Lane])); | ||||||||||||||
for (auto [I, V] : enumerate(VL)) { | ||||||||||||||
assert(isa<Instruction>(V) && "Expected instruction"); | ||||||||||||||
SmallVector<InterchangeableInstruction> IIList = | ||||||||||||||
getInterchangeableInstruction(cast<Instruction>(V)); | ||||||||||||||
Value *SelectedOp; | ||||||||||||||
auto Iter = find_if(IIList, [&](const InterchangeableInstruction &II) { | ||||||||||||||
return II.Opcode == S.MainOp->getOpcode(); | ||||||||||||||
}); | ||||||||||||||
if (Iter == IIList.end()) { | ||||||||||||||
Iter = find_if(IIList, [&](const InterchangeableInstruction &II) { | ||||||||||||||
return II.Opcode == S.AltOp->getOpcode(); | ||||||||||||||
}); | ||||||||||||||
SelectedOp = S.AltOp; | ||||||||||||||
} else { | ||||||||||||||
SelectedOp = S.MainOp; | ||||||||||||||
} | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Better to allow to specify particual opcode as operand of getInterchangeableInstruction to allow early filtering + simplify the code There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any examples? Cannot image how to modify |
||||||||||||||
assert(Iter != IIList.end() && | ||||||||||||||
"Cannot find an interchangeable instruction."); | ||||||||||||||
// Our tree has just 3 nodes: the root and two operands. | ||||||||||||||
// It is therefore trivial to get the APO. We only need to check the | ||||||||||||||
// opcode of V and whether the operand at OpIdx is the LHS or RHS | ||||||||||||||
// operand. The LHS operand of both add and sub is never attached to an | ||||||||||||||
// inversese operation in the linearized form, therefore its APO is | ||||||||||||||
// false. The RHS is true only if V is an inverse operation. | ||||||||||||||
|
||||||||||||||
// Since operand reordering is performed on groups of commutative | ||||||||||||||
// operations or alternating sequences (e.g., +, -), we can safely | ||||||||||||||
// tell the inverse operations by checking commutativity. | ||||||||||||||
bool IsInverseOperation = !isCommutative(cast<Instruction>(SelectedOp)); | ||||||||||||||
for (unsigned OpIdx : seq<unsigned>(NumOperands)) { | ||||||||||||||
bool APO = (OpIdx == 0) ? false : IsInverseOperation; | ||||||||||||||
OpsVec[OpIdx][Lane] = {cast<Instruction>(VL[Lane])->getOperand(OpIdx), | ||||||||||||||
APO, false}; | ||||||||||||||
OpsVec[OpIdx][I] = {Iter->Ops[OpIdx], APO, false}; | ||||||||||||||
} | ||||||||||||||
} | ||||||||||||||
} | ||||||||||||||
|
@@ -3252,15 +3413,25 @@ class BoUpSLP { | |||||||||||||
auto *I0 = cast<Instruction>(Scalars[0]); | ||||||||||||||
Operands.resize(I0->getNumOperands()); | ||||||||||||||
unsigned NumLanes = Scalars.size(); | ||||||||||||||
for (unsigned OpIdx = 0, NumOperands = I0->getNumOperands(); | ||||||||||||||
OpIdx != NumOperands; ++OpIdx) { | ||||||||||||||
unsigned NumOperands = I0->getNumOperands(); | ||||||||||||||
for (unsigned OpIdx : seq<unsigned>(NumOperands)) | ||||||||||||||
Operands[OpIdx].resize(NumLanes); | ||||||||||||||
for (unsigned Lane = 0; Lane != NumLanes; ++Lane) { | ||||||||||||||
auto *I = cast<Instruction>(Scalars[Lane]); | ||||||||||||||
assert(I->getNumOperands() == NumOperands && | ||||||||||||||
"Expected same number of operands"); | ||||||||||||||
Operands[OpIdx][Lane] = I->getOperand(OpIdx); | ||||||||||||||
} | ||||||||||||||
for (auto [I, V] : enumerate(Scalars)) { | ||||||||||||||
SmallVector<InterchangeableInstruction> IIList = | ||||||||||||||
getInterchangeableInstruction(cast<Instruction>(V)); | ||||||||||||||
auto Iter = find_if(IIList, [&](const InterchangeableInstruction &II) { | ||||||||||||||
return II.Opcode == MainOp->getOpcode(); | ||||||||||||||
}); | ||||||||||||||
if (Iter == IIList.end()) | ||||||||||||||
Iter = find_if(IIList, [&](const InterchangeableInstruction &II) { | ||||||||||||||
return II.Opcode == AltOp->getOpcode(); | ||||||||||||||
}); | ||||||||||||||
assert(Iter != IIList.end() && | ||||||||||||||
"Cannot find an interchangeable instruction."); | ||||||||||||||
assert(Iter->Ops.size() == NumOperands && | ||||||||||||||
"Expected same number of operands"); | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same, try to add extra operand to getInterchangeableInstruction to allow filtering inside |
||||||||||||||
for (auto [J, Op] : enumerate(Iter->Ops)) | ||||||||||||||
Operands[J][I] = Op; | ||||||||||||||
} | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
|
@@ -14935,7 +15106,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) { | |||||||||||||
Value *V = Builder.CreateBinOp( | ||||||||||||||
static_cast<Instruction::BinaryOps>(E->getOpcode()), LHS, | ||||||||||||||
RHS); | ||||||||||||||
propagateIRFlags(V, E->Scalars, VL0, It == MinBWs.end()); | ||||||||||||||
propagateIRFlags(V, E->Scalars, nullptr, It == MinBWs.end()); | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should it always be nullptr or are there cases where we can keep it? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually I don't know why we pass VL0 here. Only alternate operation should pass non nullptr value. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It should pass VL0 here, but need to check if all opcodes are originally mathed and if not, then pass fourth argument There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Before the PR, there is no difference between VL0 and nullptr. The opcode must be the same for all VL. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this part still requires extra work. If the opcode of the instruction does not match the opcode of intersection, its flags are ignored. This is not correct and must be fixed There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is used to fix
VL0 is mul here. If we pass VL0, then eventually There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Say, you have something like There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes. But actually There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, it what is expected. But I assume that instead currently it will emit |
||||||||||||||
if (auto *I = dyn_cast<Instruction>(V)) { | ||||||||||||||
V = propagateMetadata(I, E->Scalars); | ||||||||||||||
// Drop nuw flags for abs(sub(commutative), true). | ||||||||||||||
|
Uh oh!
There was an error while loading. Please reload this page.