[Coverage][llvm-cov] (wip) print function names in MC/DC views indica…

…ting which instantiation this one is from
xlab-uiuc · Mar 6, 2024 · 251082f · 251082f
1 parent 72313b4
commit 251082f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
@@ -391,6 +391,9 @@ struct MCDCRecord {
   using LineColPairMap = llvm::DenseMap<unsigned, LineColPair>;
   using FileIDMap = llvm::DenseMap<unsigned, unsigned>;
 
+  // FIXME should not be public
+  std::string FuncName;
+
 private:
   CounterMappingRegion Region;
   TestVectors TV;

diff --git a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
@@ -1405,9 +1405,17 @@ CoverageData CoverageMapping::getCoverageForFile(StringRef Filename) const {
       if (FileIDs.test(CR.FileID) && (CR.FileID == CR.ExpandedFileID))
         FileCoverage.BranchRegions.push_back(CR);
     // Capture MCDC records specific to the function.
-    for (const auto &MR : Function.MCDCRecords)
-      if (FileIDs.test(MR.getDecisionRegion().FileID))
+    // FIXME This is so far the most convenient place I can find where the function
+    //       name is easily available. Can this assignment/copy happen even earlier?
+    //       1. Earlier in visualization, e.g. ctor of MCDCRecord, so that here we
+    //          continue using const and &
+    //       2. Front end
+    for (auto MR : Function.MCDCRecords) {
+      if (FileIDs.test(MR.getDecisionRegion().FileID)) {
+        MR.FuncName = Function.Name;
         FileCoverage.MCDCRecords.push_back(MR);
+      }
+    }
   }
 
   LLVM_DEBUG(dbgs() << "Emitting segments for file: " << Filename << "\n");

diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp
@@ -989,6 +989,7 @@ void SourceCoverageViewHTML::renderMCDCView(raw_ostream &OS, MCDCView &MRV,
   for (auto &Record : MRV.Records) {
     OS << BeginExpansionDiv;
     OS << BeginPre;
+    OS << "  " << Record.FuncName << "\n\n";
     OS << "  MC/DC Decision Region (";
 
     // Display Line + Column information.

diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp
@@ -351,6 +351,11 @@ void SourceCoverageViewText::renderMCDCView(raw_ostream &OS, MCDCView &MRV,
     renderLinePrefix(OS, ViewDepth);
     OS << "\n";
 
+    renderLinePrefix(OS, ViewDepth);
+    OS << "  " << Record.FuncName << "\n";
+    renderLinePrefix(OS, ViewDepth);
+    OS << "\n";
+
     // Display MC/DC Information.
     renderLinePrefix(OS, ViewDepth);
     OS << "  Number of Conditions: " << Record.getNumConditions() << "\n";