Integrate the readonly/readnone logic more deeply
into alias analysis. This meant updating the API
which now has versions of the getModRefBehavior,
doesNotAccessMemory and onlyReadsMemory methods
which take a callsite parameter. These should be
used unless the callsite is not known, since in
general they can do a better job than the versions
that take a function. Also, users should no longer
call the version of getModRefBehavior that takes
both a function and a callsite. To reduce the
chance of misuse it is now protected.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44487 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/AliasAnalysis.cpp b/lib/Analysis/AliasAnalysis.cpp
index 2a3ac5a..9e1ae2a 100644
--- a/lib/Analysis/AliasAnalysis.cpp
+++ b/lib/Analysis/AliasAnalysis.cpp
@@ -27,6 +27,7 @@
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Pass.h"
#include "llvm/BasicBlock.h"
+#include "llvm/Function.h"
#include "llvm/Instructions.h"
#include "llvm/Type.h"
#include "llvm/Target/TargetData.h"
@@ -112,16 +113,40 @@
return pointsToConstantMemory(P) ? NoModRef : Mod;
}
+AliasAnalysis::ModRefBehavior
+AliasAnalysis::getModRefBehavior(CallSite CS,
+ std::vector<PointerAccessInfo> *Info) {
+ if (CS.paramHasAttr(0, ParamAttr::ReadNone))
+ // Can't do better than this.
+ return DoesNotAccessMemory;
+ ModRefBehavior MRB = UnknownModRefBehavior;
+ if (Function *F = CS.getCalledFunction())
+ MRB = getModRefBehavior(F, CS, Info);
+ if (MRB != DoesNotAccessMemory && CS.paramHasAttr(0, ParamAttr::ReadOnly))
+ return OnlyReadsMemory;
+ return MRB;
+}
+
+AliasAnalysis::ModRefBehavior
+AliasAnalysis::getModRefBehavior(Function *F,
+ std::vector<PointerAccessInfo> *Info) {
+ if (F->paramHasAttr(0, ParamAttr::ReadNone))
+ // Can't do better than this.
+ return DoesNotAccessMemory;
+ ModRefBehavior MRB = getModRefBehavior(F, CallSite(), Info);
+ if (MRB != DoesNotAccessMemory && F->paramHasAttr(0, ParamAttr::ReadOnly))
+ return OnlyReadsMemory;
+ return MRB;
+}
+
AliasAnalysis::ModRefResult
AliasAnalysis::getModRefInfo(CallSite CS, Value *P, unsigned Size) {
ModRefResult Mask = ModRef;
- if (Function *F = CS.getCalledFunction()) {
- ModRefBehavior MRB = getModRefBehavior(F, CallSite());
- if (MRB == OnlyReadsMemory)
- Mask = Ref;
- else if (MRB == DoesNotAccessMemory)
- return NoModRef;
- }
+ ModRefBehavior MRB = getModRefBehavior(CS);
+ if (MRB == OnlyReadsMemory)
+ Mask = Ref;
+ else if (MRB == DoesNotAccessMemory)
+ return NoModRef;
if (!AA) return Mask;
diff --git a/lib/Analysis/AliasAnalysisCounter.cpp b/lib/Analysis/AliasAnalysisCounter.cpp
index eea2c99..2fccff1 100644
--- a/lib/Analysis/AliasAnalysisCounter.cpp
+++ b/lib/Analysis/AliasAnalysisCounter.cpp
@@ -89,9 +89,15 @@
bool pointsToConstantMemory(const Value *P) {
return getAnalysis<AliasAnalysis>().pointsToConstantMemory(P);
}
+ bool doesNotAccessMemory(CallSite CS) {
+ return getAnalysis<AliasAnalysis>().doesNotAccessMemory(CS);
+ }
bool doesNotAccessMemory(Function *F) {
return getAnalysis<AliasAnalysis>().doesNotAccessMemory(F);
}
+ bool onlyReadsMemory(CallSite CS) {
+ return getAnalysis<AliasAnalysis>().onlyReadsMemory(CS);
+ }
bool onlyReadsMemory(Function *F) {
return getAnalysis<AliasAnalysis>().onlyReadsMemory(F);
}
diff --git a/lib/Analysis/AliasSetTracker.cpp b/lib/Analysis/AliasSetTracker.cpp
index fcdd1b3..1b20c7a 100644
--- a/lib/Analysis/AliasSetTracker.cpp
+++ b/lib/Analysis/AliasSetTracker.cpp
@@ -114,15 +114,13 @@
void AliasSet::addCallSite(CallSite CS, AliasAnalysis &AA) {
CallSites.push_back(CS);
- if (Function *F = CS.getCalledFunction()) {
- AliasAnalysis::ModRefBehavior Behavior = AA.getModRefBehavior(F, CS);
- if (Behavior == AliasAnalysis::DoesNotAccessMemory)
- return;
- else if (Behavior == AliasAnalysis::OnlyReadsMemory) {
- AliasTy = MayAlias;
- AccessTy |= Refs;
- return;
- }
+ AliasAnalysis::ModRefBehavior Behavior = AA.getModRefBehavior(CS);
+ if (Behavior == AliasAnalysis::DoesNotAccessMemory)
+ return;
+ else if (Behavior == AliasAnalysis::OnlyReadsMemory) {
+ AliasTy = MayAlias;
+ AccessTy |= Refs;
+ return;
}
// FIXME: This should use mod/ref information to make this not suck so bad
@@ -166,9 +164,8 @@
}
bool AliasSet::aliasesCallSite(CallSite CS, AliasAnalysis &AA) const {
- if (Function *F = CS.getCalledFunction())
- if (AA.doesNotAccessMemory(F))
- return false;
+ if (AA.doesNotAccessMemory(CS))
+ return false;
if (AA.hasNoModRefInfoForCalls())
return true;
@@ -297,9 +294,8 @@
bool AliasSetTracker::add(CallSite CS) {
- if (Function *F = CS.getCalledFunction())
- if (AA.doesNotAccessMemory(F))
- return true; // doesn't alias anything
+ if (AA.doesNotAccessMemory(CS))
+ return true; // doesn't alias anything
AliasSet *AS = findAliasSetForCallSite(CS);
if (!AS) {
@@ -419,9 +415,8 @@
}
bool AliasSetTracker::remove(CallSite CS) {
- if (Function *F = CS.getCalledFunction())
- if (AA.doesNotAccessMemory(F))
- return false; // doesn't alias anything
+ if (AA.doesNotAccessMemory(CS))
+ return false; // doesn't alias anything
AliasSet *AS = findAliasSetForCallSite(CS);
if (!AS) return false;
@@ -455,13 +450,10 @@
// If this is a call instruction, remove the callsite from the appropriate
// AliasSet.
CallSite CS = CallSite::get(PtrVal);
- if (CS.getInstruction()) {
- Function *F = CS.getCalledFunction();
- if (!F || !AA.doesNotAccessMemory(F)) {
+ if (CS.getInstruction())
+ if (!AA.doesNotAccessMemory(CS))
if (AliasSet *AS = findAliasSetForCallSite(CS))
AS->removeCallSite(CS);
- }
- }
// First, look up the PointerRec for this pointer.
hash_map<Value*, AliasSet::PointerRec>::iterator I = PointerMap.find(PtrVal);
diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp
index 575e921..5ec9afa 100644
--- a/lib/Analysis/BasicAliasAnalysis.cpp
+++ b/lib/Analysis/BasicAliasAnalysis.cpp
@@ -839,11 +839,6 @@
return UnknownModRefBehavior;
}
- if (F->paramHasAttr(0, ParamAttr::ReadNone))
- return DoesNotAccessMemory;
- if (F->paramHasAttr(0, ParamAttr::ReadOnly))
- return OnlyReadsMemory;
-
return UnknownModRefBehavior;
}
diff --git a/lib/Analysis/IPA/GlobalsModRef.cpp b/lib/Analysis/IPA/GlobalsModRef.cpp
index dce4a1e..9e943dd 100644
--- a/lib/Analysis/IPA/GlobalsModRef.cpp
+++ b/lib/Analysis/IPA/GlobalsModRef.cpp
@@ -394,7 +394,7 @@
// Okay, if we can't say anything about it, maybe some other alias
// analysis can.
ModRefBehavior MRB =
- AliasAnalysis::getModRefBehavior(Callee, CallSite());
+ AliasAnalysis::getModRefBehavior(Callee);
if (MRB != DoesNotAccessMemory) {
// FIXME: could make this more aggressive for functions that just
// read memory. We should just say they read all globals.
diff --git a/lib/Analysis/LoadValueNumbering.cpp b/lib/Analysis/LoadValueNumbering.cpp
index 3af92bc..67d4dd22 100644
--- a/lib/Analysis/LoadValueNumbering.cpp
+++ b/lib/Analysis/LoadValueNumbering.cpp
@@ -148,7 +148,7 @@
Function *CF = CI->getCalledFunction();
if (CF == 0) return; // Indirect call.
AliasAnalysis &AA = getAnalysis<AliasAnalysis>();
- AliasAnalysis::ModRefBehavior MRB = AA.getModRefBehavior(CF, CI);
+ AliasAnalysis::ModRefBehavior MRB = AA.getModRefBehavior(CI);
if (MRB != AliasAnalysis::DoesNotAccessMemory &&
MRB != AliasAnalysis::OnlyReadsMemory)
return; // Nothing we can do for now.
@@ -227,8 +227,7 @@
CantEqual = true;
break;
} else if (CallInst *CI = dyn_cast<CallInst>(I)) {
- if (CI->getCalledFunction() == 0 ||
- !AA.onlyReadsMemory(CI->getCalledFunction())) {
+ if (!AA.onlyReadsMemory(CI)) {
CantEqual = true;
break;
}
diff --git a/lib/Analysis/MemoryDependenceAnalysis.cpp b/lib/Analysis/MemoryDependenceAnalysis.cpp
index dd567aa..8c5f216 100644
--- a/lib/Analysis/MemoryDependenceAnalysis.cpp
+++ b/lib/Analysis/MemoryDependenceAnalysis.cpp
@@ -94,11 +94,9 @@
// FreeInsts erase the entire structure
pointerSize = ~0UL;
- } else if (CallSite::get(QI).getInstruction() != 0 &&
- cast<CallInst>(QI)->getCalledFunction()) {
+ } else if (isa<CallInst>(QI)) {
AliasAnalysis::ModRefBehavior result =
- AA.getModRefBehavior(cast<CallInst>(QI)->getCalledFunction(),
- CallSite::get(QI));
+ AA.getModRefBehavior(CallSite::get(QI));
if (result != AliasAnalysis::DoesNotAccessMemory &&
result != AliasAnalysis::OnlyReadsMemory) {
if (!start && !block) {
diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp
index e3bd362..7f37334 100644
--- a/lib/Transforms/Scalar/ADCE.cpp
+++ b/lib/Transforms/Scalar/ADCE.cpp
@@ -198,8 +198,7 @@
for (BasicBlock::iterator II = BB->begin(), EI = BB->end(); II != EI; ) {
Instruction *I = II++;
if (CallInst *CI = dyn_cast<CallInst>(I)) {
- Function *F = CI->getCalledFunction();
- if (F && AA.onlyReadsMemory(F)) {
+ if (AA.onlyReadsMemory(CI)) {
if (CI->use_empty()) {
BB->getInstList().erase(CI);
++NumCallRemoved;
diff --git a/lib/Transforms/Scalar/DeadStoreElimination.cpp b/lib/Transforms/Scalar/DeadStoreElimination.cpp
index b19077f..8e69d9a 100644
--- a/lib/Transforms/Scalar/DeadStoreElimination.cpp
+++ b/lib/Transforms/Scalar/DeadStoreElimination.cpp
@@ -306,8 +306,7 @@
// If this call does not access memory, it can't
// be undeadifying any of our pointers.
CallSite CS = CallSite::get(BBI);
- if (CS.getCalledFunction() &&
- AA.doesNotAccessMemory(CS.getCalledFunction()))
+ if (AA.doesNotAccessMemory(CS))
continue;
unsigned modRef = 0;
diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index 7799bef..c3d5985 100644
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -341,8 +341,7 @@
uint32_t ValueTable::hash_operand(Value* v) {
if (CallInst* CI = dyn_cast<CallInst>(v))
- if (CI->getCalledFunction() &&
- !AA->doesNotAccessMemory(CI->getCalledFunction()))
+ if (!AA->doesNotAccessMemory(CI))
return nextValueNumber++;
return lookup_or_add(v);
@@ -485,9 +484,7 @@
return VI->second;
if (CallInst* C = dyn_cast<CallInst>(V)) {
- if (C->getCalledFunction() &&
- (AA->doesNotAccessMemory(C->getCalledFunction()) ||
- AA->onlyReadsMemory(C->getCalledFunction()))) {
+ if (AA->onlyReadsMemory(C)) { // includes doesNotAccessMemory
Expression e = create_expression(C);
DenseMap<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
@@ -1051,8 +1048,7 @@
if (CallInst* CI = dyn_cast<CallInst>(I)) {
AliasAnalysis& AA = getAnalysis<AliasAnalysis>();
- if (CI->getCalledFunction() &&
- !AA.doesNotAccessMemory(CI->getCalledFunction())) {
+ if (!AA.doesNotAccessMemory(CI)) {
MemoryDependenceAnalysis& MD = getAnalysis<MemoryDependenceAnalysis>();
if (cast<Instruction>(repl)->getParent() != CI->getParent() ||
MD.getDependency(CI) != MD.getDependency(cast<CallInst>(repl))) {
diff --git a/lib/Transforms/Scalar/LICM.cpp b/lib/Transforms/Scalar/LICM.cpp
index c86b463..0c8cb4d 100644
--- a/lib/Transforms/Scalar/LICM.cpp
+++ b/lib/Transforms/Scalar/LICM.cpp
@@ -375,24 +375,22 @@
return !pointerInvalidatedByLoop(LI->getOperand(0), Size);
} else if (CallInst *CI = dyn_cast<CallInst>(&I)) {
// Handle obvious cases efficiently.
- if (Function *Callee = CI->getCalledFunction()) {
- AliasAnalysis::ModRefBehavior Behavior =AA->getModRefBehavior(Callee, CI);
- if (Behavior == AliasAnalysis::DoesNotAccessMemory)
- return true;
- else if (Behavior == AliasAnalysis::OnlyReadsMemory) {
- // If this call only reads from memory and there are no writes to memory
- // in the loop, we can hoist or sink the call as appropriate.
- bool FoundMod = false;
- for (AliasSetTracker::iterator I = CurAST->begin(), E = CurAST->end();
- I != E; ++I) {
- AliasSet &AS = *I;
- if (!AS.isForwardingAliasSet() && AS.isMod()) {
- FoundMod = true;
- break;
- }
+ AliasAnalysis::ModRefBehavior Behavior = AA->getModRefBehavior(CI);
+ if (Behavior == AliasAnalysis::DoesNotAccessMemory)
+ return true;
+ else if (Behavior == AliasAnalysis::OnlyReadsMemory) {
+ // If this call only reads from memory and there are no writes to memory
+ // in the loop, we can hoist or sink the call as appropriate.
+ bool FoundMod = false;
+ for (AliasSetTracker::iterator I = CurAST->begin(), E = CurAST->end();
+ I != E; ++I) {
+ AliasSet &AS = *I;
+ if (!AS.isForwardingAliasSet() && AS.isMod()) {
+ FoundMod = true;
+ break;
}
- if (!FoundMod) return true;
}
+ if (!FoundMod) return true;
}
// FIXME: This should use mod/ref information to see if we can hoist or sink