Index: test/tools/llvm-cov/showLineExecutionCounts.cpp
===================================================================
--- test/tools/llvm-cov/showLineExecutionCounts.cpp
+++ test/tools/llvm-cov/showLineExecutionCounts.cpp
@@ -77,11 +77,12 @@
 // 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: <h5><label>Filter: <input type="text" id="filterTerm" class="filter_box" onkeyup="applyFilter()" />
+// HTML-INDEX-LABEL: <table id="filter">
+// HTML-INDEX: <td class='column-entry-left'><a href="#" onclick="javascript:sortTable(0)">Filename</a></td>
+// HTML-INDEX: <td class='column-entry'><a href="#" onclick="javascript:sortTable(1)">Function Coverage</a></td>
+// HTML-INDEX: <td class='column-entry'><a href="#" onclick="javascript:sortTable(2)">Line Coverage</a></td>
+// HTML-INDEX: <td class='column-entry'><a href="#" onclick="javascript:sortTable(3)">Region Coverage</a></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)
@@ -90,3 +91,6 @@
 // HTML-INDEX: <td class='column-entry-red'>
 // HTML-INDEX: 70.00% (7/10)
 // HTML-INDEX: TOTALS
+// HTML-INDEX: <script type = "text/javascript">
+// HTML-INDEX: function applyFilter()
+// HTML-INDEX: function sortTable(sortColumn)
Index: tools/llvm-cov/SourceCoverageViewHTML.cpp
===================================================================
--- tools/llvm-cov/SourceCoverageViewHTML.cpp
+++ tools/llvm-cov/SourceCoverageViewHTML.cpp
@@ -118,9 +118,11 @@
 }
 .column-entry {
   text-align: right;
+  background-color: #DAE7FE;
 }
 .column-entry-left {
   text-align: left;
+  background-color: #DAE7FE;
 }
 .column-entry-yellow {
   text-align: right;
@@ -219,7 +221,7 @@
 
 const char *EndExpansionDiv = "</div>";
 
-const char *BeginTable = "<table>";
+const char *BeginTable = "<table id=\"filter\">";
 
 const char *EndTable = "</table>";
 
@@ -229,6 +231,82 @@
 
 const char *CreatedTimeTag = "h4";
 
+const char *JSForCoverage = R"(
+<script type = "text/javascript">
+
+var TableIDvalue = "filter";
+var TableLastSortedColumn = -1;
+var CellPadding = Array(5).join(" ");
+
+function getText(element) {
+  if (navigator.appName == 'Microsoft Internet Explorer') {
+    return element.innerText;
+  }
+  return element.textContent;
+}
+
+function applyFilter()
+{
+  var filterText = document.getElementById('filterTerm').value;
+  var targetTable = document.getElementById(TableIDvalue);
+  var targetTableColCount = 0;
+
+  for (var rowIndex = 0; rowIndex < targetTable.rows.length; rowIndex++) {
+    var rowData = '';
+
+    if (rowIndex == 0) {
+      targetTableColCount = targetTable.rows.item(rowIndex).cells.length;
+      continue;
+    }
+
+    for (var colIndex = 0; colIndex < targetTableColCount; colIndex++) {
+      var cellText = '';
+      rowData += getText(targetTable.rows.item(rowIndex).cells.item(colIndex));
+    }
+
+    rowData = rowData.toLowerCase();
+    filterText = filterText.toLowerCase();
+
+    if (rowData.indexOf(filterText) == -1)
+      targetTable.rows.item(rowIndex).style.display = 'none';
+    else
+      targetTable.rows.item(rowIndex).style.display = 'table-row';
+  }
+}
+
+function sortTable(sortColumn)
+{
+  var table = document.getElementById(TableIDvalue);
+  var rowData = []
+  for (var i = 1, len = table.rows.length; i < len-1; ++i) {
+    var sortVal = getText(table.rows.item(i).cells.item(sortColumn));
+    if (sortColumn != 0)
+      sortVal = parseFloat(sortVal);
+
+    rowData.push({
+      html: table.rows.item(i).innerHTML,
+      toSort: sortVal
+    });
+  }
+
+  if (sortColumn == TableLastSortedColumn) {
+    rowData.reverse();
+  }
+  else {
+    rowData.sort(function (a, b) {
+      return(a.toSort == b.toSort ? 0 : (a.toSort > b.toSort ? 1 : -1));
+    });
+    TableLastSortedColumn = sortColumn;
+  }
+
+  for (var i = 1, len = table.rows.length; i < len-1; ++i) {
+    table.rows.item(i).innerHTML = rowData[i-1].html;
+  }
+  return false;
+}
+</script>
+)";
+
 std::string getPathToStyle(StringRef ViewPath) {
   std::string PathToStyle = "";
   std::string PathSep = sys::path::get_separator();
@@ -256,7 +334,7 @@
 
 void emitEpilog(raw_ostream &OS) {
   OS << "</body>"
-     << "</html>";
+     << "</html>" << JSForCoverage;
 }
 
 } // anonymous namespace
@@ -283,12 +361,25 @@
   emitEpilog(*OS.get());
 }
 
+/// Emit filter input for the table in the index.
+void renderFilterInputHTML(raw_ostream &OS) {
+  std::string FilterLabel = "Filter: <input type=\"text\" id=\"filterTerm\" "
+                            "class=\"filter_box\" onkeyup=\"applyFilter()\" />";
+  OS << tag("h5", tag("label", FilterLabel));
+}
+
 /// Emit column labels for the table in the index.
 static void emitColumnLabelsForIndex(raw_ostream &OS) {
   SmallVector<std::string, 4> Columns;
-  Columns.emplace_back(tag("td", "Filename", "column-entry-left"));
-  for (const char *Label :
-       {"Function Coverage", "Line Coverage", "Region Coverage"})
+  std::string SortFilename =
+      "<a href=\"#\" onclick=\"javascript:sortTable(0)\">Filename</a>";
+  Columns.emplace_back(tag("td", SortFilename, "column-entry-left"));
+  for (
+      const char *Label :
+      {"<a href=\"#\" onclick=\"javascript:sortTable(1)\">Function "
+       "Coverage</a>",
+       "<a href=\"#\" onclick=\"javascript:sortTable(2)\">Line Coverage</a>",
+       "<a href=\"#\" onclick=\"javascript:sortTable(3)\">Region Coverage</a>"})
     Columns.emplace_back(tag("td", Label, "column-entry"));
   OS << tag("tr", join(Columns.begin(), Columns.end(), ""));
 }
@@ -372,6 +463,8 @@
   if (Opts.hasCreatedTime())
     OSRef << tag(CreatedTimeTag, escape(Opts.CreatedTimeStr, Opts));
 
+  renderFilterInputHTML(OSRef);
+
   // Emit a table containing links to reports for each file in the covmapping.
   CoverageReport Report(Opts, Coverage);
   OSRef << BeginCenteredDiv << BeginTable;