From: Alina Sbirlea Date: Tue, 23 Apr 2019 17:21:18 +0000 (+0000) Subject: [AliasAnalysis] AAResults preserves AAManager. X-Git-Tag: llvmorg-10-init~7209 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a809e8e5e759d333e3183b4f1d270cfc4ad9d2dd;p=platform%2Fupstream%2Fllvm.git [AliasAnalysis] AAResults preserves AAManager. Summary: AAResults should not invalidate AAManager. Update tests. Reviewers: chandlerc Subscribers: mehdi_amini, jlebar, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D60914 llvm-svn: 359014 --- diff --git a/llvm/include/llvm/Analysis/AliasAnalysis.h b/llvm/include/llvm/Analysis/AliasAnalysis.h index dc850e9..af523fe 100644 --- a/llvm/include/llvm/Analysis/AliasAnalysis.h +++ b/llvm/include/llvm/Analysis/AliasAnalysis.h @@ -1096,6 +1096,12 @@ 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 { public: using Result = AAResults; diff --git a/llvm/lib/Analysis/AliasAnalysis.cpp b/llvm/lib/Analysis/AliasAnalysis.cpp index 06a33f6..4bb3b80 100644 --- a/llvm/lib/Analysis/AliasAnalysis.cpp +++ b/llvm/lib/Analysis/AliasAnalysis.cpp @@ -79,12 +79,10 @@ AAResults::~AAResults() { bool AAResults::invalidate(Function &F, const PreservedAnalyses &PA, FunctionAnalysisManager::Invalidator &Inv) { - // Check if the AA manager itself has been invalidated. - auto PAC = PA.getChecker(); - if (!PAC.preserved() && !PAC.preservedSet>()) - return true; // The manager needs to be blown away, clear everything. - - // Check all of the dependencies registered. + // 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. 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 478ffc2..16d1716 100644 --- a/llvm/test/Analysis/MemoryDependenceAnalysis/invalidation.ll +++ b/llvm/test/Analysis/MemoryDependenceAnalysis/invalidation.ll @@ -1,17 +1,16 @@ ; Test that memdep gets invalidated when the analyses it depends on are ; invalidated. ; -; Check AA specifically. +; Check AA. AA is stateless, there's nothing to invalidate. ; RUN: opt -disable-output -debug-pass-manager -aa-pipeline='basic-aa' %s 2>&1 \ ; RUN: -passes='require,invalidate,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-AA-INVALIDATE: Invalidating analysis: AAManager -; CHECK-AA-INVALIDATE: Invalidating analysis: MemoryDependenceAnalysis +; CHECK-NOT-AA-INVALIDATE: Invalidating analysis: MemoryDependenceAnalysis ; CHECK-AA-INVALIDATE: Running pass: GVN -; CHECK-AA-INVALIDATE: Running analysis: MemoryDependenceAnalysis +; CHECK-NOT-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 9c914d4..e836b321 100644 --- a/llvm/test/Other/new-pass-manager.ll +++ b/llvm/test/Other/new-pass-manager.ll @@ -355,13 +355,11 @@ ; 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 2615e19..fc94b6e8 100644 --- a/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp +++ b/llvm/unittests/Transforms/Scalar/LoopPassManagerTest.cpp @@ -572,7 +572,6 @@ 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"), _, _));