Make block and function count available via ProfileInfo.

 - Part of optimal static profiling patch sequence by Andreas Neustifter.

llvm-svn: 78247

1 files changed, 3 insertions, 4 deletions

diff --git a/llvm/tools/llvm-prof/llvm-prof.cpp b/llvm/tools/llvm-prof/llvm-prof.cpp
index 64fe4515006..d3971d30d15 100644
--- a/llvm/tools/llvm-prof/llvm-prof.cpp
+++ b/llvm/tools/llvm-prof/llvm-prof.cpp
@@ -142,9 +142,8 @@ bool ProfileInfoPrinterPass::runOnModule(Module &M) {
   std::vector<std::pair<Function*, unsigned> > FunctionCounts;
   std::vector<std::pair<BasicBlock*, unsigned> > Counts;
   for (Module::iterator FI = M.begin(), FE = M.end(); FI != FE; ++FI) {
-    unsigned w = PI.getExecutionCount(FI);
-    if (w != (unsigned) -1)
-      FunctionCounts.push_back(std::make_pair(FI,PI.getExecutionCount(FI)));
+    if (FI->isDeclaration()) continue;
+    FunctionCounts.push_back(std::make_pair(FI,PI.getExecutionCount(FI)));
     for (Function::iterator BB = FI->begin(), BBE = FI->end(); 
          BB != BBE; ++BB) {
       Counts.push_back(std::make_pair(BB,PI.getExecutionCount(BB)));
@@ -209,7 +208,7 @@ bool ProfileInfoPrinterPass::runOnModule(Module &M) {
     if (Counts[i].second == 0) break;
     Function *F = Counts[i].first->getParent();
     std::cout << std::setw(3) << i+1 << ". " 
-              << std::setw(5) << std::setprecision(2) 
+              << std::setw(5) << std::setprecision(3) 
               << Counts[i].second/(double)TotalExecutions*100 << "% "
               << std::setw(5) << Counts[i].second << "/"
               << TotalExecutions << "\t"