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

[VPlan] Use VPUser for VPWidenSelectRecipe operands (NFC). 

VPWidenSelectRecipe already contains a VPUser, but it is not used. This
patch updates the code related to VPWidenSelectRecipe to use VPUser for
its operands.

Reviewers: Ayal, gilr, rengolin

Reviewed By: gilr

Differential Revision: https://reviews.llvm.org/D80219
This commit is contained in:
Florian Hahn 2020-05-24 13:36:42 +01:00
parent 725b3463c5
commit 15224408f0
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
View File

@ -415,7 +415,8 @@ public:
VPTransformState &State); VPTransformState &State);
/// Widen a single select instruction within the innermost loop. /// Widen a single select instruction within the innermost loop.
void widenSelectInstruction(SelectInst &I, bool InvariantCond); void widenSelectInstruction(SelectInst &I, VPUser &Operands,
bool InvariantCond, VPTransformState &State);
/// Fix the vectorized code, taking care of header phi's, live-outs, and more. /// Fix the vectorized code, taking care of header phi's, live-outs, and more.
void fixVectorizedLoop(); void fixVectorizedLoop();
@ -4412,7 +4413,9 @@ void InnerLoopVectorizer::widenCallInstruction(CallInst &I, VPUser &ArgOperands,
} }
void InnerLoopVectorizer::widenSelectInstruction(SelectInst &I, void InnerLoopVectorizer::widenSelectInstruction(SelectInst &I,
bool InvariantCond) { VPUser &Operands,
bool InvariantCond,
VPTransformState &State) {
setDebugLocFromInst(Builder, &I); setDebugLocFromInst(Builder, &I);
// The condition can be loop invariant but still defined inside the // The condition can be loop invariant but still defined inside the
@ -4420,12 +4423,12 @@ void InnerLoopVectorizer::widenSelectInstruction(SelectInst &I,
// We have to take the 'vectorized' value and pick the first lane. // We have to take the 'vectorized' value and pick the first lane.
// Instcombine will make this a no-op. // Instcombine will make this a no-op.
auto *ScalarCond = getOrCreateScalarValue(I.getOperand(0), {0, 0}); auto *ScalarCond = State.get(Operands.getOperand(0), {0, 0});
for (unsigned Part = 0; Part < UF; ++Part) { for (unsigned Part = 0; Part < UF; ++Part) {
Value *Cond = getOrCreateVectorValue(I.getOperand(0), Part); Value *Cond = State.get(Operands.getOperand(0), Part);
Value *Op0 = getOrCreateVectorValue(I.getOperand(1), Part); Value *Op0 = State.get(Operands.getOperand(1), Part);
Value *Op1 = getOrCreateVectorValue(I.getOperand(2), Part); Value *Op1 = State.get(Operands.getOperand(2), Part);
Value *Sel = Value *Sel =
Builder.CreateSelect(InvariantCond ? ScalarCond : Cond, Op0, Op1); Builder.CreateSelect(InvariantCond ? ScalarCond : Cond, Op0, Op1);
VectorLoopValueMap.setVectorValue(&I, Part, Sel); VectorLoopValueMap.setVectorValue(&I, Part, Sel);
@ -7134,7 +7137,8 @@ VPRecipeBase *VPRecipeBuilder::tryToCreateWidenRecipe(Instruction *Instr,
if (auto *SI = dyn_cast<SelectInst>(Instr)) { if (auto *SI = dyn_cast<SelectInst>(Instr)) {
bool InvariantCond = bool InvariantCond =
PSE.getSE()->isLoopInvariant(PSE.getSCEV(SI->getOperand(0)), OrigLoop); PSE.getSE()->isLoopInvariant(PSE.getSCEV(SI->getOperand(0)), OrigLoop);
return new VPWidenSelectRecipe(*SI, InvariantCond); return new VPWidenSelectRecipe(*SI, Plan->mapToVPValues(SI->operands()),
InvariantCond);
} }
return tryToWiden(Instr, *Plan); return tryToWiden(Instr, *Plan);
@ -7429,7 +7433,7 @@ void VPWidenCallRecipe::execute(VPTransformState &State) {
} }
void VPWidenSelectRecipe::execute(VPTransformState &State) { void VPWidenSelectRecipe::execute(VPTransformState &State) {
State.ILV->widenSelectInstruction(Ingredient, InvariantCond); State.ILV->widenSelectInstruction(Ingredient, User, InvariantCond, State);
} }
void VPWidenRecipe::execute(VPTransformState &State) { void VPWidenRecipe::execute(VPTransformState &State) {

12
llvm/lib/Transforms/Vectorize/VPlan.h
View File

@ -823,15 +823,17 @@ private:
/// Hold the select to be widened. /// Hold the select to be widened.
SelectInst &Ingredient; SelectInst &Ingredient;
/// Is the condition of the select loop invariant?
bool InvariantCond;
/// Hold VPValues for the operands of the select. /// Hold VPValues for the operands of the select.
VPUser User; VPUser User;
/// Is the condition of the select loop invariant?
bool InvariantCond;
public: public:
VPWidenSelectRecipe(SelectInst &I, bool InvariantCond) template <typename IterT>
: VPRecipeBase(VPWidenSelectSC), Ingredient(I), VPWidenSelectRecipe(SelectInst &I, iterator_range<IterT> Operands,
bool InvariantCond)
: VPRecipeBase(VPWidenSelectSC), Ingredient(I), User(Operands),
InvariantCond(InvariantCond) {} InvariantCond(InvariantCond) {}
~VPWidenSelectRecipe() override = default; ~VPWidenSelectRecipe() override = default;