diff options
| -rwxr-xr-x | polly/include/polly/TempScopInfo.h | 4 | ||||
| -rw-r--r-- | polly/lib/Analysis/TempScopInfo.cpp | 6 | ||||
| -rw-r--r-- | polly/lib/CodeGen/CodeGeneration.cpp | 6 | ||||
| -rw-r--r-- | polly/lib/CodeGen/IslCodeGeneration.cpp | 2 | ||||
| -rw-r--r-- | polly/lib/CodeGen/LoopGenerators.cpp | 4 | ||||
| -rw-r--r-- | polly/lib/CodeGen/PTXGenerator.cpp | 2 | ||||
| -rw-r--r-- | polly/lib/IndVarSimplify.cpp | 12 |
7 files changed, 18 insertions, 18 deletions
diff --git a/polly/include/polly/TempScopInfo.h b/polly/include/polly/TempScopInfo.h index d8215ae9ced..7c2787de309 100755 --- a/polly/include/polly/TempScopInfo.h +++ b/polly/include/polly/TempScopInfo.h @@ -23,7 +23,7 @@ #include "llvm/Instructions.h" namespace llvm { - class TargetData; + class DataLayout; } using namespace llvm; @@ -228,7 +228,7 @@ class TempScopInfo : public FunctionPass { PostDominatorTree *PDT; // Target data for element size computing. - TargetData *TD; + DataLayout *TD; // Remember the bounds of loops, to help us build iteration domain of BBs. LoopBoundMapType LoopBounds; diff --git a/polly/lib/Analysis/TempScopInfo.cpp b/polly/lib/Analysis/TempScopInfo.cpp index 792c884c6ee..11b06fd20ff 100644 --- a/polly/lib/Analysis/TempScopInfo.cpp +++ b/polly/lib/Analysis/TempScopInfo.cpp @@ -22,7 +22,7 @@ #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/RegionIterator.h" -#include "llvm/Target/TargetData.h" +#include "llvm/DataLayout.h" #include "llvm/Assembly/Writer.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/ScalarEvolution.h" @@ -261,7 +261,7 @@ bool TempScopInfo::runOnFunction(Function &F) { LI = &getAnalysis<LoopInfo>(); SD = &getAnalysis<ScopDetection>(); AA = &getAnalysis<AliasAnalysis>(); - TD = &getAnalysis<TargetData>(); + TD = &getAnalysis<DataLayout>(); for (ScopDetection::iterator I = SD->begin(), E = SD->end(); I != E; ++I) { Region *R = const_cast<Region*>(*I); @@ -272,7 +272,7 @@ bool TempScopInfo::runOnFunction(Function &F) { } void TempScopInfo::getAnalysisUsage(AnalysisUsage &AU) const { - AU.addRequired<TargetData>(); + AU.addRequired<DataLayout>(); AU.addRequiredTransitive<DominatorTree>(); AU.addRequiredTransitive<PostDominatorTree>(); AU.addRequiredTransitive<LoopInfo>(); diff --git a/polly/lib/CodeGen/CodeGeneration.cpp b/polly/lib/CodeGen/CodeGeneration.cpp index 6305a09cd68..f1d1487b6f2 100644 --- a/polly/lib/CodeGen/CodeGeneration.cpp +++ b/polly/lib/CodeGen/CodeGeneration.cpp @@ -42,7 +42,7 @@ #include "llvm/Analysis/ScalarEvolutionExpander.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" -#include "llvm/Target/TargetData.h" +#include "llvm/DataLayout.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #define CLOOG_INT_GMP 1 @@ -358,7 +358,7 @@ private: } IntegerType *ClastStmtCodeGen::getIntPtrTy() { - return P->getAnalysis<TargetData>().getIntPtrType(Builder.getContext()); + return P->getAnalysis<DataLayout>().getIntPtrType(Builder.getContext()); } const std::vector<std::string> &ClastStmtCodeGen::getParallelLoops() { @@ -998,7 +998,7 @@ class CodeGeneration : public ScopPass { AU.addRequired<ScalarEvolution>(); AU.addRequired<ScopDetection>(); AU.addRequired<ScopInfo>(); - AU.addRequired<TargetData>(); + AU.addRequired<DataLayout>(); AU.addPreserved<CloogInfo>(); AU.addPreserved<Dependences>(); diff --git a/polly/lib/CodeGen/IslCodeGeneration.cpp b/polly/lib/CodeGen/IslCodeGeneration.cpp index 85fa85e8670..48e2eba1d46 100644 --- a/polly/lib/CodeGen/IslCodeGeneration.cpp +++ b/polly/lib/CodeGen/IslCodeGeneration.cpp @@ -38,7 +38,7 @@ #define DEBUG_TYPE "polly-codegen-isl" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" -#include "llvm/Target/TargetData.h" +#include "llvm/DataLayout.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "isl/union_map.h" diff --git a/polly/lib/CodeGen/LoopGenerators.cpp b/polly/lib/CodeGen/LoopGenerators.cpp index 3688898d70a..2b7e58d76e8 100644 --- a/polly/lib/CodeGen/LoopGenerators.cpp +++ b/polly/lib/CodeGen/LoopGenerators.cpp @@ -17,7 +17,7 @@ #include "llvm/Module.h" #include "llvm/Analysis/Dominators.h" -#include "llvm/Target/TargetData.h" +#include "llvm/DataLayout.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" using namespace llvm; @@ -179,7 +179,7 @@ void OMPGenerator::createCallLoopEndNowait() { } IntegerType *OMPGenerator::getIntPtrTy() { - return P->getAnalysis<TargetData>().getIntPtrType(Builder.getContext()); + return P->getAnalysis<DataLayout>().getIntPtrType(Builder.getContext()); } Module *OMPGenerator::getModule() { diff --git a/polly/lib/CodeGen/PTXGenerator.cpp b/polly/lib/CodeGen/PTXGenerator.cpp index fac4c6950fa..efa599eaa88 100644 --- a/polly/lib/CodeGen/PTXGenerator.cpp +++ b/polly/lib/CodeGen/PTXGenerator.cpp @@ -25,7 +25,7 @@ #include "llvm/Support/Debug.h" #include "llvm/Support/FormattedStream.h" #include "llvm/Support/TargetRegistry.h" -#include "llvm/Target/TargetData.h" +#include "llvm/DataLayout.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/Cloning.h" diff --git a/polly/lib/IndVarSimplify.cpp b/polly/lib/IndVarSimplify.cpp index 5ef95ba1a7a..d5201680696 100644 --- a/polly/lib/IndVarSimplify.cpp +++ b/polly/lib/IndVarSimplify.cpp @@ -47,7 +47,7 @@ #include "llvm/Transforms/Utils/Local.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/SimplifyIndVar.h" -#include "llvm/Target/TargetData.h" +#include "llvm/DataLayout.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/Statistic.h" @@ -70,7 +70,7 @@ namespace { LoopInfo *LI; ScalarEvolution *SE; DominatorTree *DT; - TargetData *TD; + DataLayout *TD; SmallVector<WeakVH, 16> DeadInsts; bool Changed; @@ -732,13 +732,13 @@ namespace { class WideIVVisitor : public IVVisitor { ScalarEvolution *SE; - const TargetData *TD; + const DataLayout *TD; public: WideIVInfo WI; WideIVVisitor(PHINode *NarrowIV, ScalarEvolution *SCEV, - const TargetData *TData) : + const DataLayout *TData) : SE(SCEV), TD(TData) { WI.NarrowIV = NarrowIV; } // Implement the interface used by simplifyUsersOfIV. @@ -1461,7 +1461,7 @@ static bool AlmostDeadIV(PHINode *Phi, BasicBlock *LatchBlock, Value *Cond) { /// could at least handle constant BECounts. static PHINode * FindLoopCounter(Loop *L, const SCEV *BECount, - ScalarEvolution *SE, DominatorTree *DT, const TargetData *TD) { + ScalarEvolution *SE, DominatorTree *DT, const DataLayout *TD) { uint64_t BCWidth = SE->getTypeSizeInBits(BECount->getType()); Value *Cond = @@ -1808,7 +1808,7 @@ bool PollyIndVarSimplify::runOnLoop(Loop *L, LPPassManager &LPM) { LI = &getAnalysis<LoopInfo>(); SE = &getAnalysis<ScalarEvolution>(); DT = &getAnalysis<DominatorTree>(); - TD = getAnalysisIfAvailable<TargetData>(); + TD = getAnalysisIfAvailable<DataLayout>(); DeadInsts.clear(); Changed = false; |

