wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed set of BlocksToInstrument to set of InsertedBlocks that do not have to 

be instrumented.

llvm-svn: 80788
This commit is contained in:
Andreas Neustifter 2009-09-02 13:59:05 +00:00
parent 3645f5a99b
commit 964fa2bdac
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp
View File

@ -72,11 +72,6 @@ bool OptimalEdgeProfiler::runOnModule(Module &M) {
return false; // No main, no instrumentation! return false; // No main, no instrumentation!
} }
// BlocksToInstrument stores all blocks that are in the function prior to
// instrumenting, since the spliting of critical edges adds new blocks (which
// have not to be instrumented), we have to remember them for later.
std::set<BasicBlock*> BlocksToInstrument;
// NumEdges counts all the edges that may be instrumented. Later on its // NumEdges counts all the edges that may be instrumented. Later on its
// decided which edges to actually instrument, to achieve optimal profiling. // decided which edges to actually instrument, to achieve optimal profiling.
// For the entry block a virtual edge (0,entry) is reserved, for each block // For the entry block a virtual edge (0,entry) is reserved, for each block
@ -93,7 +88,6 @@ bool OptimalEdgeProfiler::runOnModule(Module &M) {
// Keep track of which blocks need to be instrumented. We don't want to // Keep track of which blocks need to be instrumented. We don't want to
// instrument blocks that are added as the result of breaking critical // instrument blocks that are added as the result of breaking critical
// edges! // edges!
BlocksToInstrument.insert(BB);
if (BB->getTerminator()->getNumSuccessors() == 0) { if (BB->getTerminator()->getNumSuccessors() == 0) {
// Reserve space for (BB,0) edge. // Reserve space for (BB,0) edge.
++NumEdges; ++NumEdges;
@ -151,9 +145,13 @@ bool OptimalEdgeProfiler::runOnModule(Module &M) {
Initializer[i++] = (minusonec); Initializer[i++] = (minusonec);
} }
// InsertedBlocks contains all blocks that were inserted for splitting an
// edge, this blocks do not have to be instrumented.
std::set<BasicBlock*> InsertedBlocks;
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) { for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
// Do not count blocks that where introduced by spliting critical edges. // Check if block was not inserted and thus does not have to be
if (!BlocksToInstrument.count(BB)) continue; // instrumented.
if (InsertedBlocks.count(BB)) continue;
// Okay, we have to add a counter of each outgoing edge not in MST. If // Okay, we have to add a counter of each outgoing edge not in MST. If
// the outgoing edge is not critical don't split it, just insert the // the outgoing edge is not critical don't split it, just insert the
@ -176,8 +174,10 @@ bool OptimalEdgeProfiler::runOnModule(Module &M) {
if (std::binary_search(MST.begin(), MST.end(), edge)) { if (std::binary_search(MST.begin(), MST.end(), edge)) {
// If the edge is critical, split it. // If the edge is critical, split it.
SplitCriticalEdge(TI,s,this); bool wasInserted = SplitCriticalEdge(TI, s, this);
Succ = TI->getSuccessor(s); Succ = TI->getSuccessor(s);
if(wasInserted)
InsertedBlocks.insert(Succ);
// Okay, we are guaranteed that the edge is no longer critical. If // Okay, we are guaranteed that the edge is no longer critical. If
// we only have a single successor, insert the counter in this block, // we only have a single successor, insert the counter in this block,