mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-03 11:24:18 +00:00
[getUnderlyingOjbects] Analyze loop PHIs further to remove false positives
Specifically, if a pointer accesses different underlying objects in each iteration, don't look through the phi node defining the pointer. The motivating case is the underlyling-objects-2.ll testcase. Consider the loop nest: int **A; for (i) for (j) A[i][j] = A[i-1][j] * B[j] This loop is transformed by Load-PRE to stash away A[i] for the next iteration of the outer loop: Curr = A[0]; // Prev_0 for (i: 1..N) { Prev = Curr; // Prev = PHI (Prev_0, Curr) Curr = A[i]; for (j: 0..N) Curr[j] = Prev[j] * B[j] } Since A[i] and A[i-1] are likely to be independent pointers, getUnderlyingObjects should not assume that Curr and Prev share the same underlying object in the inner loop. If it did we would try to dependence-analyze Curr and Prev and the analysis of the corresponding SCEVs would fail with non-constant distance. To fix this, the getUnderlyingObjects API is extended with an optional LoopInfo parameter. This is effectively what controls whether we want the above behavior or the original. Currently, I only changed to use this approach for LoopAccessAnalysis. The other testcase is to guard the opposite case where we do want to look through the loop PHI. If we step through an array by incrementing a pointer, the underlying object is the incoming value of the phi as the loop is entered. Fixes rdar://problem/19566729 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235634 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -199,9 +199,9 @@ public:
|
||||
typedef PointerIntPair<Value *, 1, bool> MemAccessInfo;
|
||||
typedef SmallPtrSet<MemAccessInfo, 8> MemAccessInfoSet;
|
||||
|
||||
AccessAnalysis(const DataLayout &Dl, AliasAnalysis *AA,
|
||||
AccessAnalysis(const DataLayout &Dl, AliasAnalysis *AA, LoopInfo *LI,
|
||||
MemoryDepChecker::DepCandidates &DA)
|
||||
: DL(Dl), AST(*AA), DepCands(DA), IsRTCheckNeeded(false) {}
|
||||
: DL(Dl), AST(*AA), LI(LI), DepCands(DA), IsRTCheckNeeded(false) {}
|
||||
|
||||
/// \brief Register a load and whether it is only read from.
|
||||
void addLoad(AliasAnalysis::Location &Loc, bool IsReadOnly) {
|
||||
@ -261,6 +261,8 @@ private:
|
||||
//intrinsic property (such as TBAA metadata).
|
||||
AliasSetTracker AST;
|
||||
|
||||
LoopInfo *LI;
|
||||
|
||||
/// Sets of potentially dependent accesses - members of one set share an
|
||||
/// underlying pointer. The set "CheckDeps" identfies which sets really need a
|
||||
/// dependence check.
|
||||
@ -477,7 +479,9 @@ void AccessAnalysis::processMemAccesses() {
|
||||
// underlying object.
|
||||
typedef SmallVector<Value *, 16> ValueVector;
|
||||
ValueVector TempObjects;
|
||||
GetUnderlyingObjects(Ptr, TempObjects, DL);
|
||||
|
||||
GetUnderlyingObjects(Ptr, TempObjects, DL, LI);
|
||||
DEBUG(dbgs() << "Underlying objects for pointer " << *Ptr << "\n");
|
||||
for (Value *UnderlyingObj : TempObjects) {
|
||||
UnderlyingObjToAccessMap::iterator Prev =
|
||||
ObjToLastAccess.find(UnderlyingObj);
|
||||
@ -485,6 +489,7 @@ void AccessAnalysis::processMemAccesses() {
|
||||
DepCands.unionSets(Access, Prev->second);
|
||||
|
||||
ObjToLastAccess[UnderlyingObj] = Access;
|
||||
DEBUG(dbgs() << " " << *UnderlyingObj << "\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1035,7 +1040,7 @@ void LoopAccessInfo::analyzeLoop(const ValueToValueMap &Strides) {
|
||||
|
||||
MemoryDepChecker::DepCandidates DependentAccesses;
|
||||
AccessAnalysis Accesses(TheLoop->getHeader()->getModule()->getDataLayout(),
|
||||
AA, DependentAccesses);
|
||||
AA, LI, DependentAccesses);
|
||||
|
||||
// Holds the analyzed pointers. We don't want to call GetUnderlyingObjects
|
||||
// multiple times on the same object. If the ptr is accessed twice, once
|
||||
@ -1306,10 +1311,10 @@ std::pair<Instruction *, Instruction *> LoopAccessInfo::addRuntimeCheck(
|
||||
LoopAccessInfo::LoopAccessInfo(Loop *L, ScalarEvolution *SE,
|
||||
const DataLayout &DL,
|
||||
const TargetLibraryInfo *TLI, AliasAnalysis *AA,
|
||||
DominatorTree *DT,
|
||||
DominatorTree *DT, LoopInfo *LI,
|
||||
const ValueToValueMap &Strides)
|
||||
: DepChecker(SE, L), NumComparisons(0), TheLoop(L), SE(SE), DL(DL),
|
||||
TLI(TLI), AA(AA), DT(DT), NumLoads(0), NumStores(0),
|
||||
TLI(TLI), AA(AA), DT(DT), LI(LI), NumLoads(0), NumStores(0),
|
||||
MaxSafeDepDistBytes(-1U), CanVecMem(false),
|
||||
StoreToLoopInvariantAddress(false) {
|
||||
if (canAnalyzeLoop())
|
||||
@ -1356,7 +1361,8 @@ LoopAccessAnalysis::getInfo(Loop *L, const ValueToValueMap &Strides) {
|
||||
|
||||
if (!LAI) {
|
||||
const DataLayout &DL = L->getHeader()->getModule()->getDataLayout();
|
||||
LAI = llvm::make_unique<LoopAccessInfo>(L, SE, DL, TLI, AA, DT, Strides);
|
||||
LAI = llvm::make_unique<LoopAccessInfo>(L, SE, DL, TLI, AA, DT, LI,
|
||||
Strides);
|
||||
#ifndef NDEBUG
|
||||
LAI->NumSymbolicStrides = Strides.size();
|
||||
#endif
|
||||
@ -1367,7 +1373,6 @@ LoopAccessAnalysis::getInfo(Loop *L, const ValueToValueMap &Strides) {
|
||||
void LoopAccessAnalysis::print(raw_ostream &OS, const Module *M) const {
|
||||
LoopAccessAnalysis &LAA = *const_cast<LoopAccessAnalysis *>(this);
|
||||
|
||||
LoopInfo *LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
|
||||
ValueToValueMap NoSymbolicStrides;
|
||||
|
||||
for (Loop *TopLevelLoop : *LI)
|
||||
@ -1384,6 +1389,7 @@ bool LoopAccessAnalysis::runOnFunction(Function &F) {
|
||||
TLI = TLIP ? &TLIP->getTLI() : nullptr;
|
||||
AA = &getAnalysis<AliasAnalysis>();
|
||||
DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
|
||||
LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user