[polly] r215183 - [Fix] Broken build after r215121
Johannes Doerfert
jdoerfert at codeaurora.org
Thu Aug 7 21:23:14 PDT 2014
Author: jdoerfert
Date: Thu Aug 7 23:23:13 2014
New Revision: 215183
URL: http://llvm.org/viewvc/llvm-project?rev=215183&view=rev
Log:
[Fix] Broken build after r215121
Modified:
polly/trunk/lib/CodeGen/CodeGeneration.cpp
Modified: polly/trunk/lib/CodeGen/CodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/CodeGeneration.cpp?rev=215183&r1=215182&r2=215183&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/CodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/CodeGeneration.cpp Thu Aug 7 23:23:13 2014
@@ -243,6 +243,9 @@ private:
// The Scop we code generate.
Scop *S;
Pass *P;
+ LoopInfo &LI;
+ ScalarEvolution &SE;
+ DominatorTree &DT;
// The Builder specifies the current location to code generate at.
PollyIRBuilder &Builder;
@@ -463,7 +466,8 @@ void ClastStmtCodeGen::codegen(const cla
int VectorDimensions = IVS ? IVS->size() : 1;
if (VectorDimensions == 1) {
- BlockGenerator::generate(Builder, *Statement, ValueMap, LoopToScev, P);
+ BlockGenerator::generate(Builder, *Statement, ValueMap, LoopToScev, P, LI,
+ SE);
isl_set_free(Domain);
return;
}
@@ -491,7 +495,7 @@ void ClastStmtCodeGen::codegen(const cla
isl_map *Schedule = extractPartialSchedule(Statement, Domain);
VectorBlockGenerator::generate(Builder, *Statement, VectorMap, VLTS, Schedule,
- P);
+ P, LI, SE);
isl_map_free(Schedule);
}
@@ -509,7 +513,7 @@ void ClastStmtCodeGen::codegenForSequent
UpperBound = ExpGen.codegen(f->UB, IntPtrTy);
Stride = Builder.getInt(APInt_from_MPZ(f->stride));
- IV = createLoop(LowerBound, UpperBound, Stride, Builder, P, ExitBlock,
+ IV = createLoop(LowerBound, UpperBound, Stride, Builder, P, LI, DT, ExitBlock,
CmpInst::ICMP_SLE);
// Add loop iv to symbols.
@@ -772,7 +776,7 @@ void ClastStmtCodeGen::codegenForGPGPU(c
LowerBound = ExpGen.codegen(InnerFor->LB, IntPtrTy);
UpperBound = ExpGen.codegen(InnerFor->UB, IntPtrTy);
Stride = Builder.getInt(APInt_from_MPZ(InnerFor->stride));
- IV = createLoop(LowerBound, UpperBound, Stride, Builder, P, AfterBB,
+ IV = createLoop(LowerBound, UpperBound, Stride, Builder, P, LI, DT, AfterBB,
CmpInst::ICMP_SLE);
const Value *OldIV_ = Statement->getInductionVariableForDimension(2);
Value *OldIV = const_cast<Value *>(OldIV_);
@@ -781,7 +785,8 @@ void ClastStmtCodeGen::codegenForGPGPU(c
updateWithValueMap(VMap);
- BlockGenerator::generate(Builder, *Statement, ValueMap, LoopToScev, P);
+ BlockGenerator::generate(Builder, *Statement, ValueMap, LoopToScev, P, LI,
+ SE);
if (AfterBB)
Builder.SetInsertPoint(AfterBB->begin());
@@ -1029,7 +1034,10 @@ void ClastStmtCodeGen::codegen(const cla
}
ClastStmtCodeGen::ClastStmtCodeGen(Scop *scop, PollyIRBuilder &B, Pass *P)
- : S(scop), P(P), Builder(B), ExpGen(Builder, ClastVars) {}
+ : S(scop), P(P), LI(P->getAnalysis<LoopInfo>()),
+ SE(P->getAnalysis<ScalarEvolution>()),
+ DT(P->getAnalysis<DominatorTreeWrapperPass>().getDomTree()), Builder(B),
+ ExpGen(Builder, ClastVars) {}
namespace {
class CodeGeneration : public ScopPass {
More information about the llvm-commits
mailing list