Add the ability to synthesize function counts from block count information

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9595 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 10 insertions, 3 deletions

diff --git a/tools/llvm-prof/ProfileInfo.cpp b/tools/llvm-prof/ProfileInfo.cpp
index 4c31138aa3..78de9c16c7 100644
--- a/tools/llvm-prof/ProfileInfo.cpp
+++ b/tools/llvm-prof/ProfileInfo.cpp
@@ -141,8 +141,15 @@ ProfileInfo::ProfileInfo(const char *ToolName, const std::string &Filename,
 void ProfileInfo::getFunctionCounts(std::vector<std::pair<Function*,
                                                          unsigned> > &Counts) {
   if (FunctionCounts.empty()) {
-    std::cerr << "Function counts not available, and no synthesis "
-              << "is implemented yet!\n";
+    // Synthesize function frequency information from the number of times their
+    // entry blocks were executed.
+    std::vector<std::pair<BasicBlock*, unsigned> > BlockCounts;
+    getBlockCounts(BlockCounts);
+
+    for (unsigned i = 0, e = BlockCounts.size(); i != e; ++i)
+      if (&BlockCounts[i].first->getParent()->front() == BlockCounts[i].first)
+        Counts.push_back(std::make_pair(BlockCounts[i].first->getParent(),
+                                        BlockCounts[i].second));
     return;
   }
   
diff --git a/tools/llvm-prof/llvm-prof.cpp b/tools/llvm-prof/llvm-prof.cpp
index 083e1ce170..a459a38937 100644
--- a/tools/llvm-prof/llvm-prof.cpp
+++ b/tools/llvm-prof/llvm-prof.cpp
@@ -123,7 +123,7 @@ int main(int argc, char **argv) {
     unsigned BlocksToPrint = Counts.size();
     if (BlocksToPrint > 20) BlocksToPrint = 20;
     for (unsigned i = 0; i != BlocksToPrint; ++i)
-      printf("%3d. %5d/%d %s - %s\n", i+1, Counts[i].second, TotalExecutions,
+      printf("%3d. %5d/%d %s() - %s\n", i+1, Counts[i].second, TotalExecutions,
              Counts[i].first->getParent()->getName().c_str(),
              Counts[i].first->getName().c_str());