diff options
| -rw-r--r-- | llvm/include/llvm/Analysis/AliasAnalysis.h | 6 | ||||
| -rw-r--r-- | llvm/lib/Analysis/AliasAnalysis.cpp | 10 | ||||
| -rw-r--r-- | llvm/test/Analysis/MemoryDependenceAnalysis/invalidation.ll | 7 | ||||
| -rw-r--r-- | llvm/test/Other/new-pass-manager.ll | 2 | ||||
| -rw-r--r-- | llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp | 1 |
5 files changed, 13 insertions, 13 deletions
diff --git a/llvm/include/llvm/Analysis/AliasAnalysis.h b/llvm/include/llvm/Analysis/AliasAnalysis.h index af523feba3c..dc850e9152c 100644 --- a/llvm/include/llvm/Analysis/AliasAnalysis.h +++ b/llvm/include/llvm/Analysis/AliasAnalysis.h @@ -1096,12 +1096,6 @@ bool isIdentifiedFunctionLocal(const Value *V); /// This manager effectively wraps the AnalysisManager for registering alias /// analyses. When you register your alias analysis with this manager, it will /// ensure the analysis itself is registered with its AnalysisManager. -/// -/// The result of this analysis is only invalidated if one of the particular -/// aggregated AA results end up being invalidated. This removes the need to -/// explicitly preserve the results of `AAManager`. Note that analyses should no -/// longer be registered once the `AAManager` is run. - class AAManager : public AnalysisInfoMixin<AAManager> { public: using Result = AAResults; diff --git a/llvm/lib/Analysis/AliasAnalysis.cpp b/llvm/lib/Analysis/AliasAnalysis.cpp index 4bb3b80511a..06a33f659c1 100644 --- a/llvm/lib/Analysis/AliasAnalysis.cpp +++ b/llvm/lib/Analysis/AliasAnalysis.cpp @@ -79,10 +79,12 @@ AAResults::~AAResults() { bool AAResults::invalidate(Function &F, const PreservedAnalyses &PA, FunctionAnalysisManager::Invalidator &Inv) { - // AAResults preserves the AAManager by default, due to the stateless nature - // of AliasAnalysis. There is no need to check whether it has been preserved - // explicitly. However, we still need to check if any of the dependencies end - // up being invalidated, and invalidate ourselves in that case. + // Check if the AA manager itself has been invalidated. + auto PAC = PA.getChecker<AAManager>(); + if (!PAC.preserved() && !PAC.preservedSet<AllAnalysesOn<Function>>()) + return true; // The manager needs to be blown away, clear everything. + + // Check all of the dependencies registered. for (AnalysisKey *ID : AADeps) if (Inv.invalidate(ID, F, PA)) return true; diff --git a/llvm/test/Analysis/MemoryDependenceAnalysis/invalidation.ll b/llvm/test/Analysis/MemoryDependenceAnalysis/invalidation.ll index 16d17161ad2..478ffc2914b 100644 --- a/llvm/test/Analysis/MemoryDependenceAnalysis/invalidation.ll +++ b/llvm/test/Analysis/MemoryDependenceAnalysis/invalidation.ll @@ -1,16 +1,17 @@ ; Test that memdep gets invalidated when the analyses it depends on are ; invalidated. ; -; Check AA. AA is stateless, there's nothing to invalidate. +; Check AA specifically. ; RUN: opt -disable-output -debug-pass-manager -aa-pipeline='basic-aa' %s 2>&1 \ ; RUN: -passes='require<memdep>,invalidate<aa>,gvn' \ ; RUN: | FileCheck %s --check-prefix=CHECK-AA-INVALIDATE ; CHECK-AA-INVALIDATE: Running pass: RequireAnalysisPass ; CHECK-AA-INVALIDATE: Running analysis: MemoryDependenceAnalysis ; CHECK-AA-INVALIDATE: Running pass: InvalidateAnalysisPass -; CHECK-NOT-AA-INVALIDATE: Invalidating analysis: MemoryDependenceAnalysis +; CHECK-AA-INVALIDATE: Invalidating analysis: AAManager +; CHECK-AA-INVALIDATE: Invalidating analysis: MemoryDependenceAnalysis ; CHECK-AA-INVALIDATE: Running pass: GVN -; CHECK-NOT-AA-INVALIDATE: Running analysis: MemoryDependenceAnalysis +; CHECK-AA-INVALIDATE: Running analysis: MemoryDependenceAnalysis ; ; Check domtree specifically. ; RUN: opt -disable-output -debug-pass-manager %s 2>&1 \ diff --git a/llvm/test/Other/new-pass-manager.ll b/llvm/test/Other/new-pass-manager.ll index e836b321007..9c914d4de4c 100644 --- a/llvm/test/Other/new-pass-manager.ll +++ b/llvm/test/Other/new-pass-manager.ll @@ -355,11 +355,13 @@ ; CHECK-AA-MODULE-INVALIDATE: Running analysis: AAManager ; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Function pass manager run ; CHECK-AA-MODULE-INVALIDATE: Running pass: InvalidateAnalysisPass +; CHECK-AA-MODULE-INVALIDATE: Invalidating analysis: AAManager ; CHECK-AA-MODULE-INVALIDATE: Invalidating analysis: GlobalsAA ; CHECK-AA-MODULE-INVALIDATE: Running pass: RequireAnalysisPass ; CHECK-AA-MODULE-INVALIDATE: Running analysis: GlobalsAA ; CHECK-AA-MODULE-INVALIDATE: Starting llvm::Function pass manager run ; CHECK-AA-MODULE-INVALIDATE: Running pass: AAEvaluator +; CHECK-AA-MODULE-INVALIDATE: Running analysis: AAManager ; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Function pass manager run ; CHECK-AA-MODULE-INVALIDATE: Finished llvm::Module pass manager run diff --git a/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp b/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp index fc94b6e8c1a..2615e19d44f 100644 --- a/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp +++ b/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp @@ -572,6 +572,7 @@ TEST_F(LoopPassManagerTest, InvalidationOfBundledAnalyses) { // invalidation and running. EXPECT_CALL(MFPHandle, run(HasName("f"), _)) .WillOnce(Return(getLoopPassPreservedAnalyses())); + EXPECT_CALL(MLAHandle, invalidate(_, _, _)).Times(3); EXPECT_CALL(MLAHandle, run(HasName("loop.0.0"), _, _)); EXPECT_CALL(MLAHandle, run(HasName("loop.0.1"), _, _)); EXPECT_CALL(MLAHandle, run(HasName("loop.0"), _, _)); |
