Some ProfileInfo cleanups.

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

llvm-svn: 78485

llvm/include/llvm/Analysis/LoopInfo.h

@@ -229,7 +229,7 @@ public:
            I != E; ++I)
         if (!std::binary_search(LoopBBs.begin(), LoopBBs.end(), *I))
           // Not in current loop? It must be an exit block.
-          ExitEdges.push_back(std::make_pair(*BI,*I));
+          ExitEdges.push_back(std::make_pair(*BI, *I));
   }
 
   /// getUniqueExitBlocks - Return all unique successor blocks of this loop. 

llvm/include/llvm/Analysis/ProfileInfo.h

@@ -67,7 +67,7 @@ namespace llvm {
 
     // getEdge() - Creates an Edge from two BasicBlocks.
     static Edge getEdge(const BasicBlock* Src, const BasicBlock* Dest) {
-      return std::make_pair(Src,Dest);
+      return std::make_pair(Src, Dest);
     }
 
     //===------------------------------------------------------------------===//

llvm/lib/Analysis/ProfileInfo.cpp

@@ -64,6 +64,7 @@ double ProfileInfo::getExecutionCount(const BasicBlock *BB) {
 }
 
 double ProfileInfo::getExecutionCount(const Function *F) {
+  if (F->isDeclaration()) return MissingValue;
   std::map<const Function*, double>::iterator J =
     FunctionInformation.find(F);
   if (J != FunctionInformation.end())

llvm/lib/Analysis/ProfileInfoLoaderPass.cpp

@@ -77,7 +77,7 @@ bool LoaderPass::runOnModule(Module &M) {
     for (Module::iterator F = M.begin(), E = M.end(); F != E; ++F) {
       if (F->isDeclaration()) continue;
       if (ei < ECs.size())
-        EdgeInformation[F][ProfileInfo::getEdge(0,&F->getEntryBlock())] +=
+        EdgeInformation[F][ProfileInfo::getEdge(0, &F->getEntryBlock())] +=
           ECs[ei++];
       for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
         // Okay, we have to add a counter of each outgoing edge.  If the

llvm/tools/llvm-prof/llvm-prof.cpp

@@ -78,24 +78,22 @@ namespace {
     ProfileAnnotator(ProfileInfo& pi) : PI(pi) {}
 
     virtual void emitFunctionAnnot(const Function *F, raw_ostream &OS) {
-      OS << ";;; %" << F->getName() << " called ";
       double w = PI.getExecutionCount(F);
-      if (w == ProfileInfo::MissingValue)
+      if (w != ProfileInfo::MissingValue) {
-        OS << "(no value)";
+        OS << ";;; %" << F->getName() << " called "<<(unsigned)w
-      else
+           <<" times.\n;;;\n";
-        OS << (unsigned)w;
+      }
-      OS << " times.\n;;;\n";
     }
     virtual void emitBasicBlockStartAnnot(const BasicBlock *BB,
                                           raw_ostream &OS) {
       double w = PI.getExecutionCount(BB);
-      if (w == ProfileInfo::MissingValue)
+      if (w != ProfileInfo::MissingValue) {
-        OS << "\t;;; (no value)\n";
+        if (w != 0) {
-      else
+          OS << "\t;;; Basic block executed " << (unsigned)w << " times.\n";
-        if (w != 0)
+        } else {
-          OS << "\t;;; Basic block executed " << w << " times.\n";
-        else
           OS << "\t;;; Never executed!\n";
+        }
+      }
     }
 
     virtual void emitBasicBlockEndAnnot(const BasicBlock *BB, raw_ostream &OS) {
@@ -105,8 +103,9 @@ namespace {
       const TerminatorInst *TI = BB->getTerminator();
       for (unsigned s = 0, e = TI->getNumSuccessors(); s != e; ++s) {
         BasicBlock* Succ = TI->getSuccessor(s);
-        double w = ignoreMissing(PI.getEdgeWeight(std::make_pair(BB,Succ)));
+        double w = ignoreMissing(PI.getEdgeWeight(std::make_pair(BB, Succ)));
-        SuccCounts.push_back(std::make_pair(std::make_pair(BB,Succ), w));
+        if (w != 0)
+          SuccCounts.push_back(std::make_pair(std::make_pair(BB, Succ), w));
       }
       if (!SuccCounts.empty()) {
         OS << "\t;;; Out-edge counts:";
@@ -157,11 +156,11 @@ bool ProfileInfoPrinterPass::runOnModule(Module &M) {
   for (Module::iterator FI = M.begin(), FE = M.end(); FI != FE; ++FI) {
     if (FI->isDeclaration()) continue;
     double w = ignoreMissing(PI.getExecutionCount(FI));
-    FunctionCounts.push_back(std::make_pair(FI,w));
+    FunctionCounts.push_back(std::make_pair(FI, w));
     for (Function::iterator BB = FI->begin(), BBE = FI->end(); 
          BB != BBE; ++BB) {
       double w = ignoreMissing(PI.getExecutionCount(BB));
-      Counts.push_back(std::make_pair(BB,w));
+      Counts.push_back(std::make_pair(BB, w));
     }
   }