[llvm-profdata] Profile dump for compact binary format

Summary: Fix "llvm-profdata show" so it can work with compact binary format profile. The change is to mark all functions "used" so SampleProfileReaderCompactBinary::read will read in all profiles available for dumping. The function names will be MD5 hash for compact binary format.

Reviewers: wmi, davidxl, danielcdh

Subscribers: hiraditya, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D65162

llvm-svn: 368731

4 files changed, 29 insertions, 6 deletions

diff --git a/llvm/include/llvm/ProfileData/SampleProfReader.h b/llvm/include/llvm/ProfileData/SampleProfReader.h
index 969cdea859c..3820954de03 100644
--- a/llvm/include/llvm/ProfileData/SampleProfReader.h
+++ b/llvm/include/llvm/ProfileData/SampleProfReader.h
@@ -462,6 +462,8 @@ private:
   DenseMap<StringRef, uint64_t> FuncOffsetTable;
   /// The set containing the functions to use when compiling a module.
   DenseSet<StringRef> FuncsToUse;
+  /// Use all functions from the input profile.
+  bool UseAllFuncs = true;
   virtual std::error_code verifySPMagic(uint64_t Magic) override;
   virtual std::error_code readNameTable() override;
   /// Read a string indirectly via the name table.
diff --git a/llvm/lib/ProfileData/SampleProfReader.cpp b/llvm/lib/ProfileData/SampleProfReader.cpp
index 192b6c71156..659d6db6c6f 100644
--- a/llvm/lib/ProfileData/SampleProfReader.cpp
+++ b/llvm/lib/ProfileData/SampleProfReader.cpp
@@ -468,14 +468,26 @@ std::error_code SampleProfileReaderBinary::read() {
 }
 
 std::error_code SampleProfileReaderCompactBinary::read() {
-  for (auto Name : FuncsToUse) {
-    auto GUID = std::to_string(MD5Hash(Name));
-    auto iter = FuncOffsetTable.find(StringRef(GUID));
-    if (iter == FuncOffsetTable.end())
-      continue;
+  std::vector<uint64_t> OffsetsToUse;
+  if (UseAllFuncs) {
+    for (auto FuncEntry : FuncOffsetTable) {
+      OffsetsToUse.push_back(FuncEntry.second);
+    }
+  }
+  else {
+    for (auto Name : FuncsToUse) {
+      auto GUID = std::to_string(MD5Hash(Name));
+      auto iter = FuncOffsetTable.find(StringRef(GUID));
+      if (iter == FuncOffsetTable.end())
+        continue;
+      OffsetsToUse.push_back(iter->second);
+    }
+  }
+
+  for (auto Offset : OffsetsToUse) {
     const uint8_t *SavedData = Data;
     Data = reinterpret_cast<const uint8_t *>(Buffer->getBufferStart()) +
-           iter->second;
+           Offset;
     if (std::error_code EC = readFuncProfile())
       return EC;
     Data = SavedData;
@@ -591,6 +603,7 @@ std::error_code SampleProfileReaderCompactBinary::readFuncOffsetTable() {
 }
 
 void SampleProfileReaderCompactBinary::collectFuncsToUse(const Module &M) {
+  UseAllFuncs = false;
   FuncsToUse.clear();
   for (auto &F : M) {
     StringRef CanonName = FunctionSamples::getCanonicalFnName(F);
diff --git a/llvm/test/tools/llvm-profdata/Inputs/compat-sample.profdata b/llvm/test/tools/llvm-profdata/Inputs/compat-sample.profdata
new file mode 100644
index 00000000000..9c954d4feaf
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/Inputs/compat-sample.profdata
diff --git a/llvm/test/tools/llvm-profdata/compact-sample.proftext b/llvm/test/tools/llvm-profdata/compact-sample.proftext
new file mode 100644
index 00000000000..6eac2a071a6
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/compact-sample.proftext
@@ -0,0 +1,8 @@
+# Make sure "llvm-profdata show" works for sample profile in binary compact format
+
+# RUN: llvm-profdata show -sample %S/Inputs/compat-sample.profdata  | FileCheck %s 
+
+# CHECK: Function: 15822663052811949562: 17, 0, 6 sampled lines 
+# CHECK-NEXT: Samples collected in the function's body {
+# CHECK: Samples collected in inlined callsites {
+# CHECK-NEXT: 1: inlined callee: 6309742469962978389: 17, 0, 1