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

[SLP] Make ReductionOpcode have the right (enum) type. NFC. 

llvm-svn: 292703
This commit is contained in:
Michael Kuperstein 2017-01-21 02:03:03 +00:00
parent 910dc8de3f
commit 807982359d
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View File

@ -4135,7 +4135,7 @@ class HorizontalReduction {
WeakVH ReductionPHI;
/// The opcode of the reduction.
unsigned ReductionOpcode;
Instruction::BinaryOps ReductionOpcode;
/// The opcode of the values we perform a reduction on.
unsigned ReducedValueOpcode;
/// Should we model this reduction as a pairwise reduction tree or a tree that
@ -4151,8 +4151,8 @@ public:
unsigned MinVecRegSize;
HorizontalReduction(unsigned MinVecRegSize)
: ReductionRoot(nullptr), ReductionOpcode(0), ReducedValueOpcode(0),
IsPairwiseReduction(false), ReduxWidth(0),
: ReductionRoot(nullptr), ReductionOpcode(Instruction::BinaryOpsEnd),
ReducedValueOpcode(0), IsPairwiseReduction(false), ReduxWidth(0),
MinVecRegSize(MinVecRegSize) {}
/// \brief Try to find a reduction tree.
@ -4302,9 +4302,8 @@ public:
Value *ReducedSubTree = emitReduction(VectorizedRoot, Builder);
if (VectorizedTree) {
Builder.SetCurrentDebugLocation(Loc);
VectorizedTree =
Builder.CreateBinOp((Instruction::BinaryOps)ReductionOpcode,
VectorizedTree, ReducedSubTree, "bin.rdx");
VectorizedTree = Builder.CreateBinOp(ReductionOpcode, VectorizedTree,
ReducedSubTree, "bin.rdx");
} else
VectorizedTree = ReducedSubTree;
}
@ -4314,9 +4313,8 @@ public:
for (; i < NumReducedVals; ++i) {
Builder.SetCurrentDebugLocation(
cast<Instruction>(ReducedVals[i])->getDebugLoc());
VectorizedTree =
Builder.CreateBinOp((Instruction::BinaryOps)ReductionOpcode,
VectorizedTree, ReducedVals[i]);
VectorizedTree = Builder.CreateBinOp(ReductionOpcode, VectorizedTree,
ReducedVals[i]);
}
// Update users.
if (ReductionPHI && !isa<UndefValue>(ReductionPHI)) {
@ -4377,15 +4375,14 @@ private:
Value *RightShuf = Builder.CreateShuffleVector(
TmpVec, UndefValue::get(TmpVec->getType()), (RightMask),
"rdx.shuf.r");
TmpVec = Builder.CreateBinOp((Instruction::BinaryOps)ReductionOpcode,
LeftShuf, RightShuf, "bin.rdx");
TmpVec = Builder.CreateBinOp(ReductionOpcode, LeftShuf, RightShuf,
"bin.rdx");
} else {
Value *UpperHalf =
createRdxShuffleMask(ReduxWidth, i, false, false, Builder);
Value *Shuf = Builder.CreateShuffleVector(
TmpVec, UndefValue::get(TmpVec->getType()), UpperHalf, "rdx.shuf");
TmpVec = Builder.CreateBinOp((Instruction::BinaryOps)ReductionOpcode,
TmpVec, Shuf, "bin.rdx");
TmpVec = Builder.CreateBinOp(ReductionOpcode, TmpVec, Shuf, "bin.rdx");
}
}