Add optional profile counts to block frequency dump.

[hjyamauchi]

Summary

Print profile counts as the third value in addition to the existing 'float' and
the 'int' values in the textual block frequency dump, if available.

[davidxl]

include/llvm/Analysis/BlockFrequencyInfoImpl.h

1286

can you just pass *F instead of *F->getFunction() ?

[hjyamauchi]

include/llvm/Analysis/BlockFrequencyInfoImpl.h

1286

It requires Function* and F can be either Function* or MachineFunction*. MachineFunction isn't a subtype of Function. Do you see otherwise? I tried several ways to handle this issue with templates, but they didn't seem to work mainly because MachineFunction isn't fully defined in this header file and this is a template function that can't be moved to a .cpp file.

[davidxl]

Perhaps provide a simple overload getBlockProfileCount for MachineFunction?

[davidxl]

lgtm

[hjyamauchi]

The last note is that, as I suspect, we don't include a header in CodeGen/ into a file under Analysis/ which prevents the overload idea from working.

include/llvm/Analysis/BlockFrequencyInfoImpl.h

 template <class BT>
 raw_ostream &BlockFrequencyInfoImpl<BT>::print(raw_ostream &OS) const {
   if (!F)
     return OS;
   OS << "block-frequency-info: " << F->getName() << "\n";
   for (const BlockT &BB : *F) {
     OS << " - " << bfi_detail::getBlockName(&BB) << ": float = ";
     getFloatingBlockFreq(&BB).print(OS, 5)
-        << ", int = " << getBlockFreq(&BB).getFrequency() << "\n";
+        << ", int = " << getBlockFreq(&BB).getFrequency();
+    if (Optional<uint64_t> ProfileCount =
+        BlockFrequencyInfoImplBase::getBlockProfileCount(
+            *F->getFunction(), getNode(&BB)))
+      OS << ", count = " << ProfileCount.getValue();
+    OS << "\n";
   }
 
   // Add an extra newline for readability.
   OS << "\n";
   return OS;
 }
 
 // Graph trait base class for block frequency information graph

include/llvm/IR/Function.h

private:
   Function(FunctionType *Ty, LinkageTypes Linkage,
            const Twine &N = "", Module *M = nullptr);
 
 public:
   Function(const Function&) = delete;
   void operator=(const Function&) = delete;
   ~Function();
 
+  // This is here to help easily convert from FunctionT * (Function * or
+  // MachineFunction *) in BlockFrequencyInfoImpl to Function * by calling
+  // FunctionT->getFunction().
+  const Function *getFunction() const { return this; }
+
   static Function *Create(FunctionType *Ty, LinkageTypes Linkage,
                           const Twine &N = "", Module *M = nullptr) {
     return new Function(Ty, Linkage, N, M);
   }
 
   // Provide fast operand accessors.
   DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Value);