[polly] r247280 - [NFC] Remove obsolete arguments
Johannes Doerfert via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 10 06:12:03 PDT 2015
Author: jdoerfert
Date: Thu Sep 10 08:12:02 2015
New Revision: 247280
URL: http://llvm.org/viewvc/llvm-project?rev=247280&view=rev
Log:
[NFC] Remove obsolete arguments
Remove some arguments that survived the recent changes but are not
used any more.
Modified:
polly/trunk/include/polly/ScopInfo.h
polly/trunk/lib/Analysis/ScopInfo.cpp
Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=247280&r1=247279&r2=247280&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Thu Sep 10 08:12:02 2015
@@ -589,11 +589,11 @@ public:
const ScopStmt &operator=(const ScopStmt &) = delete;
/// Create the ScopStmt from a BasicBlock.
- ScopStmt(Scop &parent, TempScop &tempScop, const Region &CurRegion,
- BasicBlock &bb, SmallVectorImpl<Loop *> &NestLoops);
+ ScopStmt(Scop &parent, TempScop &tempScop, BasicBlock &bb,
+ SmallVectorImpl<Loop *> &NestLoops);
/// Create an overapproximating ScopStmt for the region @p R.
- ScopStmt(Scop &parent, TempScop &tempScop, const Region &CurRegion, Region &R,
+ ScopStmt(Scop &parent, TempScop &tempScop, Region &R,
SmallVectorImpl<Loop *> &NestLoops);
private:
@@ -659,7 +659,7 @@ private:
/// Build the statement.
//@{
- void buildDomain(TempScop &tempScop, const Region &CurRegion);
+ void buildDomain();
/// @brief Create the accesses for instructions in @p Block.
///
@@ -1084,10 +1084,8 @@ private:
/// @param BB The basic block we build the statement for (or null)
/// @param R The region we build the statement for (or null).
/// @param tempScop The temp SCoP we use as model.
- /// @param CurRegion The SCoP region.
/// @param NestLoops A vector of all surrounding loops.
ScopStmt *addScopStmt(BasicBlock *BB, Region *R, TempScop &tempScop,
- const Region &CurRegion,
SmallVectorImpl<Loop *> &NestLoops);
/// @brief Create the ScopStmt for a BasicBlock and return its schedule.
@@ -1096,12 +1094,10 @@ private:
///
/// @param BB The basic block we build the statement for.
/// @param tempScop The temp SCoP we use as model.
- /// @param CurRegion The SCoP region.
/// @param NestLoops A vector of all surrounding loops.
///
/// @return The ScopStmt's schedule.
__isl_give isl_schedule *buildBBScopStmt(BasicBlock *BB, TempScop &tempScop,
- const Region &CurRegion,
SmallVectorImpl<Loop *> &NestLoops);
/// @brief Build Scop and ScopStmts from a given TempScop.
Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=247280&r1=247279&r2=247280&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Thu Sep 10 08:12:02 2015
@@ -903,7 +903,7 @@ buildConditionSets(Scop &S, BranchInst *
isl_set_intersect(AlternativeCondSet, isl_set_copy(Domain))));
}
-void ScopStmt::buildDomain(TempScop &tempScop, const Region &CurRegion) {
+void ScopStmt::buildDomain() {
isl_id *Id;
Id = isl_id_alloc(getIslCtx(), getBaseName(), this);
@@ -968,8 +968,8 @@ void ScopStmt::deriveAssumptions(BasicBl
deriveAssumptionsFromGEP(GEP);
}
-ScopStmt::ScopStmt(Scop &parent, TempScop &tempScop, const Region &CurRegion,
- Region &R, SmallVectorImpl<Loop *> &Nest)
+ScopStmt::ScopStmt(Scop &parent, TempScop &tempScop, Region &R,
+ SmallVectorImpl<Loop *> &Nest)
: Parent(parent), BB(nullptr), R(&R), Build(nullptr),
NestLoops(Nest.size()) {
// Setup the induction variables.
@@ -978,7 +978,7 @@ ScopStmt::ScopStmt(Scop &parent, TempSco
BaseName = getIslCompatibleName("Stmt_", R.getNameStr(), "");
- buildDomain(tempScop, CurRegion);
+ buildDomain();
BasicBlock *EntryBB = R.getEntry();
for (BasicBlock *Block : R.blocks()) {
@@ -989,8 +989,8 @@ ScopStmt::ScopStmt(Scop &parent, TempSco
checkForReductions();
}
-ScopStmt::ScopStmt(Scop &parent, TempScop &tempScop, const Region &CurRegion,
- BasicBlock &bb, SmallVectorImpl<Loop *> &Nest)
+ScopStmt::ScopStmt(Scop &parent, TempScop &tempScop, BasicBlock &bb,
+ SmallVectorImpl<Loop *> &Nest)
: Parent(parent), BB(&bb), R(nullptr), Build(nullptr),
NestLoops(Nest.size()) {
// Setup the induction variables.
@@ -999,7 +999,7 @@ ScopStmt::ScopStmt(Scop &parent, TempSco
BaseName = getIslCompatibleName("Stmt_", &bb, "");
- buildDomain(tempScop, CurRegion);
+ buildDomain();
buildAccesses(tempScop, BB);
deriveAssumptions(BB);
if (DetectReductions)
@@ -2449,16 +2449,15 @@ mapToDimension(__isl_take isl_union_set
}
ScopStmt *Scop::addScopStmt(BasicBlock *BB, Region *R, TempScop &tempScop,
- const Region &CurRegion,
SmallVectorImpl<Loop *> &NestLoops) {
ScopStmt *Stmt;
if (BB) {
- Stmts.emplace_back(*this, tempScop, CurRegion, *BB, NestLoops);
+ Stmts.emplace_back(*this, tempScop, *BB, NestLoops);
Stmt = &Stmts.back();
StmtMap[BB] = Stmt;
} else {
assert(R && "Either basic block or a region expected.");
- Stmts.emplace_back(*this, tempScop, CurRegion, *R, NestLoops);
+ Stmts.emplace_back(*this, tempScop, *R, NestLoops);
Stmt = &Stmts.back();
for (BasicBlock *BB : R->blocks())
StmtMap[BB] = Stmt;
@@ -2468,12 +2467,11 @@ ScopStmt *Scop::addScopStmt(BasicBlock *
__isl_give isl_schedule *
Scop::buildBBScopStmt(BasicBlock *BB, TempScop &tempScop,
- const Region &CurRegion,
SmallVectorImpl<Loop *> &NestLoops) {
if (isTrivialBB(BB, tempScop))
return nullptr;
- auto *Stmt = addScopStmt(BB, nullptr, tempScop, CurRegion, NestLoops);
+ auto *Stmt = addScopStmt(BB, nullptr, tempScop, NestLoops);
auto *Domain = Stmt->getDomain();
return isl_schedule_from_domain(isl_union_set_from_set(Domain));
}
@@ -2484,7 +2482,7 @@ __isl_give isl_schedule *Scop::buildScop
LoopInfo &LI, ScopDetection &SD) {
if (SD.isNonAffineSubRegion(&CurRegion, &getRegion())) {
auto *Stmt = addScopStmt(nullptr, const_cast<Region *>(&CurRegion),
- tempScop, CurRegion, NestLoops);
+ tempScop, NestLoops);
auto *Domain = Stmt->getDomain();
return isl_schedule_from_domain(isl_union_set_from_set(Domain));
}
@@ -2505,8 +2503,8 @@ __isl_give isl_schedule *Scop::buildScop
StmtSchedule =
buildScop(tempScop, *I->getNodeAs<Region>(), NestLoops, LI, SD);
} else {
- StmtSchedule = buildBBScopStmt(I->getNodeAs<BasicBlock>(), tempScop,
- CurRegion, NestLoops);
+ StmtSchedule =
+ buildBBScopStmt(I->getNodeAs<BasicBlock>(), tempScop, NestLoops);
}
Schedule = combineInSequence(Schedule, StmtSchedule);
}
More information about the llvm-commits
mailing list