[llvm-cov] Improvements for summary report generated in HTML format.

[Dor1s]

Summary

This commit adds the following changes:

1. coverage numbers are aligned to the left and padded with spaces in order to

provide better readability for percentage values, e.g.:

file1     |  89.13% (123 / 2323)    | 100.00% (55 / 55)    |   9.33% (14545 / 234234)
file_asda |   1.78% ( 23 / 4323)    |  32.31% (555 / 6555) |  67.89% (1545 / 2234)
fileXXX   | 100.00% (12323 / 12323) | 100.00% (555 / 555)  | 100.00% (12345 / 12345)

2. added "hover" attribute to CSS for highlighting table row under mouse cursor

see screenshot attached to the phabricator review page

3. table title row and "totals" row now use bold text

[Dor1s]

I need to fix some style-related tests, but first I'd like to see what you think about the change.

Please take a look :)

[morehouse]

Changes look nice visually. I think standard practice is to right-align numerical entries, but that might require a bit more work to pad properly.

[Dor1s]

In D42093#977230, @morehouse wrote:

Changes look nice visually. I think standard practice is to right-align numerical entries, but that might require a bit more work to pad properly.

Yeah... I can add more padding from the left, if it feels better.

[Dor1s]

Vedant, friendly ping :)

[vsk]

Looks good from my end, sorry for the delay.

[Dor1s]

Update the tests

[Dor1s]

Minor test improvement

test/tools/llvm-cov/hideUnexecutedSubviews.test

 RUN: llvm-profdata merge %S/Inputs/hideUnexecutedSubviews.proftext -o %t.profdata
 
 RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %t.profdata -show-region-summary -show-instantiation-summary -path-equivalence=/tmp,%S %S/showTemplateInstantiations.cpp | FileCheck -check-prefix=FILE %s
 
 RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %t.profdata -format html -show-region-summary -show-instantiation-summary -o %t.html.dir -path-equivalence=/tmp,%S %S/showTemplateInstantiations.cpp
 RUN: FileCheck -check-prefix=FILE %s -input-file %t.html.dir/coverage/tmp/showTemplateInstantiations.cpp.html
 
 FILE: Unexecuted instantiation: _Z4funcIiEiT_
 FILE: Unexecuted instantiation: _Z4funcIbEiT_
 FILE-NOT: Unexecuted instantiation
 
 RUN: FileCheck -check-prefix=INDEX %s -input-file %t.html.dir/index.html
 
-INDEX: <td class='column-entry-left'>Filename</td>
-INDEX: <td class='column-entry'>Function Coverage</td>
-INDEX: <td class='column-entry'>Instantiation Coverage</td>
-INDEX: <td class='column-entry'>Line Coverage</td>
-INDEX: <td class='column-entry'>Region Coverage</td>
+INDEX: <td class='column-entry-bold'>Filename</td>
+INDEX: <td class='column-entry-bold'>Function Coverage</td>
+INDEX: <td class='column-entry-bold'>Instantiation Coverage</td>
+INDEX: <td class='column-entry-bold'>Line Coverage</td>
+INDEX: <td class='column-entry-bold'>Region Coverage</td>
 INDEX: <td class='column-entry-red'>
 INDEX: 50.00% (1/2)
 INDEX: <td class='column-entry-red'>
 INDEX: 33.33% (1/3)
 INDEX: <td class='column-entry-red'>
 INDEX: 41.67% (5/12)
 INDEX: <td class='column-entry-red'>
 INDEX: 16.67% (1/6)

test/tools/llvm-cov/showLineExecutionCounts.cpp

 // Test index creation.
 // RUN: FileCheck -check-prefix=TEXT-INDEX -input-file %t.dir/index.txt %s
 // TEXT-INDEX: Filename
 // TEXT-INDEX-NEXT: ---
 // TEXT-INDEX-NEXT: {{.*}}showLineExecutionCounts.cpp
 //
 // RUN: FileCheck -check-prefix HTML-INDEX -input-file %t.html.dir/index.html %s
 // HTML-INDEX-LABEL: <table>
-// HTML-INDEX: <td class='column-entry-left'>Filename</td>
-// HTML-INDEX: <td class='column-entry'>Function Coverage</td>
-// HTML-INDEX: <td class='column-entry'>Line Coverage</td>
-// HTML-INDEX: <td class='column-entry'>Region Coverage</td>
+// HTML-INDEX: <td class='column-entry-bold'>Filename</td>
+// HTML-INDEX: <td class='column-entry-bold'>Function Coverage</td>
+// HTML-INDEX: <td class='column-entry-bold'>Line Coverage</td>
+// HTML-INDEX: <td class='column-entry-bold'>Region Coverage</td>
 // HTML-INDEX: <a href='coverage{{.*}}showLineExecutionCounts.cpp.html'{{.*}}showLineExecutionCounts.cpp</a>
 // HTML-INDEX: <td class='column-entry-green'>
 // HTML-INDEX: 100.00% (1/1)
 // HTML-INDEX: <td class='column-entry-yellow'>
 // HTML-INDEX: 90.00% (18/20)
 // HTML-INDEX: <td class='column-entry-red'>
 // HTML-INDEX: 72.73% (8/11)
-// HTML-INDEX: TOTALS
+// HTML-INDEX: <tr class='light-row-bold'>
+// HTML-INDEX: Totals

test/tools/llvm-cov/style.test

 
 STYLE-DAG: .red
 STYLE-DAG: .cyan
 STYLE-DAG: .source-name-title
 STYLE-DAG: .centered
 STYLE-DAG: .expansion-view
 STYLE-DAG: .line-number
 STYLE-DAG: .light-row
+STYLE-DAG: .light-row-bold
 STYLE-DAG: .column-entry
-STYLE-DAG: .column-entry-left
+STYLE-DAG: .column-entry-bold
 STYLE-DAG: .column-entry-yellow
+STYLE-DAG: .column-entry-yellow:hover
 STYLE-DAG: .column-entry-red
+STYLE-DAG: .column-entry-red:hover
 STYLE-DAG: .column-entry-green
+STYLE-DAG: .column-entry-green:hover
 STYLE-DAG: .covered-line
 STYLE-DAG: .uncovered-line
 STYLE-DAG: .tooltip
 STYLE-DAG: .tooltip span.tooltip-content
+STYLE-DAG: th, td
+STYLE-DAG: td:first-child
+STYLE-DAG: td:last-child
+STYLE-DAG: tr:hover
 
 TOPLEVEL-NOT: <style>
 TOPLEVEL: <head>
 TOPLEVEL: <link rel='stylesheet' type='text/css' href='style.css'>
 TOPLEVEL: </head>
 
 FILEVIEW-NOT: <style>
 FILEVIEW: <head>
 FILEVIEW: <link rel='stylesheet' type='text/css' href='..{{.*}}..{{.*}}style.css'>
 FILEVIEW: </head>
 
 NODIR: <head>
 NODIR: <style>
 NODIR: </style>
 NODIR: </head>

tools/llvm-cov/SourceCoverageViewHTML.cpp

 }
 table {
   border-collapse: collapse;
 }
 .light-row {
   background: #ffffff;
   border: 1px solid #dbdbdb;
 }
+.light-row-bold {
+  background: #ffffff;
+  border: 1px solid #dbdbdb;
+  font-weight: bold;
+}
 .column-entry {
-  text-align: right;
+  text-align: left;
 }
-.column-entry-left {
+.column-entry-bold {
+  font-weight: bold;
   text-align: left;
 }
 .column-entry-yellow {
-  text-align: right;
+  text-align: left;
   background-color: #ffffd0;
 }
+.column-entry-yellow:hover {
+  background-color: #fffff0;
+}
 .column-entry-red {
-  text-align: right;
+  text-align: left;
   background-color: #ffd0d0;
 }
+.column-entry-red:hover {
+  background-color: #fff0f0;
+}
 .column-entry-green {
-  text-align: right;
+  text-align: left;
   background-color: #d0ffd0;
 }
+.column-entry-green:hover {
+  background-color: #f0fff0;
+}
 .line-number {
   text-align: right;
   color: #aaa;
 }
 .covered-line {
   text-align: right;
   color: #0080ff;
 }
:hover.tooltip span.tooltip-content {
   visibility: visible;
   opacity: 0.8;
   bottom: 30px;
   left: 50%;
   z-index: 999;
 }
 th, td {
   vertical-align: top;
-  padding: 2px 5px;
+  padding: 2px 8px;
   border-collapse: collapse;
   border-right: solid 1px #eee;
   border-left: solid 1px #eee;
+  text-align: left;
 }
 td:first-child {
   border-left: none;
 }
 td:last-child {
   border-right: none;
 }
+tr:hover {
+  background-color: #f0f0f0;
+}
 )";
 
 const char *EndHeader = "</head>";
 
 const char *BeginCenteredDiv = "<div class='centered'>";
 
 const char *EndCenteredDiv = "</div>";
 

 void CoveragePrinterHTML::closeViewFile(OwnedStream OS) {
   emitEpilog(*OS.get());
 }
 
 /// Emit column labels for the table in the index.
 static void emitColumnLabelsForIndex(raw_ostream &OS,
                                      const CoverageViewOptions &Opts) {
   SmallVector<std::string, 4> Columns;
-  Columns.emplace_back(tag("td", "Filename", "column-entry-left"));
-  Columns.emplace_back(tag("td", "Function Coverage", "column-entry"));
+  Columns.emplace_back(tag("td", "Filename", "column-entry-bold"));
+  Columns.emplace_back(tag("td", "Function Coverage", "column-entry-bold"));
   if (Opts.ShowInstantiationSummary)
-    Columns.emplace_back(tag("td", "Instantiation Coverage", "column-entry"));
-  Columns.emplace_back(tag("td", "Line Coverage", "column-entry"));
+    Columns.emplace_back(
+        tag("td", "Instantiation Coverage", "column-entry-bold"));
+  Columns.emplace_back(tag("td", "Line Coverage", "column-entry-bold"));
   if (Opts.ShowRegionSummary)
-    Columns.emplace_back(tag("td", "Region Coverage", "column-entry"));
+    Columns.emplace_back(tag("td", "Region Coverage", "column-entry-bold"));
   OS << tag("tr", join(Columns.begin(), Columns.end(), ""));
 }
 
 std::string
 CoveragePrinterHTML::buildLinkToFile(StringRef SF,
                                      const FileCoverageSummary &FCS) const {
   SmallString<128> LinkTextStr(sys::path::relative_path(FCS.Name));
   sys::path::remove_dots(LinkTextStr, /*remove_dot_dots=*/true);
void CoveragePrinterHTML::emitFileSummary(raw_ostream &OS, StringRef SF,
 
   // Format a coverage triple and add the result to the list of columns.
   auto AddCoverageTripleToColumn = [&Columns](unsigned Hit, unsigned Total,
                                               float Pctg) {
     std::string S;
     {
       raw_string_ostream RSO{S};
       if (Total)
-        RSO << format("%*.2f", 7, Pctg) << "% ";
+        RSO << format("%6.2f", 7, Pctg) << "% ";
       else
         RSO << "- ";
       RSO << '(' << Hit << '/' << Total << ')';
     }
     const char *CellClass = "column-entry-yellow";
     if (Hit == Total)
       CellClass = "column-entry-green";
     else if (Pctg < 80.0)
       CellClass = "column-entry-red";
     Columns.emplace_back(tag("td", tag("pre", S), CellClass));
   };
 
   // Simplify the display file path, and wrap it in a link if requested.
   std::string Filename;
   if (IsTotals) {
-    Filename = "TOTALS";
+    Filename = SF;
   } else {
     Filename = buildLinkToFile(SF, FCS);
   }
 
   Columns.emplace_back(tag("td", tag("pre", Filename)));
   AddCoverageTripleToColumn(FCS.FunctionCoverage.getExecuted(),
                             FCS.FunctionCoverage.getNumFunctions(),
                             FCS.FunctionCoverage.getPercentCovered());
   if (Opts.ShowInstantiationSummary)
     AddCoverageTripleToColumn(FCS.InstantiationCoverage.getExecuted(),
                               FCS.InstantiationCoverage.getNumFunctions(),
                               FCS.InstantiationCoverage.getPercentCovered());
   AddCoverageTripleToColumn(FCS.LineCoverage.getCovered(),
                             FCS.LineCoverage.getNumLines(),
                             FCS.LineCoverage.getPercentCovered());
   if (Opts.ShowRegionSummary)
     AddCoverageTripleToColumn(FCS.RegionCoverage.getCovered(),
                               FCS.RegionCoverage.getNumRegions(),
                               FCS.RegionCoverage.getPercentCovered());
 
+  if (IsTotals)
+    OS << tag("tr", join(Columns.begin(), Columns.end(), ""), "light-row-bold");
+  else
     OS << tag("tr", join(Columns.begin(), Columns.end(), ""), "light-row");
 }
 
 Error CoveragePrinterHTML::createIndexFile(
     ArrayRef<std::string> SourceFiles, const CoverageMapping &Coverage,
     const CoverageFiltersMatchAll &Filters) {
   // Emit the default stylesheet.
   auto CSSOrErr = createOutputStream("style", "css", /*InToplevel=*/true);
   if (Error E = CSSOrErr.takeError())