[polly] r199157 - Adapt to DomTree changes in r199104
Chandler Carruth
chandlerc at google.com
Mon Jan 13 14:49:47 PST 2014
Ooof, sorry i didn't update here.
I should work on getting Polly to at least build so that I catch and update
it when refactoring things.
On Mon, Jan 13, 2014 at 2:29 PM, Tobias Grosser <tobias at grosser.es> wrote:
> Author: grosser
> Date: Mon Jan 13 16:29:56 2014
> New Revision: 199157
>
> URL: http://llvm.org/viewvc/llvm-project?rev=199157&view=rev
> Log:
> Adapt to DomTree changes in r199104
>
> Modified:
> polly/trunk/lib/Analysis/ScopDetection.cpp
> 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/Utils.cpp
> polly/trunk/lib/CodePreparation.cpp
> polly/trunk/lib/IndVarSimplify.cpp
> polly/trunk/lib/IndependentBlocks.cpp
>
> Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
> +++ polly/trunk/lib/Analysis/ScopDetection.cpp Mon Jan 13 16:29:56 2014
> @@ -751,7 +751,7 @@ void polly::ScopDetection::verifyAnalysi
> }
>
> void ScopDetection::getAnalysisUsage(AnalysisUsage &AU) const {
> - AU.addRequired<DominatorTree>();
> + AU.addRequired<DominatorTreeWrapperPass>();
> AU.addRequired<PostDominatorTree>();
> AU.addRequired<LoopInfo>();
> AU.addRequired<ScalarEvolution>();
> @@ -784,7 +784,7 @@ INITIALIZE_PASS_BEGIN(ScopDetection, "po
> "Polly - Detect static control parts (SCoPs)",
> false,
> false);
> INITIALIZE_AG_DEPENDENCY(AliasAnalysis);
> -INITIALIZE_PASS_DEPENDENCY(DominatorTree);
> +INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);
> INITIALIZE_PASS_DEPENDENCY(LoopInfo);
> INITIALIZE_PASS_DEPENDENCY(PostDominatorTree);
> INITIALIZE_PASS_DEPENDENCY(RegionInfo);
>
> Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)
> +++ polly/trunk/lib/Analysis/TempScopInfo.cpp Mon Jan 13 16:29:56 2014
> @@ -336,7 +336,7 @@ void TempScopInfo::print(raw_ostream &OS
> }
>
> bool TempScopInfo::runOnFunction(Function &F) {
> - DT = &getAnalysis<DominatorTree>();
> + DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
> PDT = &getAnalysis<PostDominatorTree>();
> SE = &getAnalysis<ScalarEvolution>();
> LI = &getAnalysis<LoopInfo>();
> @@ -355,7 +355,7 @@ bool TempScopInfo::runOnFunction(Functio
>
> void TempScopInfo::getAnalysisUsage(AnalysisUsage &AU) const {
> AU.addRequired<DataLayout>();
> - AU.addRequiredTransitive<DominatorTree>();
> + AU.addRequiredTransitive<DominatorTreeWrapperPass>();
> AU.addRequiredTransitive<PostDominatorTree>();
> AU.addRequiredTransitive<LoopInfo>();
> AU.addRequiredTransitive<ScalarEvolution>();
> @@ -385,7 +385,7 @@ INITIALIZE_PASS_BEGIN(TempScopInfo, "pol
> "Polly - Analyse the LLVM-IR in the detected
> regions",
> false, false);
> INITIALIZE_AG_DEPENDENCY(AliasAnalysis);
> -INITIALIZE_PASS_DEPENDENCY(DominatorTree);
> +INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);
> INITIALIZE_PASS_DEPENDENCY(LoopInfo);
> INITIALIZE_PASS_DEPENDENCY(PostDominatorTree);
> INITIALIZE_PASS_DEPENDENCY(RegionInfo);
>
> Modified: polly/trunk/lib/CodeGen/CodeGeneration.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/CodeGeneration.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/CodeGen/CodeGeneration.cpp (original)
> +++ polly/trunk/lib/CodeGen/CodeGeneration.cpp Mon Jan 13 16:29:56 2014
> @@ -619,7 +619,7 @@ void ClastStmtCodeGen::codegenForOpenMP(
> ClastVars = ClastVarsCopy;
>
> clearDomtree((*LoopBody).getParent()->getParent(),
> - P->getAnalysis<DominatorTree>());
> + P->getAnalysis<DominatorTreeWrapperPass>().getDomTree());
>
> Builder.SetInsertPoint(AfterLoop);
> }
> @@ -907,7 +907,7 @@ void ClastStmtCodeGen::codegen(const cla
> MergeBB->setName("polly.merge");
> BasicBlock *ThenBB = BasicBlock::Create(Context, "polly.then", F);
>
> - DominatorTree &DT = P->getAnalysis<DominatorTree>();
> + DominatorTree &DT =
> P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();
> DT.addNewBlock(ThenBB, CondBB);
> DT.changeImmediateDominator(MergeBB, CondBB);
>
> @@ -1028,7 +1028,7 @@ public:
> virtual void getAnalysisUsage(AnalysisUsage &AU) const {
> AU.addRequired<CloogInfo>();
> AU.addRequired<Dependences>();
> - AU.addRequired<DominatorTree>();
> + AU.addRequired<DominatorTreeWrapperPass>();
> AU.addRequired<RegionInfo>();
> AU.addRequired<ScalarEvolution>();
> AU.addRequired<ScopDetection>();
> @@ -1039,7 +1039,7 @@ public:
> AU.addPreserved<CloogInfo>();
> AU.addPreserved<Dependences>();
> AU.addPreserved<LoopInfo>();
> - AU.addPreserved<DominatorTree>();
> + AU.addPreserved<DominatorTreeWrapperPass>();
> AU.addPreserved<ScopDetection>();
> AU.addPreserved<ScalarEvolution>();
>
> @@ -1061,7 +1061,7 @@ INITIALIZE_PASS_BEGIN(CodeGeneration, "p
> "Polly - Create LLVM-IR from SCoPs", false, false);
> INITIALIZE_PASS_DEPENDENCY(CloogInfo);
> INITIALIZE_PASS_DEPENDENCY(Dependences);
> -INITIALIZE_PASS_DEPENDENCY(DominatorTree);
> +INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);
> INITIALIZE_PASS_DEPENDENCY(RegionInfo);
> INITIALIZE_PASS_DEPENDENCY(ScalarEvolution);
> INITIALIZE_PASS_DEPENDENCY(ScopDetection);
>
> Modified: polly/trunk/lib/CodeGen/IslCodeGeneration.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslCodeGeneration.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/CodeGen/IslCodeGeneration.cpp (original)
> +++ polly/trunk/lib/CodeGen/IslCodeGeneration.cpp Mon Jan 13 16:29:56 2014
> @@ -848,7 +848,7 @@ void IslNodeBuilder::createIf(__isl_take
> BasicBlock *ThenBB = BasicBlock::Create(Context, "polly.then", F);
> BasicBlock *ElseBB = BasicBlock::Create(Context, "polly.else", F);
>
> - DominatorTree &DT = P->getAnalysis<DominatorTree>();
> + DominatorTree &DT =
> P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();
> DT.addNewBlock(ThenBB, CondBB);
> DT.addNewBlock(ElseBB, CondBB);
> DT.changeImmediateDominator(MergeBB, CondBB);
> @@ -1052,7 +1052,7 @@ public:
> virtual void printScop(raw_ostream &OS) const {}
>
> virtual void getAnalysisUsage(AnalysisUsage &AU) const {
> - AU.addRequired<DominatorTree>();
> + AU.addRequired<DominatorTreeWrapperPass>();
> AU.addRequired<IslAstInfo>();
> AU.addRequired<RegionInfo>();
> AU.addRequired<ScalarEvolution>();
> @@ -1063,7 +1063,7 @@ public:
> AU.addPreserved<Dependences>();
>
> AU.addPreserved<LoopInfo>();
> - AU.addPreserved<DominatorTree>();
> + AU.addPreserved<DominatorTreeWrapperPass>();
> AU.addPreserved<IslAstInfo>();
> AU.addPreserved<ScopDetection>();
> AU.addPreserved<ScalarEvolution>();
> @@ -1085,7 +1085,7 @@ Pass *polly::createIslCodeGenerationPass
> INITIALIZE_PASS_BEGIN(IslCodeGeneration, "polly-codegen-isl",
> "Polly - Create LLVM-IR from SCoPs", false, false);
> INITIALIZE_PASS_DEPENDENCY(Dependences);
> -INITIALIZE_PASS_DEPENDENCY(DominatorTree);
> +INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);
> INITIALIZE_PASS_DEPENDENCY(LoopInfo);
> INITIALIZE_PASS_DEPENDENCY(RegionInfo);
> INITIALIZE_PASS_DEPENDENCY(ScalarEvolution);
>
> Modified: polly/trunk/lib/CodeGen/LoopGenerators.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/LoopGenerators.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/CodeGen/LoopGenerators.cpp (original)
> +++ polly/trunk/lib/CodeGen/LoopGenerators.cpp Mon Jan 13 16:29:56 2014
> @@ -50,7 +50,7 @@ Value *polly::createLoop(Value *LB, Valu
> IRBuilder<> &Builder, Pass *P, BasicBlock
> *&ExitBB,
> ICmpInst::Predicate Predicate) {
>
> - DominatorTree &DT = P->getAnalysis<DominatorTree>();
> + DominatorTree &DT =
> P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();
> LoopInfo &LI = P->getAnalysis<LoopInfo>();
> Function *F = Builder.GetInsertBlock()->getParent();
> LLVMContext &Context = F->getContext();
> @@ -279,7 +279,7 @@ Value *OMPGenerator::createSubfunction(V
> CheckNextBB = BasicBlock::Create(Context, "omp.checkNext", FN);
> LoadIVBoundsBB = BasicBlock::Create(Context, "omp.loadIVBounds", FN);
>
> - DominatorTree &DT = P->getAnalysis<DominatorTree>();
> + DominatorTree &DT =
> P->getAnalysis<DominatorTreeWrapperPass>().getDomTree();
> DT.addNewBlock(HeaderBB, PrevBB);
> DT.addNewBlock(ExitBB, HeaderBB);
> DT.addNewBlock(CheckNextBB, HeaderBB);
>
> Modified: polly/trunk/lib/CodeGen/Utils.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/Utils.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/CodeGen/Utils.cpp (original)
> +++ polly/trunk/lib/CodeGen/Utils.cpp Mon Jan 13 16:29:56 2014
> @@ -23,7 +23,8 @@ BasicBlock *polly::executeScopConditiona
> BasicBlock *StartBlock, *SplitBlock, *NewBlock;
> Region &R = S.getRegion();
> IRBuilder<> Builder(R.getEntry());
> - DominatorTree &DT = PassInfo->getAnalysis<DominatorTree>();
> + DominatorTree &DT =
> + PassInfo->getAnalysis<DominatorTreeWrapperPass>().getDomTree();
> RegionInfo &RI = PassInfo->getAnalysis<RegionInfo>();
>
> // Split the entry edge of the region and generate a new basic block on
> this
>
> Modified: polly/trunk/lib/CodePreparation.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodePreparation.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/CodePreparation.cpp (original)
> +++ polly/trunk/lib/CodePreparation.cpp Mon Jan 13 16:29:56 2014
> @@ -151,7 +151,7 @@ void CodePreparation::getAnalysisUsage(A
>
> AU.addPreserved<LoopInfo>();
> AU.addPreserved<RegionInfo>();
> - AU.addPreserved<DominatorTree>();
> + AU.addPreserved<DominatorTreeWrapperPass>();
> AU.addPreserved<DominanceFrontier>();
> }
>
>
> Modified: polly/trunk/lib/IndVarSimplify.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndVarSimplify.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/IndVarSimplify.cpp (original)
> +++ polly/trunk/lib/IndVarSimplify.cpp Mon Jan 13 16:29:56 2014
> @@ -84,7 +84,7 @@ public:
> virtual bool runOnLoop(Loop *L, LPPassManager &LPM);
>
> virtual void getAnalysisUsage(AnalysisUsage &AU) const {
> - AU.addRequired<DominatorTree>();
> + AU.addRequired<DominatorTreeWrapperPass>();
> AU.addRequired<LoopInfo>();
> AU.addRequired<ScalarEvolution>();
> AU.addRequiredID(LoopSimplifyID);
> @@ -1808,7 +1808,7 @@ bool PollyIndVarSimplify::runOnLoop(Loop
> IU = &getAnalysis<IVUsers>();
> LI = &getAnalysis<LoopInfo>();
> SE = &getAnalysis<ScalarEvolution>();
> - DT = &getAnalysis<DominatorTree>();
> + DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
> TD = getAnalysisIfAvailable<DataLayout>();
>
> DeadInsts.clear();
> @@ -2003,7 +2003,7 @@ bool PollyIndVarSimplify::runOnLoop(Loop
> INITIALIZE_PASS_BEGIN(PollyIndVarSimplify, "polly-indvars",
> "Induction Variable Simplification (Polly version)",
> false, false);
> -INITIALIZE_PASS_DEPENDENCY(DominatorTree);
> +INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);
> INITIALIZE_PASS_DEPENDENCY(LoopInfo);
> INITIALIZE_PASS_DEPENDENCY(ScalarEvolution);
> INITIALIZE_PASS_DEPENDENCY(LoopSimplify);
>
> Modified: polly/trunk/lib/IndependentBlocks.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndependentBlocks.cpp?rev=199157&r1=199156&r2=199157&view=diff
>
> ==============================================================================
> --- polly/trunk/lib/IndependentBlocks.cpp (original)
> +++ polly/trunk/lib/IndependentBlocks.cpp Mon Jan 13 16:29:56 2014
> @@ -507,7 +507,7 @@ bool IndependentBlocks::areAllBlocksInde
> void IndependentBlocks::getAnalysisUsage(AnalysisUsage &AU) const {
> // FIXME: If we set preserves cfg, the cfg only passes do not need to
> // be "addPreserved"?
> - AU.addPreserved<DominatorTree>();
> + AU.addPreserved<DominatorTreeWrapperPass>();
> AU.addPreserved<DominanceFrontier>();
> AU.addPreserved<PostDominatorTree>();
> AU.addRequired<RegionInfo>();
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140113/d00d6d7a/attachment.html>
More information about the llvm-commits
mailing list