RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-11 21:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SLPVectorizer] Ensure dominated reduction values.

Browse Source 
When considering incoming values as part of a reduction phi, ensure the
incoming value is dominated by said phi.

Failing to ensure this property causes miscompiles.

Fixes PR25787.

Many thanks to Mattias Eriksson for reporting, reducing and analyzing the
problem for me.

Differential Revision: http://reviews.llvm.org/D15580



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255792 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Charlie Turner 2015-12-16 18:23:44 +00:00
parent 3a06c2dfa3
commit 8c888e8a57
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Transforms/Vectorize/SLPVectorizer.cpp
View File

@ -3940,8 +3940,17 @@ static bool PhiTypeSorterFunc(Value *V, Value *V2) {
///
/// \returns A candidate reduction value if possible, or \code nullptr \endcode
/// if not possible.
static Value *getReductionValue(PHINode *P, BasicBlock *ParentBB,
LoopInfo *LI) {
static Value *getReductionValue(const DominatorTree *DT, PHINode *P,
BasicBlock *ParentBB, LoopInfo *LI) {
// There are situations where the reduction value is not dominated by the
// reduction phi. Vectorizing such cases has been reported to cause
// miscompiles. See PR25787.
auto DominatedReduxValue = [&](Value *R) {
return (
dyn_cast<Instruction>(R) &&
DT->dominates(P->getParent(), dyn_cast<Instruction>(R)->getParent()));
};
Value *Rdx = nullptr;
// Return the incoming value if it comes from the same BB as the phi node.
@ -3951,16 +3960,16 @@ static Value *getReductionValue(PHINode *P, BasicBlock *ParentBB,
Rdx = P->getIncomingValue(1);
}
if (Rdx)
if (Rdx && DominatedReduxValue(Rdx))
return Rdx;
// Otherwise, check whether we have a loop latch to look at.
Loop *BBL = LI->getLoopFor(ParentBB);
if (!BBL)
return Rdx;
return nullptr;
BasicBlock *BBLatch = BBL->getLoopLatch();
if (!BBLatch)
return Rdx;
return nullptr;
// There is a loop latch, return the incoming value if it comes from
// that. This reduction pattern occassionaly turns up.
@ -3970,7 +3979,10 @@ static Value *getReductionValue(PHINode *P, BasicBlock *ParentBB,
Rdx = P->getIncomingValue(1);
}
return Rdx;
if (Rdx && DominatedReduxValue(Rdx))
return Rdx;
return nullptr;
}
/// \brief Attempt to reduce a horizontal reduction.
@ -4065,7 +4077,7 @@ bool SLPVectorizer::vectorizeChainsInBlock(BasicBlock *BB, BoUpSLP &R) {
if (P->getNumIncomingValues() != 2)
return Changed;
Value *Rdx = getReductionValue(P, BB, LI);
Value *Rdx = getReductionValue(DT, P, BB, LI);
// Check if this is a Binary Operator.
BinaryOperator *BI = dyn_cast_or_null<BinaryOperator>(Rdx);