[PATCH] D61043: [MemorySSA] Invalidate MemorySSA if AA or DT are invalidated.

[Alina Sbirlea via Phabricator via llvm-commits]

asbirlea updated this revision to Diff 196686.
asbirlea added a comment.

Excellent suggestion! The invalidate needs to go into the Result internal to the analysis.
Updated and added test. PTAL.


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D61043/new/

https://reviews.llvm.org/D61043

Files:
  include/llvm/Analysis/MemorySSA.h
  lib/Analysis/MemorySSA.cpp
  test/Analysis/MemorySSA/invalidate.ll


Index: test/Analysis/MemorySSA/invalidate.ll
===================================================================
--- /dev/null
+++ test/Analysis/MemorySSA/invalidate.ll
@@ -0,0 +1,53 @@
+; RUN: opt -aa-pipeline=basic-aa -passes='require<memoryssa>,invalidate<aa>,early-cse-memssa' \
+; RUN:     -debug-pass-manager -disable-output %s 2>&1 \
+; RUN:     | FileCheck %s --check-prefix=CHECK-AA-INVALIDATE
+; RUN: opt -aa-pipeline=basic-aa -passes='require<memoryssa>,invalidate<domtree>,early-cse-memssa' \
+; RUN:     -debug-pass-manager -disable-output %s 2>&1 \
+; RUN:     | FileCheck %s --check-prefix=CHECK-DT-INVALIDATE
+
+; CHECK-AA-INVALIDATE: Running analysis: MemorySSAAnalysis
+; CHECK-AA-INVALIDATE: Running analysis: DominatorTreeAnalysis
+; CHECK-AA-INVALIDATE: Running analysis: AAManager
+; CHECK-AA-INVALIDATE: Running analysis: BasicAA
+; CHECK-AA-INVALIDATE: Running pass: InvalidateAnalysisPass<llvm::AAManager>
+; CHECK-AA-INVALIDATE: Invalidating analysis: AAManager
+; CHECK-AA-INVALIDATE: Invalidating analysis: MemorySSAAnalysis
+; CHECK-AA-INVALIDATE: Running pass: EarlyCSEPass
+; CHECK-AA-INVALIDATE: Running analysis: MemorySSAAnalysis
+; CHECK-AA-INVALIDATE: Running analysis: AAManager
+
+; CHECK-DT-INVALIDATE: Running analysis: MemorySSAAnalysis
+; CHECK-DT-INVALIDATE: Running analysis: DominatorTreeAnalysis
+; CHECK-DT-INVALIDATE: Running analysis: AAManager
+; CHECK-DT-INVALIDATE: Running analysis: BasicAA
+; CHECK-DT-INVALIDATE: InvalidateAnalysisPass<llvm::DominatorTreeAnalysis>
+; CHECK-DT-INVALIDATE: Invalidating analysis: DominatorTreeAnalysis
+; CHECK-DT-INVALIDATE: Invalidating analysis: BasicAA
+; CHECK-DT-INVALIDATE: Invalidating analysis: AAManager
+; CHECK-DT-INVALIDATE: Invalidating analysis: MemorySSAAnalysis
+; CHECK-DT-INVALIDATE: Running pass: EarlyCSEPass
+; CHECK-DT-INVALIDATE: Running analysis: DominatorTreeAnalysis
+; CHECK-DT-INVALIDATE: Running analysis: MemorySSAAnalysis
+; CHECK-DT-INVALIDATE: Running analysis: AAManager
+; CHECK-DT-INVALIDATE: Running analysis: BasicAA
+
+
+; Function Attrs: ssp uwtable
+define i32 @main() {
+entry:
+  %call = call noalias i8* @_Znwm(i64 4)
+  %0 = bitcast i8* %call to i32*
+  %call1 = call noalias i8* @_Znwm(i64 4)
+  %1 = bitcast i8* %call1 to i32*
+  store i32 5, i32* %0, align 4
+  store i32 7, i32* %1, align 4
+  %2 = load i32, i32* %0, align 4
+  %3 = load i32, i32* %1, align 4
+  %4 = load i32, i32* %0, align 4
+  %5 = load i32, i32* %1, align 4
+  %add = add nsw i32 %3, %5
+  ret i32 %add
+}
+
+declare noalias i8* @_Znwm(i64)
+
Index: lib/Analysis/MemorySSA.cpp
===================================================================
--- lib/Analysis/MemorySSA.cpp
+++ lib/Analysis/MemorySSA.cpp
@@ -2213,6 +2213,15 @@
   return MemorySSAAnalysis::Result(llvm::make_unique<MemorySSA>(F, &AA, &DT));
 }
 
+bool MemorySSAAnalysis::Result::invalidate(
+    Function &F, const PreservedAnalyses &PA,
+    FunctionAnalysisManager::Invalidator &Inv) {
+  auto PAC = PA.getChecker<MemorySSAAnalysis>();
+  return !(PAC.preserved() || PAC.preservedSet<AllAnalysesOn<Function>>()) ||
+         Inv.invalidate<AAManager>(F, PA) ||
+         Inv.invalidate<DominatorTreeAnalysis>(F, PA);
+}
+
 PreservedAnalyses MemorySSAPrinterPass::run(Function &F,
                                             FunctionAnalysisManager &AM) {
   OS << "MemorySSA for function: " << F.getName() << "\n";
Index: include/llvm/Analysis/MemorySSA.h
===================================================================
--- include/llvm/Analysis/MemorySSA.h
+++ include/llvm/Analysis/MemorySSA.h
@@ -936,6 +936,9 @@
     MemorySSA &getMSSA() { return *MSSA.get(); }
 
     std::unique_ptr<MemorySSA> MSSA;
+
+    bool invalidate(Function &F, const PreservedAnalyses &PA,
+                    FunctionAnalysisManager::Invalidator &Inv);
   };
 
   Result run(Function &F, FunctionAnalysisManager &AM);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61043.196686.patch
Type: text/x-patch
Size: 3887 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190425/1992b63c/attachment.bin>