[llvm-commits] [llvm] r113521 - in /llvm/trunk: include/llvm/Analysis/AliasAnalysis.h lib/Analysis/AliasAnalysis.cpp lib/Analysis/BasicAliasAnalysis.cpp
Dan Gohman
gohman at apple.com
Thu Sep 9 11:37:31 PDT 2010
Author: djg
Date: Thu Sep 9 13:37:31 2010
New Revision: 113521
URL: http://llvm.org/viewvc/llvm-project?rev=113521&view=rev
Log:
Extend the getDependence query with support for PHI translation.
Modified:
llvm/trunk/include/llvm/Analysis/AliasAnalysis.h
llvm/trunk/lib/Analysis/AliasAnalysis.cpp
llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
Modified: llvm/trunk/include/llvm/Analysis/AliasAnalysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/AliasAnalysis.h?rev=113521&r1=113520&r2=113521&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/AliasAnalysis.h (original)
+++ llvm/trunk/include/llvm/Analysis/AliasAnalysis.h Thu Sep 9 13:37:31 2010
@@ -340,17 +340,20 @@
/// WARNING: This is an experimental interface.
DependenceResult getDependence(const Instruction *First,
const Instruction *Second) {
- return getDependence(First, Default, Second, Default);
+ return getDependence(First, 0, Default, Second, 0, Default);
}
/// getDependence - Determine the dependence relationship between the
/// instructions. This does not include "register" dependencies; it just
/// considers memory references and other side effects. This overload
- /// accepts additional flags to refine the query.
+ /// has additional parameters to allow phi-translated addresses to be
+ /// specified, and additional flags to refine the query.
/// WARNING: This is an experimental interface.
virtual DependenceResult getDependence(const Instruction *First,
+ const Value *FirstPHITranslatedAddr,
DependenceQueryFlags FirstFlags,
const Instruction *Second,
+ const Value *SecondPHITranslatedAddr,
DependenceQueryFlags SecondFlags);
//===--------------------------------------------------------------------===//
@@ -403,8 +406,10 @@
/// getDependenceViaModRefInfo - Helper function for implementing getDependence
/// in implementations which already have getModRefInfo implementations.
DependenceResult getDependenceViaModRefInfo(const Instruction *First,
+ const Value *FirstPHITranslatedAddr,
DependenceQueryFlags FirstFlags,
const Instruction *Second,
+ const Value *SecondPHITranslatedAddr,
DependenceQueryFlags SecondFlags);
};
Modified: llvm/trunk/lib/Analysis/AliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/AliasAnalysis.cpp?rev=113521&r1=113520&r2=113521&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/AliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/AliasAnalysis.cpp Thu Sep 9 13:37:31 2010
@@ -190,11 +190,14 @@
AliasAnalysis::DependenceResult
AliasAnalysis::getDependence(const Instruction *First,
+ const Value *FirstPHITranslatedAddr,
DependenceQueryFlags FirstFlags,
const Instruction *Second,
+ const Value *SecondPHITranslatedAddr,
DependenceQueryFlags SecondFlags) {
assert(AA && "AA didn't call InitializeAliasAnalyais in its run method!");
- return AA->getDependence(First, FirstFlags, Second, SecondFlags);
+ return AA->getDependence(First, FirstPHITranslatedAddr, FirstFlags,
+ Second, SecondPHITranslatedAddr, SecondFlags);
}
//===----------------------------------------------------------------------===//
@@ -255,17 +258,23 @@
AliasAnalysis::DependenceResult
AliasAnalysis::getDependenceViaModRefInfo(const Instruction *First,
+ const Value *FirstPHITranslatedAddr,
DependenceQueryFlags FirstFlags,
const Instruction *Second,
+ const Value *SecondPHITranslatedAddr,
DependenceQueryFlags SecondFlags) {
if (const LoadInst *L = dyn_cast<LoadInst>(First)) {
// Be over-conservative with volatile for now.
if (L->isVolatile())
return Unknown;
+ // If we don't have a phi-translated address, use the actual one.
+ if (!FirstPHITranslatedAddr)
+ FirstPHITranslatedAddr = L->getPointerOperand();
+
// Forward this query to getModRefInfo.
switch (getModRefInfo(Second,
- L->getPointerOperand(),
+ FirstPHITranslatedAddr,
getTypeStoreSize(L->getType()))) {
case NoModRef:
// Second doesn't reference First's memory, so they're independent.
@@ -280,10 +289,14 @@
// If it's loading the same size from the same address, we can
// give a more precise result.
if (const LoadInst *SecondL = dyn_cast<LoadInst>(Second)) {
+ // If we don't have a phi-translated address, use the actual one.
+ if (!SecondPHITranslatedAddr)
+ SecondPHITranslatedAddr = SecondL->getPointerOperand();
+
unsigned LSize = getTypeStoreSize(L->getType());
unsigned SecondLSize = getTypeStoreSize(SecondL->getType());
- if (alias(L->getPointerOperand(), LSize,
- SecondL->getPointerOperand(), SecondLSize) ==
+ if (alias(FirstPHITranslatedAddr, LSize,
+ SecondPHITranslatedAddr, SecondLSize) ==
MustAlias) {
// If the loads are the same size, it's ReadThenRead.
if (LSize == SecondLSize)
@@ -307,10 +320,14 @@
// If it's storing the same size to the same address, we can
// give a more precise result.
if (const StoreInst *SecondS = dyn_cast<StoreInst>(Second)) {
+ // If we don't have a phi-translated address, use the actual one.
+ if (!SecondPHITranslatedAddr)
+ SecondPHITranslatedAddr = SecondS->getPointerOperand();
+
unsigned LSize = getTypeStoreSize(L->getType());
unsigned SecondSSize = getTypeStoreSize(SecondS->getType());
- if (alias(L->getPointerOperand(), LSize,
- SecondS->getPointerOperand(), SecondSSize) ==
+ if (alias(FirstPHITranslatedAddr, LSize,
+ SecondPHITranslatedAddr, SecondSSize) ==
MustAlias) {
// If the load and the store are the same size, it's ReadThenWrite.
if (LSize == SecondSSize)
@@ -332,9 +349,13 @@
if (S->isVolatile())
return Unknown;
+ // If we don't have a phi-translated address, use the actual one.
+ if (!FirstPHITranslatedAddr)
+ FirstPHITranslatedAddr = S->getPointerOperand();
+
// Forward this query to getModRefInfo.
switch (getModRefInfo(Second,
- S->getPointerOperand(),
+ FirstPHITranslatedAddr,
getTypeStoreSize(S->getValueOperand()->getType()))) {
case NoModRef:
// Second doesn't reference First's memory, so they're independent.
@@ -349,10 +370,14 @@
// If it's loading the same size from the same address, we can
// give a more precise result.
if (const LoadInst *SecondL = dyn_cast<LoadInst>(Second)) {
+ // If we don't have a phi-translated address, use the actual one.
+ if (!SecondPHITranslatedAddr)
+ SecondPHITranslatedAddr = SecondL->getPointerOperand();
+
unsigned SSize = getTypeStoreSize(S->getValueOperand()->getType());
unsigned SecondLSize = getTypeStoreSize(SecondL->getType());
- if (alias(S->getPointerOperand(), SSize,
- SecondL->getPointerOperand(), SecondLSize) ==
+ if (alias(FirstPHITranslatedAddr, SSize,
+ SecondPHITranslatedAddr, SecondLSize) ==
MustAlias) {
// If the store and the load are the same size, it's WriteThenRead.
if (SSize == SecondLSize)
@@ -376,10 +401,14 @@
// If it's storing the same size to the same address, we can
// give a more precise result.
if (const StoreInst *SecondS = dyn_cast<StoreInst>(Second)) {
+ // If we don't have a phi-translated address, use the actual one.
+ if (!SecondPHITranslatedAddr)
+ SecondPHITranslatedAddr = SecondS->getPointerOperand();
+
unsigned SSize = getTypeStoreSize(S->getValueOperand()->getType());
unsigned SecondSSize = getTypeStoreSize(SecondS->getType());
- if (alias(S->getPointerOperand(), SSize,
- SecondS->getPointerOperand(), SecondSSize) ==
+ if (alias(FirstPHITranslatedAddr, SSize,
+ SecondPHITranslatedAddr, SecondSSize) ==
MustAlias) {
// If the stores are the same size, it's WriteThenWrite.
if (SSize == SecondSSize)
@@ -401,12 +430,20 @@
}
} else if (const VAArgInst *V = dyn_cast<VAArgInst>(First)) {
+ // If we don't have a phi-translated address, use the actual one.
+ if (!FirstPHITranslatedAddr)
+ FirstPHITranslatedAddr = V->getPointerOperand();
+
// Forward this query to getModRefInfo.
- if (getModRefInfo(Second, V->getOperand(0), UnknownSize) == NoModRef)
+ if (getModRefInfo(Second, FirstPHITranslatedAddr, UnknownSize) == NoModRef)
// Second doesn't reference First's memory, so they're independent.
return Independent;
} else if (ImmutableCallSite FirstCS = cast<Value>(First)) {
+ assert(!FirstPHITranslatedAddr &&
+ !SecondPHITranslatedAddr &&
+ "PHI translation with calls not supported yet!");
+
// If both instructions are calls/invokes we can use the two-callsite
// form of getModRefInfo.
if (ImmutableCallSite SecondCS = cast<Value>(Second))
Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=113521&r1=113520&r2=113521&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Thu Sep 9 13:37:31 2010
@@ -172,8 +172,10 @@
}
virtual DependenceResult getDependence(const Instruction *First,
+ const Value *FirstPHITranslatedAddr,
DependenceQueryFlags FirstFlags,
const Instruction *Second,
+ const Value *SecondPHITranslatedAddr,
DependenceQueryFlags SecondFlags) {
return Unknown;
}
@@ -531,8 +533,10 @@
virtual ModRefBehavior getModRefBehavior(const Function *F);
virtual DependenceResult getDependence(const Instruction *First,
+ const Value *FirstPHITranslatedAddr,
DependenceQueryFlags FirstFlags,
const Instruction *Second,
+ const Value *SecondPHITranslatedAddr,
DependenceQueryFlags SecondFlags);
/// getAdjustedAnalysisPointer - This method is used when a pass implements
@@ -748,11 +752,14 @@
AliasAnalysis::DependenceResult
BasicAliasAnalysis::getDependence(const Instruction *First,
+ const Value *FirstPHITranslatedAddr,
DependenceQueryFlags FirstFlags,
const Instruction *Second,
+ const Value *SecondPHITranslatedAddr,
DependenceQueryFlags SecondFlags) {
// We don't have anything special to say yet.
- return getDependenceViaModRefInfo(First, FirstFlags, Second, SecondFlags);
+ return getDependenceViaModRefInfo(First, FirstPHITranslatedAddr, FirstFlags,
+ Second, SecondPHITranslatedAddr, SecondFlags);
}
/// aliasGEP - Provide a bunch of ad-hoc rules to disambiguate a GEP instruction
More information about the llvm-commits
mailing list