[llvm-commits] [polly] r165408 - in /polly/trunk: include/polly/TempScopInfo.h lib/Analysis/TempScopInfo.cpp lib/CodeGen/CodeGeneration.cpp lib/CodeGen/IslCodeGeneration.cpp lib/CodeGen/LoopGenerators.cpp lib/CodeGen/PTXGenerator.cpp lib/IndVarSimplify.cpp
Micah Villmow
villmow at gmail.com
Mon Oct 8 10:26:19 PDT 2012
Author: mvillmow
Date: Mon Oct 8 12:26:19 2012
New Revision: 165408
URL: http://llvm.org/viewvc/llvm-project?rev=165408&view=rev
Log:
Move TargetData to DataLayout to fix build breakage caused by LLVM r16540
Modified:
polly/trunk/include/polly/TempScopInfo.h
polly/trunk/lib/Analysis/TempScopInfo.cpp
polly/trunk/lib/CodeGen/CodeGeneration.cpp
polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
polly/trunk/lib/CodeGen/LoopGenerators.cpp
polly/trunk/lib/CodeGen/PTXGenerator.cpp
polly/trunk/lib/IndVarSimplify.cpp
Modified: polly/trunk/include/polly/TempScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/TempScopInfo.h?rev=165408&r1=165407&r2=165408&view=diff
==============================================================================
--- polly/trunk/include/polly/TempScopInfo.h (original)
+++ polly/trunk/include/polly/TempScopInfo.h Mon Oct 8 12:26:19 2012
@@ -23,7 +23,7 @@
#include "llvm/Instructions.h"
namespace llvm {
- class TargetData;
+ class DataLayout;
}
using namespace llvm;
@@ -228,7 +228,7 @@
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;
Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=165408&r1=165407&r2=165408&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/TempScopInfo.cpp Mon Oct 8 12:26:19 2012
@@ -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 @@
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 @@
}
void TempScopInfo::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetData>();
+ AU.addRequired<DataLayout>();
AU.addRequiredTransitive<DominatorTree>();
AU.addRequiredTransitive<PostDominatorTree>();
AU.addRequiredTransitive<LoopInfo>();
Modified: polly/trunk/lib/CodeGen/CodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/CodeGeneration.cpp?rev=165408&r1=165407&r2=165408&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/CodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/CodeGeneration.cpp Mon Oct 8 12:26:19 2012
@@ -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 @@
}
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 @@
AU.addRequired<ScalarEvolution>();
AU.addRequired<ScopDetection>();
AU.addRequired<ScopInfo>();
- AU.addRequired<TargetData>();
+ AU.addRequired<DataLayout>();
AU.addPreserved<CloogInfo>();
AU.addPreserved<Dependences>();
Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=165408&r1=165407&r2=165408&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Mon Oct 8 12:26:19 2012
@@ -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"
Modified: polly/trunk/lib/CodeGen/LoopGenerators.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=165408&r1=165407&r2=165408&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/LoopGenerators.cpp (original)
+++ polly/trunk/lib/CodeGen/LoopGenerators.cpp Mon Oct 8 12:26:19 2012
@@ -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 @@
}
IntegerType *OMPGenerator::getIntPtrTy() {
- return P->getAnalysis<TargetData>().getIntPtrType(Builder.getContext());
+ return P->getAnalysis<DataLayout>().getIntPtrType(Builder.getContext());
}
Module *OMPGenerator::getModule() {
Modified: polly/trunk/lib/CodeGen/PTXGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/PTXGenerator.cpp?rev=165408&r1=165407&r2=165408&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/PTXGenerator.cpp (original)
+++ polly/trunk/lib/CodeGen/PTXGenerator.cpp Mon Oct 8 12:26:19 2012
@@ -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"
Modified: polly/trunk/lib/IndVarSimplify.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndVarSimplify.cpp?rev=165408&r1=165407&r2=165408&view=diff
==============================================================================
--- polly/trunk/lib/IndVarSimplify.cpp (original)
+++ polly/trunk/lib/IndVarSimplify.cpp Mon Oct 8 12:26:19 2012
@@ -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 @@
LoopInfo *LI;
ScalarEvolution *SE;
DominatorTree *DT;
- TargetData *TD;
+ DataLayout *TD;
SmallVector<WeakVH, 16> DeadInsts;
bool Changed;
@@ -732,13 +732,13 @@
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 @@
/// 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 @@
LI = &getAnalysis<LoopInfo>();
SE = &getAnalysis<ScalarEvolution>();
DT = &getAnalysis<DominatorTree>();
- TD = getAnalysisIfAvailable<TargetData>();
+ TD = getAnalysisIfAvailable<DataLayout>();
DeadInsts.clear();
Changed = false;
More information about the llvm-commits
mailing list