diff options
Diffstat (limited to 'llvm')
31 files changed, 67 insertions, 175 deletions
diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h index f4db6fe6f91..b17a216d328 100644 --- a/llvm/include/llvm/InitializePasses.h +++ b/llvm/include/llvm/InitializePasses.h @@ -159,7 +159,7 @@ void initializeInternalizeLegacyPassPass(PassRegistry&); void initializeIntervalPartitionPass(PassRegistry&); void initializeJumpThreadingPass(PassRegistry&); void initializeLCSSAWrapperPassPass(PassRegistry &); -void initializeLegacyLICMPassPass(PassRegistry&); +void initializeLICMPass(PassRegistry&); void initializeLazyValueInfoWrapperPassPass(PassRegistry&); void initializeLintPass(PassRegistry&); void initializeLiveDebugValuesPass(PassRegistry&); diff --git a/llvm/include/llvm/Transforms/Scalar/LICM.h b/llvm/include/llvm/Transforms/Scalar/LICM.h deleted file mode 100644 index a050a43d617..00000000000 --- a/llvm/include/llvm/Transforms/Scalar/LICM.h +++ /dev/null @@ -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<LICMPass> { -public: - PreservedAnalyses run(Loop &L, AnalysisManager<Loop> &AM); -}; -} // end namespace llvm - -#endif // LLVM_TRANSFORMS_SCALAR_LICM_H diff --git a/llvm/lib/LTO/LTOCodeGenerator.cpp b/llvm/lib/LTO/LTOCodeGenerator.cpp index df4f230674e..579e055a689 100644 --- a/llvm/lib/LTO/LTOCodeGenerator.cpp +++ b/llvm/lib/LTO/LTOCodeGenerator.cpp @@ -122,7 +122,7 @@ void LTOCodeGenerator::initializeLTOPasses() { initializePostOrderFunctionAttrsLegacyPassPass(R); initializeReversePostOrderFunctionAttrsLegacyPassPass(R); initializeGlobalsAAWrapperPassPass(R); - initializeLegacyLICMPassPass(R); + initializeLICMPass(R); initializeMergedLoadStoreMotionLegacyPassPass(R); initializeGVNLegacyPassPass(R); initializeMemCpyOptLegacyPassPass(R); diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index 03da360fbee..18e271c75b8 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/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" diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def index 050d82bc505..87eaae1c22c 100644 --- a/llvm/lib/Passes/PassRegistry.def +++ b/llvm/lib/Passes/PassRegistry.def @@ -187,7 +187,6 @@ LOOP_ANALYSIS("access-info", LoopAccessAnalysis()) #define LOOP_PASS(NAME, CREATE_PASS) #endif LOOP_PASS("invalidate<all>", InvalidateAllAnalysesPass()) -LOOP_PASS("licm", LICMPass()) LOOP_PASS("rotate", LoopRotatePass()) LOOP_PASS("no-op-loop", NoOpLoopPass()) LOOP_PASS("print", PrintLoopPass(dbgs())) diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp index 6835870b1a2..96ed53a401e 100644 --- a/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/llvm/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 @@ static bool canSinkOrHoistInst(Instruction &I, AliasAnalysis *AA, LoopSafetyInfo *SafetyInfo); namespace { -struct LoopInvariantCodeMotion { - bool runOnLoop(Loop *L, AliasAnalysis *AA, LoopInfo *LI, DominatorTree *DT, - TargetLibraryInfo *TLI, ScalarEvolution *SE); - - DenseMap<Loop *, AliasSetTracker *> &getLoopToAliasSetMap() { - return LoopToAliasSetMap; - } - -private: - DenseMap<Loop *, AliasSetTracker *> 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<ScalarEvolutionWrapperPass>(); - return LICM.runOnLoop(L, - &getAnalysis<AAResultsWrapperPass>().getAAResults(), - &getAnalysis<LoopInfoWrapperPass>().getLoopInfo(), - &getAnalysis<DominatorTreeWrapperPass>().getDomTree(), - &getAnalysis<TargetLibraryInfoWrapperPass>().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 @@ struct LegacyLICMPass : public LoopPass { 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<Loop *, AliasSetTracker *> LoopToAliasSetMap; /// cloneBasicBlockAnalysis - Simple Analysis hook. Clone alias set info. void cloneBasicBlockAnalysis(BasicBlock *From, BasicBlock *To, @@ -170,63 +152,48 @@ private: /// Simple Analysis hook. Delete loop L from alias set map. void deleteAnalysisLoop(Loop *L) override; -}; -} - -PreservedAnalyses LICMPass::run(Loop &L, AnalysisManager<Loop> &AM) { - // FIXME: Check if loop should be skipped. - - const auto &FAM = - AM.getResult<FunctionAnalysisManagerLoopProxy>(L).getManager(); - Function *F = L.getHeader()->getParent(); - - auto *AA = FAM.getCachedResult<AAManager>(*F); - auto *LI = FAM.getCachedResult<LoopAnalysis>(*F); - auto *DT = FAM.getCachedResult<DominatorTreeAnalysis>(*F); - auto *TLI = FAM.getCachedResult<TargetLibraryAnalysis>(*F); - auto *SE = FAM.getCachedResult<ScalarEvolutionAnalysis>(*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<LoopInfoWrapperPass>().getLoopInfo(); + AA = &getAnalysis<AAResultsWrapperPass>().getAAResults(); + DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree(); + + TLI = &getAnalysis<TargetLibraryInfoWrapperPass>().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 @@ bool LoopInvariantCodeMotion::runOnLoop(Loop *L, AliasAnalysis *AA, // 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 @@ bool LoopInvariantCodeMotion::runOnLoop(Loop *L, AliasAnalysis *AA, // 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 @@ bool LoopInvariantCodeMotion::runOnLoop(Loop *L, AliasAnalysis *AA, // SSAUpdater strategy during promotion that was LCSSA aware and reformed // it as it went. if (Changed) { - formLCSSARecursively(*L, *DT, LI, SE); + auto *SEWP = getAnalysisIfAvailable<ScalarEvolutionWrapperPass>(); + formLCSSARecursively(*L, *DT, LI, SEWP ? &SEWP->getSE() : nullptr); } } @@ -275,6 +244,10 @@ bool LoopInvariantCodeMotion::runOnLoop(Loop *L, AliasAnalysis *AA, 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 @@ bool LoopInvariantCodeMotion::runOnLoop(Loop *L, AliasAnalysis *AA, else delete CurAST; - if (Changed && SE) - SE->forgetLoopDispositions(L); + if (Changed) + if (auto *SEWP = getAnalysisIfAvailable<ScalarEvolutionWrapperPass>()) + SEWP->getSE().forgetLoopDispositions(L); return Changed; } @@ -413,8 +387,7 @@ void llvm::computeLoopSafetyInfo(LoopSafetyInfo *SafetyInfo, Loop *CurLoop) { // 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 @@ bool llvm::promoteLoopAccessesToScalars( /// 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<Loop *, 4> RecomputeLoops; for (Loop *InnerL : L->getSubLoops()) { @@ -1125,9 +1092,8 @@ LoopInvariantCodeMotion::collectAliasInfoForLoop(Loop *L, LoopInfo *LI, /// 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 @@ void LegacyLICMPass::cloneBasicBlockAnalysis(BasicBlock *From, BasicBlock *To, /// 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 @@ void LegacyLICMPass::deleteAnalysisValue(Value *V, Loop *L) { /// 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 diff --git a/llvm/lib/Transforms/Scalar/Scalar.cpp b/llvm/lib/Transforms/Scalar/Scalar.cpp index 336136f996d..19e34a56e60 100644 --- a/llvm/lib/Transforms/Scalar/Scalar.cpp +++ b/llvm/lib/Transforms/Scalar/Scalar.cpp @@ -48,7 +48,7 @@ void llvm::initializeScalarOpts(PassRegistry &Registry) { initializeInductiveRangeCheckEliminationPass(Registry); initializeIndVarSimplifyLegacyPassPass(Registry); initializeJumpThreadingPass(Registry); - initializeLegacyLICMPassPass(Registry); + initializeLICMPass(Registry); initializeLoopDataPrefetchPass(Registry); initializeLoopDeletionPass(Registry); initializeLoopAccessLegacyAnalysisPass(Registry); diff --git a/llvm/test/Transforms/LICM/argmemonly-call.ll b/llvm/test/Transforms/LICM/argmemonly-call.ll index 18d7f8351dc..e2640a1c8de 100644 --- a/llvm/test/Transforms/LICM/argmemonly-call.ll +++ b/llvm/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<aa>,require<targetir>,require<scalar-evolution>,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 diff --git a/llvm/test/Transforms/LICM/assume.ll b/llvm/test/Transforms/LICM/assume.ll index f6369ac659f..e426350ce73 100644 --- a/llvm/test/Transforms/LICM/assume.ll +++ b/llvm/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<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s -S | FileCheck %s define void @f_0(i1 %p) nounwind ssp { ; CHECK-LABEL: @f_0( diff --git a/llvm/test/Transforms/LICM/atomics.ll b/llvm/test/Transforms/LICM/atomics.ll index 5dcd4bb8c05..4fe197abf5d 100644 --- a/llvm/test/Transforms/LICM/atomics.ll +++ b/llvm/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<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s -S | FileCheck %s ; Check that we can hoist unordered loads define i32 @test1(i32* nocapture %y) nounwind uwtable ssp { diff --git a/llvm/test/Transforms/LICM/basictest.ll b/llvm/test/Transforms/LICM/basictest.ll index 570e226d237..1dbb4dc6b49 100644 --- a/llvm/test/Transforms/LICM/basictest.ll +++ b/llvm/test/Transforms/LICM/basictest.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -licm | llvm-dis -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s | llvm-dis define void @testfunc(i32 %i) { ; <label>:0 diff --git a/llvm/test/Transforms/LICM/constexpr.ll b/llvm/test/Transforms/LICM/constexpr.ll index 726246776dc..506721f25f8 100644 --- a/llvm/test/Transforms/LICM/constexpr.ll +++ b/llvm/test/Transforms/LICM/constexpr.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -S -basicaa -licm | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='lcssa,require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s -S | FileCheck %s ; This fixes PR22460 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/Transforms/LICM/crash.ll b/llvm/test/Transforms/LICM/crash.ll index 75c27b8def0..7fa41157338 100644 --- a/llvm/test/Transforms/LICM/crash.ll +++ b/llvm/test/Transforms/LICM/crash.ll @@ -1,5 +1,4 @@ ; RUN: opt -licm -disable-output < %s -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -disable-output < %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-apple-darwin10.0.0" diff --git a/llvm/test/Transforms/LICM/debug-value.ll b/llvm/test/Transforms/LICM/debug-value.ll index ab77caa2bae..525071a9e82 100644 --- a/llvm/test/Transforms/LICM/debug-value.ll +++ b/llvm/test/Transforms/LICM/debug-value.ll @@ -1,5 +1,4 @@ ; RUN: opt -licm -basicaa < %s -S | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s -S | FileCheck %s define void @dgefa() nounwind ssp { entry: diff --git a/llvm/test/Transforms/LICM/extra-copies.ll b/llvm/test/Transforms/LICM/extra-copies.ll index 84a3bc9ec6a..ef52f9f404c 100644 --- a/llvm/test/Transforms/LICM/extra-copies.ll +++ b/llvm/test/Transforms/LICM/extra-copies.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -licm -S | FileCheck %s -; RUN: opt -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s -S | FileCheck %s ; PR19835 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LICM/funclet.ll b/llvm/test/Transforms/LICM/funclet.ll index 9bdc6dbcde8..ef4be296915 100644 --- a/llvm/test/Transforms/LICM/funclet.ll +++ b/llvm/test/Transforms/LICM/funclet.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -licm -S | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s -S | FileCheck %s target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i386-pc-windows-msvc18.0.0" diff --git a/llvm/test/Transforms/LICM/hoist-bitcast-load.ll b/llvm/test/Transforms/LICM/hoist-bitcast-load.ll index 5752aecde38..47c474c17dd 100644 --- a/llvm/test/Transforms/LICM/hoist-bitcast-load.ll +++ b/llvm/test/Transforms/LICM/hoist-bitcast-load.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -basicaa -licm < %s | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='loop-simplify,require<aa>,require<targetir>,require<scalar-evolution>,loop(simplify-cfg,licm)' -S < %s | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LICM/hoist-deref-load.ll b/llvm/test/Transforms/LICM/hoist-deref-load.ll index ed6ec7694d3..a9a6dfc0219 100644 --- a/llvm/test/Transforms/LICM/hoist-deref-load.ll +++ b/llvm/test/Transforms/LICM/hoist-deref-load.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -basicaa -licm < %s | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='loop-simplify,require<aa>,require<targetir>,require<scalar-evolution>,loop(simplify-cfg,licm)' -S < %s | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LICM/hoist-nounwind.ll b/llvm/test/Transforms/LICM/hoist-nounwind.ll index 081729f808b..efa4b8dceca 100644 --- a/llvm/test/Transforms/LICM/hoist-nounwind.ll +++ b/llvm/test/Transforms/LICM/hoist-nounwind.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -basicaa -licm < %s | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='lcssa,require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LICM/hoist-round.ll b/llvm/test/Transforms/LICM/hoist-round.ll index a87709b810d..361b31e3e54 100644 --- a/llvm/test/Transforms/LICM/hoist-round.ll +++ b/llvm/test/Transforms/LICM/hoist-round.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -licm < %s | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s target datalayout = "E-m:e-p:32:32-i8:8:8-i16:16:16-i64:32:32-f64:32:32-v64:32:32-v128:32:32-a0:0:32-n32" diff --git a/llvm/test/Transforms/LICM/hoisting.ll b/llvm/test/Transforms/LICM/hoisting.ll index cb6981ede1e..e5de7a8f91e 100644 --- a/llvm/test/Transforms/LICM/hoisting.ll +++ b/llvm/test/Transforms/LICM/hoisting.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -licm -S | FileCheck %s -; RUN: opt -lcssa %s | opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S | FileCheck %s @X = global i32 0 ; <i32*> [#uses=1] diff --git a/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll b/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll index d466b3baffc..b0cae8772f3 100644 --- a/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll +++ b/llvm/test/Transforms/LICM/lcssa-ssa-promoter.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -basicaa -licm < %s | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s| FileCheck %s ; ; Manually validate LCSSA form is preserved even after SSAUpdater is used to ; promote things in the loop bodies. diff --git a/llvm/test/Transforms/LICM/no-preheader-test.ll b/llvm/test/Transforms/LICM/no-preheader-test.ll index 4b6847cdad5..bd3eea38ef3 100644 --- a/llvm/test/Transforms/LICM/no-preheader-test.ll +++ b/llvm/test/Transforms/LICM/no-preheader-test.ll @@ -1,6 +1,5 @@ ; Test that LICM works when there is not a loop-preheader ; RUN: opt < %s -licm | llvm-dis -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' < %s | llvm-dis define void @testfunc(i32 %i.s, i1 %ifcond) { br i1 %ifcond, label %Then, label %Else diff --git a/llvm/test/Transforms/LICM/preheader-safe.ll b/llvm/test/Transforms/LICM/preheader-safe.ll index adc4f4237a2..92bd76073b0 100644 --- a/llvm/test/Transforms/LICM/preheader-safe.ll +++ b/llvm/test/Transforms/LICM/preheader-safe.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -licm < %s | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s declare void @use_nothrow(i64 %a) nounwind declare void @use(i64 %a) diff --git a/llvm/test/Transforms/LICM/promote-order.ll b/llvm/test/Transforms/LICM/promote-order.ll index 7d87bb221b7..a189cf22f66 100644 --- a/llvm/test/Transforms/LICM/promote-order.ll +++ b/llvm/test/Transforms/LICM/promote-order.ll @@ -1,5 +1,4 @@ ; RUN: opt -tbaa -basicaa -licm -S < %s | FileCheck %s -; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s ; LICM should keep the stores in their original order when it sinks/promotes them. ; rdar://12045203 diff --git a/llvm/test/Transforms/LICM/promote-tls.ll b/llvm/test/Transforms/LICM/promote-tls.ll index e3654902a12..571d5258001 100644 --- a/llvm/test/Transforms/LICM/promote-tls.ll +++ b/llvm/test/Transforms/LICM/promote-tls.ll @@ -1,5 +1,4 @@ ; RUN: opt -tbaa -basicaa -licm -S < %s | FileCheck %s -; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s ; If we can prove a local is thread local, we can insert stores during ; promotion which wouldn't be legal otherwise. diff --git a/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll b/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll index ceee7292ac5..3603c25ba23 100644 --- a/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll +++ b/llvm/test/Transforms/LICM/scalar-promote-memmodel.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -basicaa -licm -S | FileCheck %s -; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s ; Make sure we don't hoist a conditionally-executed store out of the loop; ; it would violate the concurrency memory model diff --git a/llvm/test/Transforms/LICM/scalar_promote-unwind.ll b/llvm/test/Transforms/LICM/scalar_promote-unwind.ll index 22e7e50c22e..bce5e14d598 100644 --- a/llvm/test/Transforms/LICM/scalar_promote-unwind.ll +++ b/llvm/test/Transforms/LICM/scalar_promote-unwind.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -basicaa -licm -S | FileCheck %s -; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LICM/scalar_promote.ll b/llvm/test/Transforms/LICM/scalar_promote.ll index 91cdbdbc226..9acf8f8c32a 100644 --- a/llvm/test/Transforms/LICM/scalar_promote.ll +++ b/llvm/test/Transforms/LICM/scalar_promote.ll @@ -1,5 +1,4 @@ ; RUN: opt < %s -basicaa -tbaa -licm -S | FileCheck %s -; RUN: opt -aa-pipeline=type-based-aa,basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128" @X = global i32 7 ; <i32*> [#uses=4] diff --git a/llvm/test/Transforms/LICM/speculate.ll b/llvm/test/Transforms/LICM/speculate.ll index fed1cbaa855..91b5a25ac0f 100644 --- a/llvm/test/Transforms/LICM/speculate.ll +++ b/llvm/test/Transforms/LICM/speculate.ll @@ -1,5 +1,4 @@ ; RUN: opt -S -licm < %s | FileCheck %s -; RUN: opt -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S %s | FileCheck %s ; UDiv is safe to speculate if the denominator is known non-zero. diff --git a/llvm/test/Transforms/LICM/volatile-alias.ll b/llvm/test/Transforms/LICM/volatile-alias.ll index 7836df004c0..5e599da12fc 100644 --- a/llvm/test/Transforms/LICM/volatile-alias.ll +++ b/llvm/test/Transforms/LICM/volatile-alias.ll @@ -1,5 +1,4 @@ ; RUN: opt -basicaa -sroa -loop-rotate -licm -S < %s | FileCheck %s -; RUN: opt -basicaa -sroa -loop-rotate %s | opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,loop(licm)' -S | FileCheck %s ; The objects *p and *q are aliased to each other, but even though *q is ; volatile, *p can be considered invariant in the loop. Check if it is moved ; out of the loop. |
