Skip to content

Commit

Permalink
[sancov] do not instrument nodes that are full pre-dominators
Browse files Browse the repository at this point in the history
Summary:
Without tree pruning clang has 2,667,552 points.
Wiht only dominators pruning: 1,515,586.
With both dominators & predominators pruning: 1,340,534.

Resubmit of r262103.

Differential Revision: http://reviews.llvm.org/D18341

llvm-svn: 264003
  • Loading branch information
aizatsky-chromium committed Mar 21, 2016
1 parent 32835c8 commit 602f792
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp
Expand Up @@ -315,20 +315,24 @@ bool SanitizerCoverageModule::runOnModule(Module &M) {
return true;
}

static bool shouldInstrumentBlock(const BasicBlock *BB,
const DominatorTree *DT) {
static bool shouldInstrumentBlock(const BasicBlock *BB, const DominatorTree *DT,
const PostDominatorTree *PDT) {
if (!ClPruneBlocks)
return true;
if (succ_begin(BB) == succ_end(BB))
return true;

// Check if BB dominates all its successors.
bool DominatesAll = succ_begin(BB) != succ_end(BB);
for (const BasicBlock *SUCC : make_range(succ_begin(BB), succ_end(BB))) {
if (!DT->dominates(BB, SUCC))
return true;
DominatesAll &= DT->dominates(BB, SUCC);
}

// Check if BB pre-dominates all predecessors.
bool PreDominatesAll = pred_begin(BB) != pred_end(BB);
for (const BasicBlock *PRED : make_range(pred_begin(BB), pred_end(BB))) {
PreDominatesAll &= PDT->dominates(BB, PRED);
}

return false;
return !(DominatesAll || PreDominatesAll);
}

bool SanitizerCoverageModule::runOnFunction(Function &F) {
Expand All @@ -349,10 +353,13 @@ bool SanitizerCoverageModule::runOnFunction(Function &F) {
SmallVector<Instruction *, 8> CmpTraceTargets;
SmallVector<Instruction *, 8> SwitchTraceTargets;

DominatorTree DT;
DT.recalculate(F);
const DominatorTree *DT =
&getAnalysis<DominatorTreeWrapperPass>(F).getDomTree();
const PostDominatorTree *PDT =
&getAnalysis<PostDominatorTreeWrapperPass>(F).getPostDomTree();

for (auto &BB : F) {
if (shouldInstrumentBlock(&BB, &DT))
if (shouldInstrumentBlock(&BB, DT, PDT))
BlocksToInstrument.push_back(&BB);
for (auto &Inst : BB) {
if (Options.IndirectCalls) {
Expand Down

0 comments on commit 602f792

Please sign in to comment.