Index: llvm/trunk/include/llvm/InitializePasses.h =================================================================== --- llvm/trunk/include/llvm/InitializePasses.h +++ llvm/trunk/include/llvm/InitializePasses.h @@ -159,7 +159,7 @@ void initializeIntervalPartitionPass(PassRegistry&); void initializeJumpThreadingPass(PassRegistry&); void initializeLCSSAWrapperPassPass(PassRegistry &); -void initializeLegacyLICMPassPass(PassRegistry&); +void initializeLICMPass(PassRegistry&); void initializeLazyValueInfoWrapperPassPass(PassRegistry&); void initializeLintPass(PassRegistry&); void initializeLiveDebugValuesPass(PassRegistry&); Index: llvm/trunk/include/llvm/Transforms/Scalar/LICM.h =================================================================== --- llvm/trunk/include/llvm/Transforms/Scalar/LICM.h +++ llvm/trunk/include/llvm/Transforms/Scalar/LICM.h @@ -1,48 +0,0 @@ -//===- LICM.h - Loop Invariant Code Motion Pass -------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This pass performs loop invariant code motion, attempting to remove as much -// code from the body of a loop as possible. It does this by either hoisting -// code into the preheader block, or by sinking code to the exit blocks if it is -// safe. This pass also promotes must-aliased memory locations in the loop to -// live in registers, thus hoisting and sinking "invariant" loads and stores. -// -// This pass uses alias analysis for two purposes: -// -// 1. Moving loop invariant loads and calls out of loops. If we can determine -// that a load or call inside of a loop never aliases anything stored to, -// we can hoist it or sink it like any other instruction. -// 2. Scalar Promotion of Memory - If there is a store instruction inside of -// the loop, we try to move the store to happen AFTER the loop instead of -// inside of the loop. This can only happen if a few conditions are true: -// A. The pointer stored through is loop invariant -// B. There are no stores or loads in the loop which _may_ alias the -// pointer. There are no calls in the loop which mod/ref the pointer. -// If these conditions are true, we can promote the loads and stores in the -// loop of the pointer to use a temporary alloca'd variable. We then use -// the SSAUpdater to construct the appropriate SSA form for the value. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_TRANSFORMS_SCALAR_LICM_H -#define LLVM_TRANSFORMS_SCALAR_LICM_H - -#include "llvm/Analysis/LoopInfo.h" -#include "llvm/IR/PassManager.h" - -namespace llvm { - -/// Performs Loop Invariant Code Motion Pass. -class LICMPass : public PassInfoMixin { -public: - PreservedAnalyses run(Loop &L, AnalysisManager &AM); -}; -} // end namespace llvm - -#endif // LLVM_TRANSFORMS_SCALAR_LICM_H Index: llvm/trunk/lib/LTO/LTOCodeGenerator.cpp =================================================================== --- llvm/trunk/lib/LTO/LTOCodeGenerator.cpp +++ llvm/trunk/lib/LTO/LTOCodeGenerator.cpp @@ -122,7 +122,7 @@ initializePostOrderFunctionAttrsLegacyPassPass(R); initializeReversePostOrderFunctionAttrsLegacyPassPass(R); initializeGlobalsAAWrapperPassPass(R); - initializeLegacyLICMPassPass(R); + initializeLICMPass(R); initializeMergedLoadStoreMotionLegacyPassPass(R); initializeGVNLegacyPassPass(R); initializeMemCpyOptLegacyPassPass(R); Index: llvm/trunk/lib/Passes/PassBuilder.cpp =================================================================== --- llvm/trunk/lib/Passes/PassBuilder.cpp +++ llvm/trunk/lib/Passes/PassBuilder.cpp @@ -88,7 +88,6 @@ #include "llvm/Transforms/Scalar/GuardWidening.h" #include "llvm/Transforms/Scalar/IndVarSimplify.h" #include "llvm/Transforms/Scalar/JumpThreading.h" -#include "llvm/Transforms/Scalar/LICM.h" #include "llvm/Transforms/Scalar/LoopRotation.h" #include "llvm/Transforms/Scalar/LoopSimplifyCFG.h" #include "llvm/Transforms/Scalar/LowerAtomic.h" Index: llvm/trunk/lib/Passes/PassRegistry.def =================================================================== --- llvm/trunk/lib/Passes/PassRegistry.def +++ llvm/trunk/lib/Passes/PassRegistry.def @@ -187,7 +187,6 @@ #define LOOP_PASS(NAME, CREATE_PASS) #endif LOOP_PASS("invalidate", InvalidateAllAnalysesPass()) -LOOP_PASS("licm", LICMPass()) LOOP_PASS("rotate", LoopRotatePass()) LOOP_PASS("no-op-loop", NoOpLoopPass()) LOOP_PASS("print", PrintLoopPass(dbgs())) Index: llvm/trunk/lib/Transforms/Scalar/LICM.cpp =================================================================== --- llvm/trunk/lib/Transforms/Scalar/LICM.cpp +++ llvm/trunk/lib/Transforms/Scalar/LICM.cpp @@ -30,7 +30,6 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Scalar/LICM.h" #include "llvm/ADT/Statistic.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/AliasSetTracker.h" @@ -41,7 +40,6 @@ #include "llvm/Analysis/Loads.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/LoopPass.h" -#include "llvm/Analysis/LoopPassManager.h" #include "llvm/Analysis/MemoryBuiltins.h" #include "llvm/Analysis/ScalarEvolution.h" #include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" @@ -106,39 +104,13 @@ LoopSafetyInfo *SafetyInfo); namespace { -struct LoopInvariantCodeMotion { - bool runOnLoop(Loop *L, AliasAnalysis *AA, LoopInfo *LI, DominatorTree *DT, - TargetLibraryInfo *TLI, ScalarEvolution *SE); - - DenseMap &getLoopToAliasSetMap() { - return LoopToAliasSetMap; - } - -private: - DenseMap LoopToAliasSetMap; - - AliasSetTracker *collectAliasInfoForLoop(Loop *L, LoopInfo *LI, - AliasAnalysis *AA); -}; - -struct LegacyLICMPass : public LoopPass { +struct LICM : public LoopPass { static char ID; // Pass identification, replacement for typeid - LegacyLICMPass() : LoopPass(ID) { - initializeLegacyLICMPassPass(*PassRegistry::getPassRegistry()); + LICM() : LoopPass(ID) { + initializeLICMPass(*PassRegistry::getPassRegistry()); } - bool runOnLoop(Loop *L, LPPassManager &LPM) override { - if (skipLoop(L)) - return false; - - auto *SE = getAnalysisIfAvailable(); - return LICM.runOnLoop(L, - &getAnalysis().getAAResults(), - &getAnalysis().getLoopInfo(), - &getAnalysis().getDomTree(), - &getAnalysis().getTLI(), - SE ? &SE->getSE() : nullptr); - } + bool runOnLoop(Loop *L, LPPassManager &LPM) override; /// This transformation requires natural loop information & requires that /// loop preheaders be inserted into the CFG... @@ -152,13 +124,23 @@ using llvm::Pass::doFinalization; bool doFinalization() override { - assert(LICM.getLoopToAliasSetMap().empty() && - "Didn't free loop alias sets"); + assert(LoopToAliasSetMap.empty() && "Didn't free loop alias sets"); return false; } private: - LoopInvariantCodeMotion LICM; + AliasAnalysis *AA; // Current AliasAnalysis information + LoopInfo *LI; // Current LoopInfo + DominatorTree *DT; // Dominator Tree for the current Loop. + + TargetLibraryInfo *TLI; // TargetLibraryInfo for constant folding. + + // State that is updated as we process loops. + bool Changed; // Set to true when we change anything. + BasicBlock *Preheader; // The preheader block of the current loop... + Loop *CurLoop; // The current loop we are working on... + AliasSetTracker *CurAST; // AliasSet information for the current loop... + DenseMap LoopToAliasSetMap; /// cloneBasicBlockAnalysis - Simple Analysis hook. Clone alias set info. void cloneBasicBlockAnalysis(BasicBlock *From, BasicBlock *To, @@ -170,63 +152,48 @@ /// Simple Analysis hook. Delete loop L from alias set map. void deleteAnalysisLoop(Loop *L) override; -}; -} - -PreservedAnalyses LICMPass::run(Loop &L, AnalysisManager &AM) { - // FIXME: Check if loop should be skipped. - const auto &FAM = - AM.getResult(L).getManager(); - Function *F = L.getHeader()->getParent(); - - auto *AA = FAM.getCachedResult(*F); - auto *LI = FAM.getCachedResult(*F); - auto *DT = FAM.getCachedResult(*F); - auto *TLI = FAM.getCachedResult(*F); - auto *SE = FAM.getCachedResult(*F); - assert((AA && LI && DT && TLI && SE) && "Analyses for LICM not available"); - - LoopInvariantCodeMotion LICM; - - if (!LICM.runOnLoop(&L, AA, LI, DT, TLI, SE)) - return PreservedAnalyses::all(); - - // FIXME: There is no setPreservesCFG in the new PM. When that becomes - // available, it should be used here. - return getLoopPassPreservedAnalyses(); + AliasSetTracker *collectAliasInfoForLoop(Loop *L); +}; } -char LegacyLICMPass::ID = 0; -INITIALIZE_PASS_BEGIN(LegacyLICMPass, "licm", "Loop Invariant Code Motion", - false, false) +char LICM::ID = 0; +INITIALIZE_PASS_BEGIN(LICM, "licm", "Loop Invariant Code Motion", false, false) INITIALIZE_PASS_DEPENDENCY(LoopPass) INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass) -INITIALIZE_PASS_END(LegacyLICMPass, "licm", "Loop Invariant Code Motion", false, - false) +INITIALIZE_PASS_END(LICM, "licm", "Loop Invariant Code Motion", false, false) -Pass *llvm::createLICMPass() { return new LegacyLICMPass(); } +Pass *llvm::createLICMPass() { return new LICM(); } /// Hoist expressions out of the specified loop. Note, alias info for inner /// loop is not preserved so it is not a good idea to run LICM multiple /// times on one loop. /// -bool LoopInvariantCodeMotion::runOnLoop(Loop *L, AliasAnalysis *AA, - LoopInfo *LI, DominatorTree *DT, - TargetLibraryInfo *TLI, - ScalarEvolution *SE) { - bool Changed = false; +bool LICM::runOnLoop(Loop *L, LPPassManager &LPM) { + if (skipLoop(L)) + return false; + + Changed = false; + + // Get our Loop and Alias Analysis information... + LI = &getAnalysis().getLoopInfo(); + AA = &getAnalysis().getAAResults(); + DT = &getAnalysis().getDomTree(); + + TLI = &getAnalysis().getTLI(); assert(L->isLCSSAForm(*DT) && "Loop is not in LCSSA form."); - AliasSetTracker *CurAST = collectAliasInfoForLoop(L, LI, AA); + CurAST = collectAliasInfoForLoop(L); + + CurLoop = L; // Get the preheader block to move instructions into... - BasicBlock *Preheader = L->getLoopPreheader(); + Preheader = L->getLoopPreheader(); // Compute loop safety information. LoopSafetyInfo SafetyInfo; - computeLoopSafetyInfo(&SafetyInfo, L); + computeLoopSafetyInfo(&SafetyInfo, CurLoop); // We want to visit all of the instructions in this loop... that are not parts // of our subloops (they have already had their invariants hoisted out of @@ -239,11 +206,11 @@ // instructions, we perform another pass to hoist them out of the loop. // if (L->hasDedicatedExits()) - Changed |= sinkRegion(DT->getNode(L->getHeader()), AA, LI, DT, TLI, L, + Changed |= sinkRegion(DT->getNode(L->getHeader()), AA, LI, DT, TLI, CurLoop, CurAST, &SafetyInfo); if (Preheader) - Changed |= hoistRegion(DT->getNode(L->getHeader()), AA, LI, DT, TLI, L, - CurAST, &SafetyInfo); + Changed |= hoistRegion(DT->getNode(L->getHeader()), AA, LI, DT, TLI, + CurLoop, CurAST, &SafetyInfo); // Now that all loop invariants have been removed from the loop, promote any // memory references to scalars that we can. @@ -254,8 +221,9 @@ // Loop over all of the alias sets in the tracker object. for (AliasSet &AS : *CurAST) - Changed |= promoteLoopAccessesToScalars( - AS, ExitBlocks, InsertPts, PIC, LI, DT, TLI, L, CurAST, &SafetyInfo); + Changed |= + promoteLoopAccessesToScalars(AS, ExitBlocks, InsertPts, PIC, LI, DT, + TLI, CurLoop, CurAST, &SafetyInfo); // Once we have promoted values across the loop body we have to recursively // reform LCSSA as any nested loop may now have values defined within the @@ -264,7 +232,8 @@ // SSAUpdater strategy during promotion that was LCSSA aware and reformed // it as it went. if (Changed) { - formLCSSARecursively(*L, *DT, LI, SE); + auto *SEWP = getAnalysisIfAvailable(); + formLCSSARecursively(*L, *DT, LI, SEWP ? &SEWP->getSE() : nullptr); } } @@ -275,6 +244,10 @@ assert((!L->getParentLoop() || L->getParentLoop()->isLCSSAForm(*DT)) && "Parent loop not left in LCSSA form after LICM!"); + // Clear out loops state information for the next iteration + CurLoop = nullptr; + Preheader = nullptr; + // If this loop is nested inside of another one, save the alias information // for when we process the outer loop. if (L->getParentLoop()) @@ -282,8 +255,9 @@ else delete CurAST; - if (Changed && SE) - SE->forgetLoopDispositions(L); + if (Changed) + if (auto *SEWP = getAnalysisIfAvailable()) + SEWP->getSE().forgetLoopDispositions(L); return Changed; } @@ -413,8 +387,7 @@ // Iterate over header and compute safety info. for (BasicBlock::iterator I = Header->begin(), E = Header->end(); (I != E) && !SafetyInfo->HeaderMayThrow; ++I) - SafetyInfo->HeaderMayThrow |= - !isGuaranteedToTransferExecutionToSuccessor(&*I); + SafetyInfo->HeaderMayThrow |= !isGuaranteedToTransferExecutionToSuccessor(&*I); SafetyInfo->MayThrow = SafetyInfo->HeaderMayThrow; // Iterate over loop instructions and compute safety info. @@ -1069,13 +1042,7 @@ /// Returns an owning pointer to an alias set which incorporates aliasing info /// from L and all subloops of L. -/// FIXME: In new pass manager, there is no helper functions to handle loop -/// analysis such as cloneBasicBlockAnalysis. So the AST needs to be recompute -/// from scratch for every loop. Hook up with the helper functions when -/// available in the new pass manager to avoid redundant computation. -AliasSetTracker * -LoopInvariantCodeMotion::collectAliasInfoForLoop(Loop *L, LoopInfo *LI, - AliasAnalysis *AA) { +AliasSetTracker *LICM::collectAliasInfoForLoop(Loop *L) { AliasSetTracker *CurAST = nullptr; SmallVector RecomputeLoops; for (Loop *InnerL : L->getSubLoops()) { @@ -1125,9 +1092,8 @@ /// Simple analysis hook. Clone alias set info. /// -void LegacyLICMPass::cloneBasicBlockAnalysis(BasicBlock *From, BasicBlock *To, - Loop *L) { - AliasSetTracker *AST = LICM.getLoopToAliasSetMap().lookup(L); +void LICM::cloneBasicBlockAnalysis(BasicBlock *From, BasicBlock *To, Loop *L) { + AliasSetTracker *AST = LoopToAliasSetMap.lookup(L); if (!AST) return; @@ -1136,8 +1102,8 @@ /// Simple Analysis hook. Delete value V from alias set /// -void LegacyLICMPass::deleteAnalysisValue(Value *V, Loop *L) { - AliasSetTracker *AST = LICM.getLoopToAliasSetMap().lookup(L); +void LICM::deleteAnalysisValue(Value *V, Loop *L) { + AliasSetTracker *AST = LoopToAliasSetMap.lookup(L); if (!AST) return; @@ -1146,13 +1112,13 @@ /// Simple Analysis hook. Delete value L from alias set map. /// -void LegacyLICMPass::deleteAnalysisLoop(Loop *L) { - AliasSetTracker *AST = LICM.getLoopToAliasSetMap().lookup(L); +void LICM::deleteAnalysisLoop(Loop *L) { + AliasSetTracker *AST = LoopToAliasSetMap.lookup(L); if (!AST) return; delete AST; - LICM.getLoopToAliasSetMap().erase(L); + LoopToAliasSetMap.erase(L); } /// Return true if the body of this loop may store into the memory Index: llvm/trunk/lib/Transforms/Scalar/Scalar.cpp =================================================================== --- llvm/trunk/lib/Transforms/Scalar/Scalar.cpp +++ llvm/trunk/lib/Transforms/Scalar/Scalar.cpp @@ -48,7 +48,7 @@ initializeInductiveRangeCheckEliminationPass(Registry); initializeIndVarSimplifyLegacyPassPass(Registry); initializeJumpThreadingPass(Registry); - initializeLegacyLICMPassPass(Registry); + initializeLICMPass(Registry); initializeLoopDataPrefetchPass(Registry); initializeLoopDeletionPass(Registry); initializeLoopAccessLegacyAnalysisPass(Registry); Index: llvm/trunk/test/Transforms/LICM/argmemonly-call.ll =================================================================== --- llvm/trunk/test/Transforms/LICM/argmemonly-call.ll +++ llvm/trunk/test/Transforms/LICM/argmemonly-call.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -basicaa -licm %s | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require,require,require,loop(licm)' < %s -S | FileCheck %s declare i32 @foo() readonly argmemonly nounwind declare i32 @foo2() readonly nounwind declare i32 @bar(i32* %loc2) readonly argmemonly nounwind Index: llvm/trunk/test/Transforms/LICM/assume.ll =================================================================== --- llvm/trunk/test/Transforms/LICM/assume.ll +++ llvm/trunk/test/Transforms/LICM/assume.ll @@ -1,5 +1,4 @@ ; RUN: opt -licm -basicaa < %s -S | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require,require,require,loop(licm)' < %s -S | FileCheck %s define void @f_0(i1 %p) nounwind ssp { ; CHECK-LABEL: @f_0( Index: llvm/trunk/test/Transforms/LICM/atomics.ll =================================================================== --- llvm/trunk/test/Transforms/LICM/atomics.ll +++ llvm/trunk/test/Transforms/LICM/atomics.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -S -basicaa -licm | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='lcssa,require,require,require,loop(licm)' < %s -S | FileCheck %s ; Check that we can hoist unordered loads define i32 @test1(i32* nocapture %y) nounwind uwtable ssp { Index: llvm/trunk/test/Transforms/LICM/basictest.ll =================================================================== --- llvm/trunk/test/Transforms/LICM/basictest.ll +++ llvm/trunk/test/Transforms/LICM/basictest.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -licm | llvm-dis -; RUN: opt -aa-pipeline=basic-aa -passes='require,require,require,loop(licm)' < %s | llvm-dis define void @testfunc(i32 %i) { ;