Index: test/tools/llvm-cov/Inputs/noZeroExecutionLine.proftext
===================================================================
--- /dev/null
+++ test/tools/llvm-cov/Inputs/noZeroExecutionLine.proftext
@@ -0,0 +1,9 @@
+main
+# Func Hash:
+4
+# Num Counters:
+2
+# Counter Values:
+1
+10
+
Index: test/tools/llvm-cov/Inputs/showProjectSummary.proftext
===================================================================
--- /dev/null
+++ test/tools/llvm-cov/Inputs/showProjectSummary.proftext
@@ -0,0 +1,10 @@
+main
+# Func Hash:
+266
+# Num Counters:
+3
+# Counter Values:
+1
+20
+0
+
Index: test/tools/llvm-cov/binary-formats.c
===================================================================
--- test/tools/llvm-cov/binary-formats.c
+++ test/tools/llvm-cov/binary-formats.c
@@ -1,6 +1,6 @@
 // Checks for reading various formats.
 
-// CHECK: 100| [[@LINE+1]]|int main
+// CHECK: [[@LINE+1]]| 100|int main
 int main(int argc, const char *argv[]) {}
 
 // RUN: llvm-profdata merge %S/Inputs/binary-formats.proftext -o %t.profdata
Index: test/tools/llvm-cov/combine_expansions.cpp
===================================================================
--- test/tools/llvm-cov/combine_expansions.cpp
+++ test/tools/llvm-cov/combine_expansions.cpp
@@ -5,22 +5,22 @@
 
 #define SIMPLE_OP \
   ++x
-// CHECK:       | [[@LINE-2]]|#define SIMPLE_OP
-// CHECK-NEXT: 2| [[@LINE-2]]|  ++x
+// CHECK:      [[@LINE-2]]|  |#define SIMPLE_OP
+// CHECK-NEXT: [[@LINE-2]]| 2|  ++x
 
 #define DO_SOMETHING \
   {                  \
     int x = 0;       \
     SIMPLE_OP;       \
   }
-// CHECK:       | [[@LINE-5]]|#define DO_SOMETHING
-// CHECK-NEXT: 2| [[@LINE-5]]|  {
-// CHECK-NEXT: 2| [[@LINE-5]]|    int x = 0;
-// CHECK-NEXT: 2| [[@LINE-5]]|    SIMPLE_OP;
-// CHECK-NEXT: 2| [[@LINE-5]]|  }
+// CHECK:      [[@LINE-5]]|  |#define DO_SOMETHING
+// CHECK-NEXT: [[@LINE-5]]| 2|  {
+// CHECK-NEXT: [[@LINE-5]]| 2|    int x = 0;
+// CHECK-NEXT: [[@LINE-5]]| 2|    SIMPLE_OP;
+// CHECK-NEXT: [[@LINE-5]]| 2|  }
 
-int main() {    // CHECK:      1| [[@LINE]]|int main() {
-  DO_SOMETHING; // CHECK-NEXT: 1| [[@LINE]]|  DO_SOMETHING;
-  DO_SOMETHING; // CHECK-NEXT: 1| [[@LINE]]|  DO_SOMETHING;
-  return 0;     // CHECK-NEXT: 1| [[@LINE]]|  return 0;
-}               // CHECK-NEXT: 1| [[@LINE]]|}
+int main() {    // CHECK:      [[@LINE]]| 1|int main() {
+  DO_SOMETHING; // CHECK-NEXT: [[@LINE]]| 1|  DO_SOMETHING;
+  DO_SOMETHING; // CHECK-NEXT: [[@LINE]]| 1|  DO_SOMETHING;
+  return 0;     // CHECK-NEXT: [[@LINE]]| 1|  return 0;
+}               // CHECK-NEXT: [[@LINE]]| 1|}
Index: test/tools/llvm-cov/noZeroExecutionLine.cpp
===================================================================
--- /dev/null
+++ test/tools/llvm-cov/noZeroExecutionLine.cpp
@@ -0,0 +1,16 @@
+// RUN: llvm-profdata merge -o %t.profdata %S/Inputs/noZeroExecutionLine.proftext
+// RUN: llvm-cov show %S/Inputs/noZeroExecutionLine.covmapping -instr-profile %t.profdata -filename-equivalence -format html -output-dir %t.dir %s
+// RUN: FileCheck -check-prefix=CHECK -check-prefix=WHOLE-FILE -input-file %t.dir/coverage/tmp/noZeroExecutionLine.cpp.html %s
+
+int main(int argc, char ** argv) {
+  int x=0;
+  for (int i = 0; i < 10; ++i)
+    x *= 2;
+  return x;
+}
+
+// CHECK: <a href="#zero" id="zeroline">Goto first zero count</a>
+// CHECK-NOT: <tr id="zero">
+// CHECK: <script type = "text/javascript">
+// CHECK: var zeroLink = document.getElementById("zeroline");
+// CHECK: disableLink(zeroLink);
Index: test/tools/llvm-cov/prefer_used_to_unused.h
===================================================================
--- test/tools/llvm-cov/prefer_used_to_unused.h
+++ test/tools/llvm-cov/prefer_used_to_unused.h
@@ -12,13 +12,13 @@
 // RUN: llvm-cov show %S/Inputs/prefer_used_to_unused.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck %s
 
 // Coverage data for this function has a non-zero hash value if it is used in the translation unit.
-inline int sampleFunc(int A) { // CHECK:      1| [[@LINE]]|inline int sampleFunc(int A) {
-  if (A > 0)                   // CHECK-NEXT: 1| [[@LINE]]|  if (A > 0)
-    return A;                  // CHECK-NEXT: 1| [[@LINE]]|    return A;
-  return 0;                    // CHECK-NEXT: 0| [[@LINE]]|  return 0;
-}                              // CHECK-NEXT: 1| [[@LINE]]|}
+inline int sampleFunc(int A) { // CHECK:      [[@LINE]]| 1|inline int sampleFunc(int A) {
+  if (A > 0)                   // CHECK-NEXT: [[@LINE]]| 1|  if (A > 0)
+    return A;                  // CHECK-NEXT: [[@LINE]]| 1|    return A;
+  return 0;                    // CHECK-NEXT: [[@LINE]]| 0|  return 0;
+}                              // CHECK-NEXT: [[@LINE]]| 1|}
 
 // The hash for this function is zero in both cases, either it is used in the translation unit or not.
-inline int simpleFunc(int A) { // CHECK:      1| [[@LINE]]|inline int simpleFunc(int A) {
-  return A;                    // CHECK-NEXT: 1| [[@LINE]]|  return A;
-}                              // CHECK-NEXT: 1| [[@LINE]]|}
+inline int simpleFunc(int A) { // CHECK:      [[@LINE]]| 1|inline int simpleFunc(int A) {
+  return A;                    // CHECK-NEXT: [[@LINE]]| 1|  return A;
+}                              // CHECK-NEXT: [[@LINE]]| 1|}
Index: test/tools/llvm-cov/showLineExecutionCounts.cpp
===================================================================
--- test/tools/llvm-cov/showLineExecutionCounts.cpp
+++ test/tools/llvm-cov/showLineExecutionCounts.cpp
@@ -1,30 +1,30 @@
 // Basic handling of line counts.
 // RUN: llvm-profdata merge %S/Inputs/lineExecutionCounts.proftext -o %t.profdata
 
-// before any coverage              // WHOLE-FILE:      | [[@LINE]]|// before
-                                    // FILTER-NOT:      | [[@LINE-1]]|// before
-int main() {                              // TEXT:   161| [[@LINE]]|int main(
-  int x = 0;                              // TEXT:   161| [[@LINE]]|  int x
-                                          // TEXT:   161| [[@LINE]]|
-  if (x) {                                // TEXT:     0| [[@LINE]]|  if (x)
-    x = 0;                                // TEXT:     0| [[@LINE]]|    x = 0
-  } else {                                // TEXT:   161| [[@LINE]]|  } else
-    x = 1;                                // TEXT:   161| [[@LINE]]|    x = 1
-  }                                       // TEXT:   161| [[@LINE]]|  }
-                                          // TEXT:   161| [[@LINE]]|
-  for (int i = 0; i < 100; ++i) {         // TEXT: 16.2k| [[@LINE]]|  for (
-    x = 1;                                // TEXT: 16.1k| [[@LINE]]|    x = 1
-  }                                       // TEXT: 16.1k| [[@LINE]]|  }
-                                          // TEXT:   161| [[@LINE]]|
-  x = x < 10 ? x + 1 : x - 1;             // TEXT:   161| [[@LINE]]|  x =
-  x = x > 10 ?                            // TEXT:   161| [[@LINE]]|  x =
-        x - 1:                            // TEXT:     0| [[@LINE]]|        x
-        x + 1;                            // TEXT:   161| [[@LINE]]|        x
-                                          // TEXT:   161| [[@LINE]]|
-  return 0;                               // TEXT:   161| [[@LINE]]|  return
-}                                         // TEXT:   161| [[@LINE]]|}
-// after coverage                   // WHOLE-FILE:      | [[@LINE]]|// after
-                                    // FILTER-NOT:      | [[@LINE-1]]|// after
+// before any coverage              // WHOLE-FILE: [[@LINE]]|      |// before
+                                    // FILTER-NOT: [[@LINE-1]]|    |// before
+int main() {                              // TEXT: [[@LINE]]|   161|int main(
+  int x = 0;                              // TEXT: [[@LINE]]|   161|  int x
+                                          // TEXT: [[@LINE]]|   161|
+  if (x) {                                // TEXT: [[@LINE]]|     0|  if (x)
+    x = 0;                                // TEXT: [[@LINE]]|     0|    x = 0
+  } else {                                // TEXT: [[@LINE]]|   161|  } else
+    x = 1;                                // TEXT: [[@LINE]]|   161|    x = 1
+  }                                       // TEXT: [[@LINE]]|   161|  }
+                                          // TEXT: [[@LINE]]|   161|
+  for (int i = 0; i < 100; ++i) {         // TEXT: [[@LINE]]| 16.2k|  for (
+    x = 1;                                // TEXT: [[@LINE]]| 16.1k|    x = 1
+  }                                       // TEXT: [[@LINE]]| 16.1k|  }
+                                          // TEXT: [[@LINE]]|   161|
+  x = x < 10 ? x + 1 : x - 1;             // TEXT: [[@LINE]]|   161|  x =
+  x = x > 10 ?                            // TEXT: [[@LINE]]|   161|  x =
+        x - 1:                            // TEXT: [[@LINE]]|     0|        x
+        x + 1;                            // TEXT: [[@LINE]]|   161|        x
+                                          // TEXT: [[@LINE]]|   161|
+  return 0;                               // TEXT: [[@LINE]]|   161|  return
+}                                         // TEXT: [[@LINE]]|   161|}
+// after coverage                   // WHOLE-FILE: [[@LINE]]|      |// after
+                                    // FILTER-NOT: [[@LINE-1]]|    |// after
 
 // RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck -check-prefixes=TEXT,WHOLE-FILE %s
 // RUN: llvm-cov show %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -filename-equivalence -name=main %s | FileCheck -check-prefixes=TEXT,FILTER %s
@@ -45,30 +45,30 @@
 // RUN: FileCheck -check-prefixes=HTML,HTML-WHOLE-FILE -input-file %t.html.dir/coverage/tmp/showLineExecutionCounts.cpp.html %s
 // RUN: FileCheck -check-prefixes=HTML,HTML-FILTER -input-file %t.html.dir/functions.html %s
 //
-// HTML-WHOLE-FILE: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>// before
-// HTML-FILTER-NOT: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='code'><pre>// before
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>int main() {
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  int x = 0
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>
-// HTML: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre><span class='red'>  if (x) {
-// HTML: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre><span class='red'>  }</span>
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>    x = 1;
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  }
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>
-// HTML: <td class='covered-line'><pre>16.2k</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  for (int i = 0; i &lt; 100; ++i)
-// HTML: <td class='covered-line'><pre>16.1k</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>    x = 1;
-// HTML: <td class='covered-line'><pre>16.1k</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  }
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  x = x &lt; 10
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  x = x &gt; 10
-// HTML: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre><span class='red'>        x - 1:
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>        x + 1;
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  return 0;
-// HTML: <td class='covered-line'><pre>161</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>}
-// HTML-WHOLE-FILE: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>// after
-// HTML-FILTER-NOT: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='code'><pre>// after
+// HTML-WHOLE-FILE: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
+// HTML-FILTER-NOT: <td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>int main() {
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>  int x = 0
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre><span class='red'>  if (x) {
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre>
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre><span class='red'>  }</span>
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>    x = 1;
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>  }
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>16.2k</pre></td><td class='code'><pre>  for (int i = 0; i &lt; 100; ++i)
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>16.1k</pre></td><td class='code'><pre>    x = 1;
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>16.1k</pre></td><td class='code'><pre>  }
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>  x = x &lt; 10
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>  x = x &gt; 10
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre><span class='red'>        x - 1:
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>        x + 1;
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>  return 0;
+// HTML: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>161</pre></td><td class='code'><pre>}
+// HTML-WHOLE-FILE: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// after
+// HTML-FILTER-NOT: <td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// after
 
 // RUN: llvm-cov export %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -name=main 2>/dev/null > %t.export.json
 // RUN: FileCheck -input-file %t.export.json %S/Inputs/lineExecutionCounts.json
Index: test/tools/llvm-cov/showProjectSummary.cpp
===================================================================
--- /dev/null
+++ test/tools/llvm-cov/showProjectSummary.cpp
@@ -0,0 +1,51 @@
+// RUN: llvm-profdata merge -o %t.profdata %S/Inputs/showProjectSummary.proftext
+
+int main(int argc, char ** argv) {
+  int x=0;
+  for (int i = 0; i < 20; ++i)
+    x *= 2;
+  if (x >= 100)
+    x = x / 2;
+  else
+    x = x * 2;
+  return x;
+}
+
+// Test console output.
+// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -filename-equivalence %s | FileCheck -check-prefixes=TEXT,TEXT-FILE,TEXT-HEADER %s
+// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -filename-equivalence %s | FileCheck -check-prefixes=TEXT-TITLE,TEXT,TEXT-FILE,TEXT-HEADER %s
+// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -instr-profile %t.profdata -project-title "Test Suite" -name=main -filename-equivalence %s | FileCheck -check-prefixes=TEXT-FUNCTION,TEXT-HEADER %s
+// TEXT-TITLE: Test Suite
+// TEXT: Code Coverage Report
+// TEXT: Created:
+// TEXT-FILE: showProjectSummary.cpp:
+// TEXT-FILE: showProjectSummary.covmapping:
+// TEXT-FUNCTION: main:
+// TEXT-HEADER: Line|  Count|Source
+
+// Test html output.
+// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata -filename-equivalence %s
+// RUN: FileCheck -check-prefixes=HTML,HTML-FILE,HTML-HEADER,HTML-ZERO,HTML-JS -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %s
+// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata -project-title "Test Suite" -filename-equivalence %s
+// RUN: FileCheck -check-prefixes=HTML-TITLE,HTML,HTML-FILE,HTML-HEADER,HTML-ZERO,HTML-JS -input-file %t.dir/coverage/tmp/showProjectSummary.cpp.html %s
+// RUN: FileCheck -check-prefixes=HTML-TITLE,HTML -input-file %t.dir/index.html %s
+// RUN: llvm-cov show %S/Inputs/showProjectSummary.covmapping -format=html -o %t.dir -instr-profile %t.profdata  -project-title "Test Suite" -filename-equivalence -name=main %s
+// RUN: FileCheck -check-prefixes=HTML-FUNCTION,HTML-HEADER -input-file %t.dir/functions.html %s
+// HTML-TITLE: <div class='project-title'>
+// HTML-TITLE: <span>Test Suite</span>
+// HTML: <div class='report-title'>
+// HTML: <span>Code Coverage Report</span>
+// HTML: <div class='created-time'>
+// HTML: <span>Created:
+// HTML-FILE: <pre>Source file:
+// HTML-FILE: showProjectSummary.cpp</pre>
+// HTML-FILE: <pre>Binary file:
+// HTML-FILE: showProjectSummary.covmapping</pre>
+// HTML-FUNCTION: <pre>Function: main</pre>
+// HTML-ZERO: <a href="#zero" id="zeroline">Goto first zero count</a>
+// HTML-HEADER: <tr><td><span><pre>Line No.</pre></span></td>
+// HTML-HEADER: <td><span><pre>Count No.</pre></span></td>
+// HTML-HEADER: <td><span><pre>Source</pre></span></td>
+// HTML-ZERO: <tr id="zero">
+// HTML-JS-NOT: <script type="text/javascript">
+// HTML-JS-NOT: var zeroLink = document.getElementById("zeroline");
Index: test/tools/llvm-cov/showTemplateInstantiations.cpp
===================================================================
--- test/tools/llvm-cov/showTemplateInstantiations.cpp
+++ test/tools/llvm-cov/showTemplateInstantiations.cpp
@@ -1,43 +1,43 @@
 // RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence %s | FileCheck -check-prefixes=SHARED,ALL %s
 // RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence -name=_Z4funcIbEiT_ %s | FileCheck -check-prefixes=SHARED,FILTER %s
 
-// before coverage   // ALL:          | [[@LINE]]|// before
-                     // FILTER-NOT:   | [[@LINE-1]]|// before
-template<typename T> // ALL:          | [[@LINE]]|template<typename T>
-int func(T x) {      // ALL-NEXT:    2| [[@LINE]]|int func(T x) {
-  if(x)              // ALL-NEXT:    2| [[@LINE]]|  if(x)
-    return 0;        // ALL-NEXT:    1| [[@LINE]]|    return 0;
-  else               // ALL-NEXT:    2| [[@LINE]]|  else
-    return 1;        // ALL-NEXT:    1| [[@LINE]]|    return 1;
-  int j = 1;         // ALL-NEXT:    0| [[@LINE]]|  int j = 1;
-}                    // ALL-NEXT:    2| [[@LINE]]|}
+// before coverage   // ALL:         [[@LINE]]|  |// before
+                     // FILTER-NOT:[[@LINE-1]]|  |// before
+template<typename T> // ALL:         [[@LINE]]|  |template<typename T>
+int func(T x) {      // ALL-NEXT:    [[@LINE]]| 2|int func(T x) {
+  if(x)              // ALL-NEXT:    [[@LINE]]| 2|  if(x)
+    return 0;        // ALL-NEXT:    [[@LINE]]| 1|    return 0;
+  else               // ALL-NEXT:    [[@LINE]]| 2|  else
+    return 1;        // ALL-NEXT:    [[@LINE]]| 1|    return 1;
+  int j = 1;         // ALL-NEXT:    [[@LINE]]| 0|  int j = 1;
+}                    // ALL-NEXT:    [[@LINE]]| 2|}
 
                      // SHARED:       {{^ *(\| )?}}_Z4funcIbEiT_:
-                     // SHARED-NEXT:  1| [[@LINE-9]]|int func(T x) {
-                     // SHARED-NEXT:  1| [[@LINE-9]]|  if(x)
-                     // SHARED-NEXT:  1| [[@LINE-9]]|    return 0;
-                     // SHARED-NEXT:  1| [[@LINE-9]]|  else
-                     // SHARED-NEXT:  0| [[@LINE-9]]|    return 1;
-                     // SHARED-NEXT:  0| [[@LINE-9]]|  int j = 1;
-                     // SHARED-NEXT:  1| [[@LINE-9]]|}
+                     // SHARED:  [[@LINE-9]]| 1|int func(T x) {
+                     // SHARED-NEXT:  [[@LINE-9]]| 1|  if(x)
+                     // SHARED-NEXT:  [[@LINE-9]]| 1|    return 0;
+                     // SHARED-NEXT:  [[@LINE-9]]| 1|  else
+                     // SHARED-NEXT:  [[@LINE-9]]| 0|    return 1;
+                     // SHARED-NEXT:  [[@LINE-9]]| 0|  int j = 1;
+                     // SHARED-NEXT:  [[@LINE-9]]| 1|}
 
                      // ALL:         {{^ *}}| _Z4funcIiEiT_:
                      // FILTER-NOT:  {{^ *(\| )?}} _Z4funcIiEiT_:
-                     // ALL-NEXT:    1| [[@LINE-19]]|int func(T x) {
-                     // ALL-NEXT:    1| [[@LINE-19]]|  if(x)
-                     // ALL-NEXT:    0| [[@LINE-19]]|    return 0;
-                     // ALL-NEXT:    1| [[@LINE-19]]|  else
-                     // ALL-NEXT:    1| [[@LINE-19]]|    return 1;
-                     // ALL-NEXT:    0| [[@LINE-19]]|  int j = 1;
-                     // ALL-NEXT:    1| [[@LINE-19]]|}
+                     // ALL:    [[@LINE-19]]| 1|int func(T x) {
+                     // ALL-NEXT:    [[@LINE-19]]| 1|  if(x)
+                     // ALL-NEXT:    [[@LINE-19]]| 0|    return 0;
+                     // ALL-NEXT:    [[@LINE-19]]| 1|  else
+                     // ALL-NEXT:    [[@LINE-19]]| 1|    return 1;
+                     // ALL-NEXT:    [[@LINE-19]]| 0|  int j = 1;
+                     // ALL-NEXT:    [[@LINE-19]]| 1|}
 
-int main() {         // ALL:         1| [[@LINE]]|int main() {
-  func<int>(0);      // ALL-NEXT:    1| [[@LINE]]|  func<int>(0);
-  func<bool>(true);  // ALL-NEXT:    1| [[@LINE]]|  func<bool>(true);
-  return 0;          // ALL-NEXT:    1| [[@LINE]]|  return 0;
-}                    // ALL-NEXT:    1| [[@LINE]]|}
-// after coverage    // ALL-NEXT:     | [[@LINE]]|// after
-                     // FILTER-NOT:   | [[@LINE-1]]|// after
+int main() {         // ALL:         [[@LINE]]| 1|int main() {
+  func<int>(0);      // ALL-NEXT:    [[@LINE]]| 1|  func<int>(0);
+  func<bool>(true);  // ALL-NEXT:    [[@LINE]]| 1|  func<bool>(true);
+  return 0;          // ALL-NEXT:    [[@LINE]]| 1|  return 0;
+}                    // ALL-NEXT:    [[@LINE]]| 1|}
+// after coverage    // ALL-NEXT:    [[@LINE]]|  |// after
+                     // FILTER-NOT:[[@LINE-1]]|  |// after
 
 // Test html output.
 // RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence %s -format html -o %t.html.dir
@@ -45,41 +45,41 @@
 // RUN: FileCheck -check-prefixes=HTML-SHARED,HTML-ALL -input-file=%t.html.dir/coverage/tmp/showTemplateInstantiations.cpp.html %s
 // RUN: FileCheck -check-prefixes=HTML-SHARED,HTML-FILTER -input-file=%t.html.dir/functions.html %s
 
-// HTML-ALL: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>// before
-// HTML-FILTER-NOT: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='code'><pre>// before
-// HTML-ALL: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>template&lt;typename T&gt;
-// HTML-ALL: <td class='covered-line'><pre>2</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>int func(T x) {
-// HTML-ALL: <td class='covered-line'><pre>2</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  if(x)
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>    ret
-// HTML-ALL: <td class='covered-line'><pre>2</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  else
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>    ret
-// HTML-ALL: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>
-// HTML-ALL: <td class='covered-line'><pre>2</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>}
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
+// HTML-FILTER-NOT: <td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// before
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>template&lt;typename T&gt;
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>2</pre></td><td class='code'><pre>int func(T x) {
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>2</pre></td><td class='code'><pre>  if(x)
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>    ret
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>2</pre></td><td class='code'><pre>  else
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>    ret
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre>
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>2</pre></td><td class='code'><pre>}
 
-// HTML-SHARED: <div class='source-name-title'><pre>_Z4funcIbEiT_</pre></div><table>
-// HTML-SHARED: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='code'><pre>int func(T x) {
-// HTML-SHARED: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='code'><pre>  if(x)
-// HTML-SHARED: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='code'><pre>    ret
-// HTML-SHARED: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='code'><pre>  else
-// HTML-SHARED: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='code'><pre>
-// HTML-SHARED: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='code'><pre>
-// HTML-SHARED: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='code'><pre>}
+// HTML-SHARED: <div class='source-name-title'><pre>Function: _Z4funcIbEiT_</pre></div>
+// HTML-SHARED: <td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>int func(T x) {
+// HTML-SHARED: <td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>  if(x)
+// HTML-SHARED: <td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>    ret
+// HTML-SHARED: <td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>  else
+// HTML-SHARED: <td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre>
+// HTML-SHARED: <td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre>
+// HTML-SHARED: <td class='line-number'><a name='L[[@LINE-53]]'><pre>[[@LINE-53]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>}
 
-// HTML-ALL: <div class='source-name-title'><pre>_Z4funcIiEiT_</pre></div><table>
+// HTML-ALL: <div class='source-name-title'><pre>Function: _Z4funcIiEiT_</pre></div>
 // HTML-FILTER-NOT: <div class='source-name-title'><pre>_Z4funcIiEiT_</pre></div><table>
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='code'><pre>int func(T x) {
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='code'><pre>  if(x)
-// HTML-ALL: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='code'><pre>
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='code'><pre>  else
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='code'><pre>    ret
-// HTML-ALL: <td class='uncovered-line'><pre>0</pre></td><td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='code'><pre>
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='code'><pre>}
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>int func(T x) {
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>  if(x)
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre>
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>  else
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>    ret
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='uncovered-line'><pre>0</pre></td><td class='code'><pre>
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-63]]'><pre>[[@LINE-63]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>}
 
-// HTML-ALL: td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>int main() {
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  func&lt;int&gt;(0);
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  func&lt;bool&gt;(true);
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>  return 0;
-// HTML-ALL: <td class='covered-line'><pre>1</pre></td><td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='code'><pre>}
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>int main() {
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>  func&lt;int&gt;(0);
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>  func&lt;bool&gt;(true);
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>  return 0;
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-44]]'><pre>[[@LINE-44]]</pre></a></td><td class='covered-line'><pre>1</pre></td><td class='code'><pre>}
 
-// HTML-ALL: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='code'><pre>// after
-// HTML-FILTER-NOT: <td class='uncovered-line'></td><td class='line-number'><a name='L[[@LINE-46]]'><pre>[[@LINE-46]]</pre></a></td><td class='code'><pre>// after
+// HTML-ALL: <td class='line-number'><a name='L[[@LINE-45]]'><pre>[[@LINE-45]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// after
+// HTML-FILTER-NOT: <td class='line-number'><a name='L[[@LINE-46]]'><pre>[[@LINE-46]]</pre></a></td><td class='uncovered-line'></td><td class='code'><pre>// after
Index: test/tools/llvm-cov/universal-binary.c
===================================================================
--- test/tools/llvm-cov/universal-binary.c
+++ test/tools/llvm-cov/universal-binary.c
@@ -1,6 +1,6 @@
 // The coverage reader should be able to handle universal binaries
 
-// CHECK: 100| [[@LINE+1]]|int main
+// CHECK: [[@LINE+1]]| 100|int main
 int main(int argc, const char *argv[]) {}
 
 // RUN: llvm-profdata merge %S/Inputs/universal-binary.proftext -o %t.profdata
Index: tools/llvm-cov/CodeCoverage.cpp
===================================================================
--- tools/llvm-cov/CodeCoverage.cpp
+++ tools/llvm-cov/CodeCoverage.cpp
@@ -463,6 +463,11 @@
     CompareFilenamesOnly = FilenameEquivalence;
 
     ViewOpts.Format = Format;
+    SmallString<128> ObjectFilePath(this->ObjectFilename);
+    sys::fs::make_absolute(ObjectFilePath);
+    // Canonicalize object file path to a native path to avoid mixed separator.
+    sys::path::native(ObjectFilePath);
+    ViewOpts.ObjectFilename = ObjectFilePath.c_str();
     switch (ViewOpts.Format) {
     case CoverageViewOptions::OutputFormat::Text:
       ViewOpts.Colors = UseColor == cl::BOU_UNSET
@@ -589,6 +594,10 @@
       cl::desc(
           "Set tab expansion size for html coverage reports (default = 2)"));
 
+  cl::opt<std::string> ProjectTitle(
+      "project-title", cl::Optional,
+      cl::desc("Set project title for the HTML coverage report"));
+
   auto Err = commandLineParser(argc, argv);
   if (Err)
     return Err;
@@ -602,6 +611,7 @@
   ViewOpts.ShowFunctionInstantiations = ShowInstantiations;
   ViewOpts.ShowOutputDirectory = ShowOutputDirectory;
   ViewOpts.TabSize = TabSize;
+  ViewOpts.ProjectTitle = ProjectTitle;
 
   if (ViewOpts.hasOutputDirectory()) {
     if (auto E = sys::fs::create_directories(ViewOpts.ShowOutputDirectory)) {
@@ -610,6 +620,18 @@
     }
   }
 
+  sys::fs::file_status Status;
+  if (sys::fs::status(PGOFilename, Status)) {
+    ViewOpts.colored_ostream(errs(), raw_ostream::RED)
+        << "profdata file error: can not get the file status. \n";
+    return 1;
+  }
+  auto ModifiedTime = Status.getLastModificationTime();
+  StringRef ModifiedTimeStr = ModifiedTime.str();
+  size_t found = ModifiedTimeStr.rfind(":");
+  SourceCoverageView::CreatedTimeStr =
+      "Created: " + ModifiedTimeStr.substr(0, found).str();
+
   auto Coverage = load();
   if (!Coverage)
     return 1;
@@ -643,7 +665,9 @@
   }
 
   // Show files
-  bool ShowFilenames = SourceFiles.size() != 1;
+  bool ShowFilenames =
+      (SourceFiles.size() != 1) ||
+      (ViewOpts.Format == CoverageViewOptions::OutputFormat::HTML);
 
   if (SourceFiles.empty())
     // Get the source files from the function coverage mapping.
Index: tools/llvm-cov/CoverageViewOptions.h
===================================================================
--- tools/llvm-cov/CoverageViewOptions.h
+++ tools/llvm-cov/CoverageViewOptions.h
@@ -35,6 +35,8 @@
   std::string ShowOutputDirectory;
   std::vector<std::string> DemanglerOpts;
   uint32_t TabSize;
+  std::string ProjectTitle;
+  std::string ObjectFilename;
 
   /// \brief Change the output's stream color if the colors are enabled.
   ColoredRawOstream colored_ostream(raw_ostream &OS,
@@ -47,6 +49,9 @@
 
   /// \brief Check if a demangler has been specified.
   bool hasDemangler() const { return !DemanglerOpts.empty(); }
+
+  /// \brief Check if a project title has been specified.
+  bool hasProjectTitle() const { return !ProjectTitle.empty(); }
 };
 }
 
Index: tools/llvm-cov/SourceCoverageView.h
===================================================================
--- tools/llvm-cov/SourceCoverageView.h
+++ tools/llvm-cov/SourceCoverageView.h
@@ -191,11 +191,24 @@
   /// \brief Render a footer for the view.
   virtual void renderViewFooter(raw_ostream &OS) = 0;
 
+  /// \brief Render the source and object name prefix.
+  virtual void renderSourceHeaderPrefix(raw_ostream &OS) = 0;
+
   /// \brief Render the source name for the view.
   virtual void renderSourceName(raw_ostream &OS) = 0;
 
+  /// \brief Render the object file name for the view.
+  virtual void renderObjectFilename(raw_ostream &OS) = 0;
+
+  /// \brief Render the "Goto First Zero Count" link for the view.
+  virtual void renderGotoFirstZero(raw_ostream &OS) = 0;
+
+  /// \brief Render the source and object name suffix.
+  virtual void renderSourceHeaderSuffix(raw_ostream &OS) = 0;
+
   /// \brief Render the line prefix at the given \p ViewDepth.
-  virtual void renderLinePrefix(raw_ostream &OS, unsigned ViewDepth) = 0;
+  virtual void renderLinePrefix(raw_ostream &OS, unsigned ViewDepth,
+                                bool IsFirstZeroLine) = 0;
 
   /// \brief Render the line suffix at the given \p ViewDepth.
   virtual void renderLineSuffix(raw_ostream &OS, unsigned ViewDepth) = 0;
@@ -236,6 +249,29 @@
   virtual void renderInstantiationView(raw_ostream &OS, InstantiationView &ISV,
                                        unsigned ViewDepth) = 0;
 
+  /// \brief Render the project title for the view.
+  virtual void renderProjectTitle(raw_ostream &OS) = 0;
+
+  /// \brief Render the report title for the view.
+  virtual void renderReportTitle(raw_ostream &OS) = 0;
+
+  /// \brief Render the created time for the view.
+  virtual void renderCreatedTime(raw_ostream &OS) = 0;
+
+  /// \brief Render the project summary for a given source file name.
+  virtual void renderProjectSummary(raw_ostream &OS) = 0;
+
+  /// \brief Render the table header for a given source file
+  virtual void renderTableHeader(raw_ostream &OS, unsigned IndentLevel = 0) = 0;
+
+  /// \brief Render the javascript header for a given source file.
+  virtual void renderJavaScriptHeader(raw_ostream &OS) = 0;
+
+  /// \brief Render the javascript body for a given source file.
+  virtual void renderJavaScriptBody(raw_ostream &OS) = 0;
+
+  /// \brief Render the javascript footer for a given source file.
+  virtual void renderJavaScriptFooter(raw_ostream &OS) = 0;
   /// @}
 
   /// \brief Format a count using engineering notation with 3 significant
@@ -255,6 +291,9 @@
         CoverageInfo(std::move(CoverageInfo)) {}
 
 public:
+  /// The created time of the profile data file.
+  static std::string CreatedTimeStr;
+
   static std::unique_ptr<SourceCoverageView>
   create(StringRef SourceName, const MemoryBuffer &File,
          const CoverageViewOptions &Options,
Index: tools/llvm-cov/SourceCoverageView.cpp
===================================================================
--- tools/llvm-cov/SourceCoverageView.cpp
+++ tools/llvm-cov/SourceCoverageView.cpp
@@ -135,11 +135,22 @@
 
 void SourceCoverageView::print(raw_ostream &OS, bool WholeFile,
                                bool ShowSourceName, unsigned ViewDepth) {
-  if (ShowSourceName)
-    renderSourceName(OS);
+  if (WholeFile)
+    renderProjectSummary(OS);
 
   renderViewHeader(OS);
 
+  if (ShowSourceName) {
+    renderSourceHeaderPrefix(OS);
+    renderSourceName(OS);
+    if (WholeFile) {
+      renderObjectFilename(OS);
+      renderGotoFirstZero(OS);
+    }
+    renderSourceHeaderSuffix(OS);
+  }
+
+  renderTableHeader(OS, ViewDepth);
   // We need the expansions and instantiations sorted so we can go through them
   // while we iterate lines.
   std::sort(ExpansionSubViews.begin(), ExpansionSubViews.end());
@@ -156,7 +167,9 @@
   unsigned FirstLine = NextSegment != EndSegment ? NextSegment->Line : 0;
   const coverage::CoverageSegment *WrappedSegment = nullptr;
   SmallVector<const coverage::CoverageSegment *, 8> LineSegments;
+  bool FileHasZeroLine = false;
   for (line_iterator LI(File, /*SkipBlanks=*/false); !LI.is_at_eof(); ++LI) {
+    bool IsFirstZeroLine = false;
     // If we aren't rendering the whole file, we need to filter out the prologue
     // and epilogue.
     if (!WholeFile) {
@@ -181,11 +194,17 @@
       if (S->HasCount && S->IsRegionEntry)
         LineCount.addRegionStartCount(S->Count);
 
-    renderLinePrefix(OS, ViewDepth);
-    if (getOptions().ShowLineStats)
-      renderLineCoverageColumn(OS, LineCount);
+    if (WholeFile && !FileHasZeroLine && LineCount.isMapped() &&
+        !LineCount.ExecutionCount) {
+      FileHasZeroLine = true;
+      IsFirstZeroLine = true;
+    }
+
+    renderLinePrefix(OS, ViewDepth, IsFirstZeroLine);
     if (getOptions().ShowLineNumbers)
       renderLineNumberColumn(OS, LI.line_number());
+    if (getOptions().ShowLineStats)
+      renderLineCoverageColumn(OS, LineCount);
 
     // If there are expansion subviews, we want to highlight the first one.
     unsigned ExpansionColumn = 0;
@@ -229,5 +248,10 @@
     renderLineSuffix(OS, ViewDepth);
   }
 
+  if (WholeFile && !FileHasZeroLine) {
+    renderJavaScriptHeader(OS);
+    renderJavaScriptBody(OS);
+    renderJavaScriptFooter(OS);
+  }
   renderViewFooter(OS);
 }
Index: tools/llvm-cov/SourceCoverageViewHTML.h
===================================================================
--- tools/llvm-cov/SourceCoverageViewHTML.h
+++ tools/llvm-cov/SourceCoverageViewHTML.h
@@ -38,9 +38,17 @@
 
   void renderViewFooter(raw_ostream &OS) override;
 
+  void renderSourceHeaderPrefix(raw_ostream &OS) override;
+
   void renderSourceName(raw_ostream &OS) override;
 
-  void renderLinePrefix(raw_ostream &OS, unsigned ViewDepth) override;
+  void renderObjectFilename(raw_ostream &OS) override;
+
+  void renderGotoFirstZero(raw_ostream &OS) override;
+
+  void renderSourceHeaderSuffix(raw_ostream &OS) override;
+
+  void renderLinePrefix(raw_ostream &OS, unsigned ViewDepth, bool IsFirstZeroLine) override;
 
   void renderLineSuffix(raw_ostream &OS, unsigned ViewDepth) override;
 
@@ -70,6 +78,22 @@
   void renderRegionMarkers(raw_ostream &OS, CoverageSegmentArray Segments,
                            unsigned ViewDepth) override;
 
+  void renderProjectTitle(raw_ostream &OS) override;
+
+  void renderReportTitle(raw_ostream &OS) override;
+
+  void renderCreatedTime(raw_ostream &OS) override;
+
+  void renderProjectSummary(raw_ostream &OS) override;
+
+  void renderTableHeader(raw_ostream &OS, unsigned IndentLevel) override;
+
+  void renderJavaScriptHeader(raw_ostream &OS) override;
+
+  void renderJavaScriptBody(raw_ostream &OS) override;
+
+  void renderJavaScriptFooter(raw_ostream &OS) override;
+
 public:
   SourceCoverageViewHTML(StringRef SourceName, const MemoryBuffer &File,
                          const CoverageViewOptions &Options,
Index: tools/llvm-cov/SourceCoverageViewHTML.cpp
===================================================================
--- tools/llvm-cov/SourceCoverageViewHTML.cpp
+++ tools/llvm-cov/SourceCoverageViewHTML.cpp
@@ -15,9 +15,11 @@
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
 using namespace llvm;
+std::string SourceCoverageView::CreatedTimeStr;
 
 namespace {
 
@@ -88,10 +90,11 @@
   padding: 5px 10px;
   border-bottom: 1px solid #dbdbdb;
   background-color: #eee;
+  line-height: 35px;
 }
 .centered {
   display: table;
-  margin-left: auto;
+  margin-left: left;
   margin-right: auto;
   border: 1px solid #dbdbdb;
   border-radius: 3px;
@@ -169,6 +172,23 @@
 td:last-child {
   border-right: none;
 }
+.project-title {
+  font-size:36.0pt;
+  line-height:200%;
+  font-family:Calibri;
+  font-weight: bold;
+}
+.report-title {
+  font-size:16.0pt;
+  line-height:120%;
+  font-family:Arial;
+  font-weight: bold;
+}
+.created-time {
+  font-size:14.0pt;
+  line-height:120%;
+  font-family:Arial;
+}
 )";
 
 const char *EndHeader = "</head>";
@@ -177,9 +197,9 @@
 
 const char *EndCenteredDiv = "</div>";
 
-const char *BeginSourceNameDiv = "<div class='source-name-title'>";
+const char *BeginSourceHeaderDiv = "<div class='source-name-title'>";
 
-const char *EndSourceNameDiv = "</div>";
+const char *EndSourceHeaderDiv = "</div>";
 
 const char *BeginCodeTD = "<td class='code'>";
 
@@ -197,6 +217,38 @@
 
 const char *EndTable = "</table>";
 
+const char *BeginProjectTitleDiv = "<div class='project-title'>";
+
+const char *EndProjectTitleDiv = "</div>";
+
+const char *BeginReportTitleDiv = "<div class='report-title'>";
+
+const char *EndReportTitleDiv = "</div>";
+
+const char *BeginCreatedTimeDiv = "<div class='created-time'>";
+
+const char *EndCreatedTimeDiv = "</div>";
+
+const char *LineBreak = "<br>";
+
+const char *BeginJavaScript = "<script type = \"text/javascript\">\n";
+
+const char *EndJavaScript = "</script>";
+
+// Define a javascript function that disables a hyper link.
+const char *JSDisableLink = R"(
+function disableLink(link) {
+  link.disabled = true;
+  link.removeAttribute('href');
+}
+)";
+
+// Return a string with the special characters in \p Str escaped.
+const char *JSRemoveZeroLink = R"(
+var zeroLink = document.getElementById("zeroline");
+disableLink(zeroLink);
+)";
+
 std::string getPathToStyle(StringRef ViewPath) {
   std::string PathToStyle = "";
   std::string PathSep = sys::path::get_separator();
@@ -219,12 +271,12 @@
     OS << "<link rel='stylesheet' type='text/css' href='"
        << escape(PathToStyle, Opts) << "'>";
 
-  OS << EndHeader << "<body>" << BeginCenteredDiv;
+  OS << EndHeader << "<body>";
 }
 
 void emitEpilog(raw_ostream &OS) {
-  OS << EndCenteredDiv << "</body>"
-                          "</html>";
+  OS << "</body>"
+     << "</html>";
 }
 
 } // anonymous namespace
@@ -261,15 +313,25 @@
   // Emit a table containing links to reports for each file in the covmapping.
   assert(Opts.hasOutputDirectory() && "No output directory for index file");
   emitPrelude(OSRef, Opts, getPathToStyle(""));
-  OSRef << BeginSourceNameDiv << "Index" << EndSourceNameDiv;
-  OSRef << BeginTable;
+  if (Opts.hasProjectTitle())
+    OSRef << BeginProjectTitleDiv
+          << tag("span", escape(Opts.ProjectTitle, Opts)) << EndProjectTitleDiv;
+  OSRef << BeginReportTitleDiv
+        << tag("span", escape("Code Coverage Report", Opts))
+        << EndReportTitleDiv;
+  OSRef << BeginCreatedTimeDiv
+        << tag("span", escape(SourceCoverageView::CreatedTimeStr, Opts))
+        << EndCreatedTimeDiv;
+  OSRef << LineBreak;
+  OSRef << BeginCenteredDiv << BeginTable;
+  OSRef << BeginSourceHeaderDiv << "Index" << EndSourceHeaderDiv;
   for (StringRef SF : SourceFiles) {
     std::string LinkText = escape(sys::path::relative_path(SF), Opts);
     std::string LinkTarget =
         escape(getOutputPath(SF, "html", /*InToplevel=*/false), Opts);
     OSRef << tag("tr", tag("td", tag("pre", a(LinkTarget, LinkText), "code")));
   }
-  OSRef << EndTable;
+  OSRef << EndTable << EndCenteredDiv;
   emitEpilog(OSRef);
 
   // Emit the default stylesheet.
@@ -284,20 +346,44 @@
 }
 
 void SourceCoverageViewHTML::renderViewHeader(raw_ostream &OS) {
-  OS << BeginTable;
+  OS << BeginCenteredDiv << BeginTable;
 }
 
 void SourceCoverageViewHTML::renderViewFooter(raw_ostream &OS) {
-  OS << EndTable;
+  OS << EndTable << EndCenteredDiv;
+}
+
+void SourceCoverageViewHTML::renderSourceHeaderPrefix(raw_ostream &OS) {
+  OS << BeginSourceHeaderDiv;
 }
 
 void SourceCoverageViewHTML::renderSourceName(raw_ostream &OS) {
-  OS << BeginSourceNameDiv << tag("pre", escape(getSourceName(), getOptions()))
-     << EndSourceNameDiv;
+  std::string SourceFile = getSourceName().str();
+  SourceFile = sys::path::has_extension(SourceFile)
+                   ? "Source file:        " + SourceFile
+                   : "Function: " + SourceFile;
+  OS << tag("pre", escape(SourceFile, getOptions()));
+}
+
+void SourceCoverageViewHTML::renderObjectFilename(raw_ostream &OS) {
+  SmallString<128> ObjectFilePath(getOptions().ObjectFilename);
+  SmallString<128> ObjectFile("Binary file:        ");
+  ObjectFile.append(ObjectFilePath);
+  OS << tag("pre", escape(ObjectFile.c_str(), getOptions()));
+}
+
+void SourceCoverageViewHTML::renderGotoFirstZero(raw_ostream &OS) {
+  OS << BeginPre << "                    "
+     << "<a href=\"#zero\" id=\"zeroline\">Goto first zero count</a>" << EndPre;
 }
 
-void SourceCoverageViewHTML::renderLinePrefix(raw_ostream &OS, unsigned) {
-  OS << "<tr>";
+void SourceCoverageViewHTML::renderSourceHeaderSuffix(raw_ostream &OS) {
+  OS << EndSourceHeaderDiv;
+}
+
+void SourceCoverageViewHTML::renderLinePrefix(raw_ostream &OS, unsigned,
+                                              bool IsFirstZeroLine = false) {
+  OS << (IsFirstZeroLine ? "<tr id=\"zero\">" : "<tr>");
 }
 
 void SourceCoverageViewHTML::renderLineSuffix(raw_ostream &OS, unsigned) {
@@ -489,3 +575,50 @@
   ISV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/true, ViewDepth);
   OS << EndExpansionDiv;
 }
+
+void SourceCoverageViewHTML::renderProjectTitle(raw_ostream &OS) {
+  OS << BeginProjectTitleDiv
+     << tag("span", escape(getOptions().ProjectTitle, getOptions()))
+     << EndProjectTitleDiv;
+}
+
+void SourceCoverageViewHTML::renderReportTitle(raw_ostream &OS) {
+  OS << BeginReportTitleDiv
+     << tag("span", escape("Code Coverage Report", getOptions()))
+     << EndReportTitleDiv;
+}
+
+void SourceCoverageViewHTML::renderCreatedTime(raw_ostream &OS) {
+  OS << BeginCreatedTimeDiv
+     << tag("span", escape(SourceCoverageView::CreatedTimeStr, getOptions()))
+     << EndCreatedTimeDiv;
+}
+
+void SourceCoverageViewHTML::renderProjectSummary(raw_ostream &OS) {
+  if (getOptions().hasProjectTitle())
+    renderProjectTitle(OS);
+  renderReportTitle(OS);
+  renderCreatedTime(OS);
+  OS << LineBreak;
+}
+
+void SourceCoverageViewHTML::renderTableHeader(raw_ostream &OS,
+                                             unsigned ViewDepth) {
+  renderLinePrefix(OS, ViewDepth);
+  OS << tag("td", tag("span", tag("pre", escape("Line No.", getOptions()))))
+     << tag("td", tag("span", tag("pre", escape("Count No.", getOptions()))))
+     << tag("td", tag("span", tag("pre", escape("Source", getOptions()))));
+  renderLineSuffix(OS, ViewDepth);
+}
+
+void SourceCoverageViewHTML::renderJavaScriptHeader(raw_ostream &OS) {
+  OS << BeginJavaScript ;
+}
+
+void SourceCoverageViewHTML::renderJavaScriptBody(raw_ostream &OS) {
+  OS << JSDisableLink << JSRemoveZeroLink;
+}
+
+void SourceCoverageViewHTML::renderJavaScriptFooter(raw_ostream &OS) {
+  OS << EndJavaScript;
+}
Index: tools/llvm-cov/SourceCoverageViewText.h
===================================================================
--- tools/llvm-cov/SourceCoverageViewText.h
+++ tools/llvm-cov/SourceCoverageViewText.h
@@ -38,9 +38,17 @@
 
   void renderViewFooter(raw_ostream &OS) override;
 
+  void renderSourceHeaderPrefix(raw_ostream &OS) override;
+
   void renderSourceName(raw_ostream &OS) override;
 
-  void renderLinePrefix(raw_ostream &OS, unsigned ViewDepth) override;
+  void renderObjectFilename(raw_ostream &OS) override;
+
+  void renderGotoFirstZero(raw_ostream &OS) override;
+
+  void renderSourceHeaderSuffix(raw_ostream &OS) override;
+
+  void renderLinePrefix(raw_ostream &OS, unsigned ViewDepth, bool IsFirstZeroLine) override;
 
   void renderLineSuffix(raw_ostream &OS, unsigned ViewDepth) override;
 
@@ -70,6 +78,22 @@
   void renderRegionMarkers(raw_ostream &OS, CoverageSegmentArray Segments,
                            unsigned ViewDepth) override;
 
+  void renderProjectTitle(raw_ostream &OS) override;
+
+  void renderReportTitle(raw_ostream &OS) override;
+
+  void renderCreatedTime(raw_ostream &OS) override;
+
+  void renderProjectSummary(raw_ostream &OS) override;
+
+  void renderTableHeader(raw_ostream &OS, unsigned IndentLevel) override;
+
+  void renderJavaScriptHeader(raw_ostream &OS) override;
+
+  void renderJavaScriptBody(raw_ostream &OS) override;
+
+  void renderJavaScriptFooter(raw_ostream &OS) override;
+
 public:
   SourceCoverageViewText(StringRef SourceName, const MemoryBuffer &File,
                          const CoverageViewOptions &Options,
Index: tools/llvm-cov/SourceCoverageViewText.cpp
===================================================================
--- tools/llvm-cov/SourceCoverageViewText.cpp
+++ tools/llvm-cov/SourceCoverageViewText.cpp
@@ -63,13 +63,25 @@
 
 void SourceCoverageViewText::renderViewFooter(raw_ostream &) {}
 
+void SourceCoverageViewText::renderSourceHeaderPrefix(raw_ostream &OS) {}
+
 void SourceCoverageViewText::renderSourceName(raw_ostream &OS) {
   getOptions().colored_ostream(OS, raw_ostream::CYAN) << getSourceName()
                                                       << ":\n";
 }
 
+void SourceCoverageViewText::renderObjectFilename(raw_ostream &OS) {
+  getOptions().colored_ostream(OS, raw_ostream::CYAN)
+      << getOptions().ObjectFilename << ":\n";
+}
+
+void SourceCoverageViewText::renderGotoFirstZero(raw_ostream &OS) {}
+
+void SourceCoverageViewText::renderSourceHeaderSuffix(raw_ostream &OS) {}
+
 void SourceCoverageViewText::renderLinePrefix(raw_ostream &OS,
-                                              unsigned ViewDepth) {
+                                              unsigned ViewDepth,
+                                              bool IsFirstZeroLine = false) {
   for (unsigned I = 0; I < ViewDepth; ++I)
     OS << "  |";
 }
@@ -211,3 +223,39 @@
   OS << ' ';
   ISV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/true, ViewDepth);
 }
+
+void SourceCoverageViewText::renderProjectTitle(raw_ostream &OS) {
+  getOptions().colored_ostream(OS, raw_ostream::CYAN)
+      << getOptions().ProjectTitle << "\n";
+}
+
+void SourceCoverageViewText::renderReportTitle(raw_ostream &OS) {
+  getOptions().colored_ostream(OS, raw_ostream::CYAN) << "Code coverage report"
+                                                      << "\n";
+}
+
+void SourceCoverageViewText::renderCreatedTime(raw_ostream &OS) {
+  getOptions().colored_ostream(OS, raw_ostream::CYAN)
+      << SourceCoverageView::CreatedTimeStr << "\n";
+}
+
+void SourceCoverageViewText::renderProjectSummary(raw_ostream &OS) {
+  if (getOptions().hasProjectTitle())
+    renderProjectTitle(OS);
+  renderReportTitle(OS);
+  renderCreatedTime(OS);
+}
+
+void SourceCoverageViewText::renderTableHeader(raw_ostream &OS,
+                                               unsigned ViewDepth) {
+  renderLinePrefix(OS, ViewDepth);
+  getOptions().colored_ostream(OS, raw_ostream::WHITE)
+      << " Line|  Count|Source\n";
+  renderLineSuffix(OS, ViewDepth);
+}
+
+void SourceCoverageViewText::renderJavaScriptHeader(raw_ostream &OS) {}
+
+void SourceCoverageViewText::renderJavaScriptBody(raw_ostream &OS) {}
+
+void SourceCoverageViewText::renderJavaScriptFooter(raw_ostream &OS) {}