[PATCH] D70516: Revert "[DependenceAnalysis] Dependecies for loads marked with "ivnariant.load" should not be shared with general accesses. Fix for https://bugs.llvm.org/show_bug.cgi?id=42151"
Benjamin Kramer via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 21 02:41:01 PST 2019
This revision was not accepted when it landed; it landed in state "Needs Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rG446acafb82b5: Revert "[DependenceAnalysis] Dependecies for loads marked with "ivnariant.load"… (authored by bkramer).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D70516/new/
https://reviews.llvm.org/D70516
Files:
llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
Index: llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
===================================================================
--- llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
+++ llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
@@ -979,11 +979,6 @@
Instruction *QueryInst, const MemoryLocation &Loc, bool isLoad,
BasicBlock *BB, NonLocalDepInfo *Cache, unsigned NumSortedEntries) {
- bool isInvariantLoad = false;
-
- if (LoadInst *LI = dyn_cast_or_null<LoadInst>(QueryInst))
- isInvariantLoad = LI->getMetadata(LLVMContext::MD_invariant_load);
-
// Do a binary search to see if we already have an entry for this block in
// the cache set. If so, find it.
NonLocalDepInfo::iterator Entry = std::upper_bound(
@@ -995,13 +990,6 @@
if (Entry != Cache->begin() + NumSortedEntries && Entry->getBB() == BB)
ExistingResult = &*Entry;
- // Use cached result for invariant load only if there is no dependency for non
- // invariant load. In this case invariant load can not have any dependency as
- // well.
- if (ExistingResult && isInvariantLoad &&
- !ExistingResult->getResult().isNonFuncLocal())
- ExistingResult = nullptr;
-
// If we have a cached entry, and it is non-dirty, use it as the value for
// this dependency.
if (ExistingResult && !ExistingResult->getResult().isDirty()) {
@@ -1030,10 +1018,6 @@
MemDepResult Dep =
getPointerDependencyFrom(Loc, isLoad, ScanPos, BB, QueryInst);
- // Don't cache results for invariant load.
- if (isInvariantLoad)
- return Dep;
-
// If we had a dirty entry for the block, update it. Otherwise, just add
// a new entry.
if (ExistingResult)
@@ -1470,6 +1454,7 @@
if (SkipFirstBlock)
return false;
+ bool foundBlock = false;
for (NonLocalDepEntry &I : llvm::reverse(*Cache)) {
if (I.getBB() != BB)
continue;
@@ -1477,12 +1462,14 @@
assert((GotWorklistLimit || I.getResult().isNonLocal() ||
!DT.isReachableFromEntry(BB)) &&
"Should only be here with transparent block");
+ foundBlock = true;
I.setResult(MemDepResult::getUnknown());
+ Result.push_back(
+ NonLocalDepResult(I.getBB(), I.getResult(), Pointer.getAddr()));
break;
}
- // Go ahead and report unknown dependence.
- Result.push_back(
- NonLocalDepResult(BB, MemDepResult::getUnknown(), Pointer.getAddr()));
+ (void)foundBlock; (void)GotWorklistLimit;
+ assert((foundBlock || GotWorklistLimit) && "Current block not in cache?");
}
// Okay, we're done now. If we added new values to the cache, re-sort it.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D70516.230409.patch
Type: text/x-patch
Size: 2620 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191121/32eb6eb6/attachment.bin>
More information about the llvm-commits
mailing list