replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AssumptionCache: Disable the verifier by default, move it behind a hidden cl::opt and verify from releaseMemory(). 

This is a short term solution to the problem that many passes currently fail
to update the assumption cache. In the long term the verifier should not
be controllable with a flag. We should either fix all passes to correctly
update the assumption cache and enable the verifier unconditionally or
somehow arrange for the assumption list to be updated automatically by passes.

Differential Revision: https://reviews.llvm.org/D30003

llvm-svn: 295236
This commit is contained in:
Peter Collingbourne 2017-02-15 21:10:09 +00:00
parent 5b4c30fb32
commit 9421c2dc54
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/include/llvm/Analysis/AssumptionCache.h
View File

@ -202,7 +202,10 @@ public:
AssumptionCacheTracker();
~AssumptionCacheTracker() override;
void releaseMemory() override { AssumptionCaches.shrink_and_clear(); }
void releaseMemory() override {
verifyAnalysis();
AssumptionCaches.shrink_and_clear();
}
void verifyAnalysis() const override;
bool doFinalization(Module &) override {

20
llvm/lib/Analysis/AssumptionCache.cpp
View File

@ -24,6 +24,11 @@
using namespace llvm;
using namespace llvm::PatternMatch;
static cl::opt<bool>
VerifyAssumptionCache("verify-assumption-cache", cl::Hidden,
cl::desc("Enable verification of assumption cache"),
cl::init(false));
SmallVector<WeakVH, 1> &AssumptionCache::getOrInsertAffectedValues(Value *V) {
// Try using find_as first to avoid creating extra value handles just for the
// purpose of doing the lookup.
@ -231,7 +236,13 @@ AssumptionCache &AssumptionCacheTracker::getAssumptionCache(Function &F) {
}
void AssumptionCacheTracker::verifyAnalysis() const {
#ifndef NDEBUG
// FIXME: In the long term the verifier should not be controllable with a
// flag. We should either fix all passes to correctly update the assumption
// cache and enable the verifier unconditionally or somehow arrange for the
// assumption list to be updated automatically by passes.
if (!VerifyAssumptionCache)
return;
SmallPtrSet<const CallInst *, 4> AssumptionSet;
for (const auto &I : AssumptionCaches) {
for (auto &VH : I.second->assumptions())
@ -240,11 +251,10 @@ void AssumptionCacheTracker::verifyAnalysis() const {
for (const BasicBlock &B : cast<Function>(*I.first))
for (const Instruction &II : B)
if (match(&II, m_Intrinsic<Intrinsic::assume>()))
assert(AssumptionSet.count(cast<CallInst>(&II)) &&
"Assumption in scanned function not in cache");
if (match(&II, m_Intrinsic<Intrinsic::assume>()) &&
!AssumptionSet.count(cast<CallInst>(&II)))
report_fatal_error("Assumption in scanned function not in cache");
}
#endif
}
AssumptionCacheTracker::AssumptionCacheTracker() : ImmutablePass(ID) {

2
llvm/test/Transforms/SimplifyCFG/critedge-assume.ll
View File

@ -1,4 +1,4 @@
; RUN: opt -o %t %s -instcombine -simplifycfg -thinlto-bc
; RUN: opt -o %t %s -instcombine -simplifycfg -thinlto-bc -verify-assumption-cache
; RUN: llvm-dis -o - %t | FileCheck %s
; Test that the simplifycfg pass correctly updates the assumption cache