[polly] r226398 - [PM] Update Polly for LLVM r226394 and r226396 which changed some of the
Chandler Carruth
chandlerc at gmail.com
Sun Jan 18 02:52:23 PST 2015
Author: chandlerc
Date: Sun Jan 18 04:52:23 2015
New Revision: 226398
URL: http://llvm.org/viewvc/llvm-project?rev=226398&view=rev
Log:
[PM] Update Polly for LLVM r226394 and r226396 which changed some of the
block splitting interfaces to accept specific analyses rather than
a pass.
Modified:
polly/trunk/lib/CodeGen/BlockGenerators.cpp
polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
polly/trunk/lib/CodeGen/LoopGenerators.cpp
polly/trunk/lib/Support/ScopHelper.cpp
Modified: polly/trunk/lib/CodeGen/BlockGenerators.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/BlockGenerators.cpp?rev=226398&r1=226397&r2=226398&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/BlockGenerators.cpp (original)
+++ polly/trunk/lib/CodeGen/BlockGenerators.cpp Sun Jan 18 04:52:23 2015
@@ -238,9 +238,14 @@ void BlockGenerator::copyInstruction(con
}
void BlockGenerator::copyBB(ValueMapT &GlobalMap, LoopToScevMapT <S) {
+ auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
+ auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
+ auto *LIWP = P->getAnalysisIfAvailable<LoopInfoWrapperPass>();
+ auto *LI = LIWP ? &LIWP->getLoopInfo() : nullptr;;
+
BasicBlock *BB = Statement.getBasicBlock();
BasicBlock *CopyBB =
- SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), P);
+ SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), DT, LI);
CopyBB->setName("polly.stmt." + BB->getName());
Builder.SetInsertPoint(CopyBB->begin());
@@ -572,9 +577,14 @@ void VectorBlockGenerator::copyInstructi
}
void VectorBlockGenerator::copyBB() {
+ auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
+ auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
+ auto *LIWP = P->getAnalysisIfAvailable<LoopInfoWrapperPass>();
+ auto *LI = LIWP ? &LIWP->getLoopInfo() : nullptr;;
+
BasicBlock *BB = Statement.getBasicBlock();
BasicBlock *CopyBB =
- SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), P);
+ SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), DT, LI);
CopyBB->setName("polly.stmt." + BB->getName());
Builder.SetInsertPoint(CopyBB->begin());
Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=226398&r1=226397&r2=226398&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Sun Jan 18 04:52:23 2015
@@ -698,9 +698,9 @@ void IslNodeBuilder::createIf(__isl_take
LLVMContext &Context = F->getContext();
BasicBlock *CondBB =
- SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), P);
+ SplitBlock(Builder.GetInsertBlock(), Builder.GetInsertPoint(), &DT, &LI);
CondBB->setName("polly.cond");
- BasicBlock *MergeBB = SplitBlock(CondBB, CondBB->begin(), P);
+ BasicBlock *MergeBB = SplitBlock(CondBB, CondBB->begin(), &DT, &LI);
MergeBB->setName("polly.merge");
BasicBlock *ThenBB = BasicBlock::Create(Context, "polly.then", F);
BasicBlock *ElseBB = BasicBlock::Create(Context, "polly.else", F);
Modified: polly/trunk/lib/CodeGen/LoopGenerators.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=226398&r1=226397&r2=226398&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/LoopGenerators.cpp (original)
+++ polly/trunk/lib/CodeGen/LoopGenerators.cpp Sun Jan 18 04:52:23 2015
@@ -92,7 +92,7 @@ Value *polly::createLoop(Value *LB, Valu
Annotator->pushLoop(NewLoop, Parallel);
// ExitBB
- ExitBB = SplitBlock(BeforeBB, Builder.GetInsertPoint()++, P);
+ ExitBB = SplitBlock(BeforeBB, Builder.GetInsertPoint()++, &DT, &LI);
ExitBB->setName("polly.loop_exit");
// BeforeBB
Modified: polly/trunk/lib/Support/ScopHelper.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Support/ScopHelper.cpp?rev=226398&r1=226397&r2=226398&view=diff
==============================================================================
--- polly/trunk/lib/Support/ScopHelper.cpp (original)
+++ polly/trunk/lib/Support/ScopHelper.cpp Sun Jan 18 04:52:23 2015
@@ -13,6 +13,7 @@
#include "polly/Support/ScopHelper.h"
#include "polly/ScopInfo.h"
+#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/RegionInfo.h"
#include "llvm/Analysis/ScalarEvolution.h"
@@ -89,7 +90,13 @@ BasicBlock *polly::createSingleExitEdge(
if (R->contains(*PI))
Preds.push_back(*PI);
- return SplitBlockPredecessors(BB, Preds, ".region", P);
+ auto *AA = P->getAnalysisIfAvailable<AliasAnalysis>();
+ auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
+ auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
+ auto *LIWP = P->getAnalysisIfAvailable<LoopInfoWrapperPass>();
+ auto *LI = LIWP ? &LIWP->getLoopInfo() : nullptr;
+
+ return SplitBlockPredecessors(BB, Preds, ".region", AA, DT, LI);
}
static void replaceScopAndRegionEntry(polly::Scop *S, BasicBlock *OldEntry,
@@ -110,7 +117,12 @@ BasicBlock *polly::simplifyRegion(Scop *
// Create single entry edge if the region has multiple entry edges.
if (!EnteringBB) {
- NewEntry = SplitBlock(OldEntry, OldEntry->begin(), P);
+ auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
+ auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
+ auto *LIWP = P->getAnalysisIfAvailable<LoopInfoWrapperPass>();
+ auto *LI = LIWP ? &LIWP->getLoopInfo() : nullptr;
+
+ NewEntry = SplitBlock(OldEntry, OldEntry->begin(), DT, LI);
EnteringBB = OldEntry;
}
@@ -171,8 +183,13 @@ void polly::splitEntryBlockForAlloca(Bas
while (isa<AllocaInst>(I))
++I;
+ auto *DTWP = P->getAnalysisIfAvailable<DominatorTreeWrapperPass>();
+ auto *DT = DTWP ? &DTWP->getDomTree() : nullptr;
+ auto *LIWP = P->getAnalysisIfAvailable<LoopInfoWrapperPass>();
+ auto *LI = LIWP ? &LIWP->getLoopInfo() : nullptr;
+
// SplitBlock updates DT, DF and LI.
- BasicBlock *NewEntry = SplitBlock(EntryBlock, I, P);
+ BasicBlock *NewEntry = SplitBlock(EntryBlock, I, DT, LI);
if (RegionInfoPass *RIP = P->getAnalysisIfAvailable<RegionInfoPass>())
RIP->getRegionInfo().splitBlock(NewEntry, EntryBlock);
}
More information about the llvm-commits
mailing list