diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h index 454a723b3fde4..8fb005b8f6521 100644 --- a/llvm/include/llvm/InitializePasses.h +++ b/llvm/include/llvm/InitializePasses.h @@ -175,7 +175,6 @@ void initializeLoopDataPrefetchLegacyPassPass(PassRegistry&); void initializeLoopExtractorLegacyPassPass(PassRegistry &); void initializeLoopGuardWideningLegacyPassPass(PassRegistry&); void initializeLoopInfoWrapperPassPass(PassRegistry&); -void initializeLoopInstSimplifyLegacyPassPass(PassRegistry&); void initializeLoopPassPass(PassRegistry&); void initializeLoopPredicationLegacyPassPass(PassRegistry&); void initializeLoopRotateLegacyPassPass(PassRegistry&); diff --git a/llvm/include/llvm/Transforms/Scalar.h b/llvm/include/llvm/Transforms/Scalar.h index 3b24774ddfa06..7908424231d0b 100644 --- a/llvm/include/llvm/Transforms/Scalar.h +++ b/llvm/include/llvm/Transforms/Scalar.h @@ -74,12 +74,6 @@ Pass *createLoopPredicationPass(); // Pass *createLoopStrengthReducePass(); -//===----------------------------------------------------------------------===// -// -// LoopInstSimplify - This pass simplifies instructions in a loop's body. -// -Pass *createLoopInstSimplifyPass(); - //===----------------------------------------------------------------------===// // // LoopUnroll - This pass is a simple loop unrolling pass. diff --git a/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp b/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp index c9798a80978d0..cfe069d00bce7 100644 --- a/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp +++ b/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp @@ -29,8 +29,6 @@ #include "llvm/IR/Instructions.h" #include "llvm/IR/Module.h" #include "llvm/IR/PassManager.h" -#include "llvm/InitializePasses.h" -#include "llvm/Pass.h" #include "llvm/Support/Casting.h" #include "llvm/Transforms/Scalar.h" #include "llvm/Transforms/Utils/Local.h" @@ -172,46 +170,6 @@ static bool simplifyLoopInst(Loop &L, DominatorTree &DT, LoopInfo &LI, return Changed; } -namespace { - -class LoopInstSimplifyLegacyPass : public LoopPass { -public: - static char ID; // Pass ID, replacement for typeid - - LoopInstSimplifyLegacyPass() : LoopPass(ID) { - initializeLoopInstSimplifyLegacyPassPass(*PassRegistry::getPassRegistry()); - } - - bool runOnLoop(Loop *L, LPPassManager &LPM) override { - if (skipLoop(L)) - return false; - DominatorTree &DT = getAnalysis().getDomTree(); - LoopInfo &LI = getAnalysis().getLoopInfo(); - AssumptionCache &AC = - getAnalysis().getAssumptionCache( - *L->getHeader()->getParent()); - const TargetLibraryInfo &TLI = - getAnalysis().getTLI( - *L->getHeader()->getParent()); - MemorySSA *MSSA = &getAnalysis().getMSSA(); - MemorySSAUpdater MSSAU(MSSA); - - return simplifyLoopInst(*L, DT, LI, AC, TLI, &MSSAU); - } - - void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); - AU.addRequired(); - AU.addRequired(); - AU.setPreservesCFG(); - AU.addRequired(); - AU.addPreserved(); - getLoopAnalysisUsage(AU); - } -}; - -} // end anonymous namespace - PreservedAnalyses LoopInstSimplifyPass::run(Loop &L, LoopAnalysisManager &AM, LoopStandardAnalysisResults &AR, LPMUpdater &) { @@ -231,18 +189,3 @@ PreservedAnalyses LoopInstSimplifyPass::run(Loop &L, LoopAnalysisManager &AM, PA.preserve(); return PA; } - -char LoopInstSimplifyLegacyPass::ID = 0; - -INITIALIZE_PASS_BEGIN(LoopInstSimplifyLegacyPass, "loop-instsimplify", - "Simplify instructions in loops", false, false) -INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker) -INITIALIZE_PASS_DEPENDENCY(LoopPass) -INITIALIZE_PASS_DEPENDENCY(MemorySSAWrapperPass) -INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass) -INITIALIZE_PASS_END(LoopInstSimplifyLegacyPass, "loop-instsimplify", - "Simplify instructions in loops", false, false) - -Pass *llvm::createLoopInstSimplifyPass() { - return new LoopInstSimplifyLegacyPass(); -} diff --git a/llvm/lib/Transforms/Scalar/Scalar.cpp b/llvm/lib/Transforms/Scalar/Scalar.cpp index 69ecc84299295..f0cef907d9448 100644 --- a/llvm/lib/Transforms/Scalar/Scalar.cpp +++ b/llvm/lib/Transforms/Scalar/Scalar.cpp @@ -32,7 +32,6 @@ void llvm::initializeScalarOpts(PassRegistry &Registry) { initializeInstSimplifyLegacyPassPass(Registry); initializeLegacyLICMPassPass(Registry); initializeLoopDataPrefetchLegacyPassPass(Registry); - initializeLoopInstSimplifyLegacyPassPass(Registry); initializeLoopPredicationLegacyPassPass(Registry); initializeLoopRotateLegacyPassPass(Registry); initializeLoopStrengthReducePass(Registry);