Revert "Add opt-viewer testing"

This reverts commit r319188.

Breaks when c++filt is not available.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319262 91177308-0d34-0410-b5e6-96231b3b80d8

13 files changed, 10 insertions, 1161 deletions

diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index caa538082fc..23494fb96c6 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -628,34 +628,3 @@ else()
 endif()
 
 string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
-
-function(find_python_module module)
-  string(TOUPPER ${module} module_upper)
-  set(FOUND_VAR PY_${module_upper}_FOUND)
-
-  execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import ${module}"
-    RESULT_VARIABLE status
-    ERROR_QUIET)
-
-  if(status)
-    set(${FOUND_VAR} 0 PARENT_SCOPE)
-    message(STATUS "Could NOT find Python module ${module}")
-  else()
-    set(${FOUND_VAR} 1 PARENT_SCOPE)
-    message(STATUS "Found Python module ${module}")
-  endif()
-endfunction()
-
-set (PYTHON_MODULES
-  pygments
-  yaml
-  )
-foreach(module ${PYTHON_MODULES})
-  find_python_module(${module})
-endforeach()
-
-if(PY_PYGMENTS_FOUND AND PY_YAML_FOUND)
-  set (LLVM_HAVE_OPT_VIEWER_MODULES 1)
-else()
-  set (LLVM_HAVE_OPT_VIEWER_MODULES 0)
-endif()
diff --git a/test/lit.cfg.py b/test/lit.cfg.py
index 06a23536a8c..e956bb74f5a 100644
--- a/test/lit.cfg.py
+++ b/test/lit.cfg.py
@@ -123,7 +123,6 @@ if config.have_ocamlopt:
     ocamlopt_command = '%s ocamlopt -cclib -L%s -cclib -Wl,-rpath,%s %s' % (
         config.ocamlfind_executable, config.llvm_lib_dir, config.llvm_lib_dir, config.ocaml_flags)
 
-opt_viewer_cmd = '%s %s/tools/opt-viewer/opt-viewer.py' % (sys.executable, config.llvm_src_root)
 
 tools = [
     ToolSubst('%lli', FindTool('lli'), post='.', extra_args=lli_args),
@@ -133,7 +132,6 @@ tools = [
     ToolSubst('%ld64', ld64_cmd, unresolved='ignore'),
     ToolSubst('%ocamlc', ocamlc_command, unresolved='ignore'),
     ToolSubst('%ocamlopt', ocamlopt_command, unresolved='ignore'),
-    ToolSubst('%opt-viewer', opt_viewer_cmd),
 ]
 
 # FIXME: Why do we have both `lli` and `%lli` that do slightly different things?
@@ -288,6 +286,3 @@ if config.have_libxar:
 
 if config.llvm_libxml2_enabled == '1':
     config.available_features.add('libxml2')
-
-if config.have_opt_viewer_modules:
-    config.available_features.add('have_opt_viewer_modules')
diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
index 117af7336d0..dff46dcff32 100644
--- a/test/lit.site.cfg.py.in
+++ b/test/lit.site.cfg.py.in
@@ -43,7 +43,6 @@ config.link_llvm_dylib = @LLVM_LINK_LLVM_DYLIB@
 config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@"
 config.llvm_host_triple = '@LLVM_HOST_TRIPLE@'
 config.host_arch = "@HOST_ARCH@"
-config.have_opt_viewer_modules = @LLVM_HAVE_OPT_VIEWER_MODULES@
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
diff --git a/test/tools/opt-viewer/Inputs/basic/or.c b/test/tools/opt-viewer/Inputs/basic/or.c
deleted file mode 100644
index 6b1c4744cda..00000000000
--- a/test/tools/opt-viewer/Inputs/basic/or.c
+++ /dev/null
@@ -1,21 +0,0 @@
-void bar();
-void foo() { bar(); }
-
-#include "or.h"
-
-void Test(int *res, int *c, int *d, int *p, int n) {
-  int i;
-
-#pragma clang loop vectorize(assume_safety)
-  for (i = 0; i < 1600; i++) {
-    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];
-  }
-
-  for (i = 0; i < 16; i++) {
-    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];
-  }
-
-  foo();
-
-  foo(); bar(); foo();
-}
diff --git a/test/tools/opt-viewer/Inputs/basic/or.h b/test/tools/opt-viewer/Inputs/basic/or.h
deleted file mode 100644
index a1c47edb3d1..00000000000
--- a/test/tools/opt-viewer/Inputs/basic/or.h
+++ /dev/null
@@ -1,16 +0,0 @@
-void TestH(int *res, int *c, int *d, int *p, int n) {
-  int i;
-
-#pragma clang loop vectorize(assume_safety)
-  for (i = 0; i < 1600; i++) {
-    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];
-  }
-
-  for (i = 0; i < 16; i++) {
-    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];
-  }
-
-  foo();
-
-  foo(); bar(); foo();
-}
diff --git a/test/tools/opt-viewer/Inputs/basic/or.yaml b/test/tools/opt-viewer/Inputs/basic/or.yaml
deleted file mode 100644
index 11c5528b43f..00000000000
--- a/test/tools/opt-viewer/Inputs/basic/or.yaml
+++ /dev/null
@@ -1,227 +0,0 @@
---- !Missed
-Pass:            inline
-Name:            NoDefinition
-DebugLoc:        { File: basic/or.c, Line: 2, Column: 14 }
-Function:        foo
-Args:
-  - Callee:          bar
-  - String:          ' will not be inlined into '
-  - Caller:          foo
-  - String:          ' because its definition is unavailable'
-...
---- !Missed
-Pass:            inline
-Name:            NoDefinition
-DebugLoc:        { File: basic/or.h, Line: 15, Column: 10 }
-Function:        TestH
-Args:
-  - Callee:          bar
-  - String:          ' will not be inlined into '
-  - Caller:          TestH
-  - String:          ' because its definition is unavailable'
-...
---- !Analysis
-Pass:            inline
-Name:            CanBeInlined
-DebugLoc:        { File: basic/or.h, Line: 13, Column: 3 }
-Function:        TestH
-Args:
-  - Callee:          foo
-  - String:          ' can be inlined into '
-  - Caller:          TestH
-  - String:          ' with cost='
-  - Cost:            '30'
-  - String:          ' (threshold='
-  - Threshold:       '412'
-  - String:          ')'
-...
---- !Passed
-Pass:            inline
-Name:            Inlined
-DebugLoc:        { File: basic/or.h, Line: 13, Column: 3 }
-Function:        TestH
-Args:
-  - Callee:          foo
-  - String:          ' inlined into '
-  - Caller:          TestH
-...
---- !Analysis
-Pass:            inline
-Name:            CanBeInlined
-DebugLoc:        { File: basic/or.h, Line: 15, Column: 3 }
-Function:        TestH
-Args:
-  - Callee:          foo
-  - String:          ' can be inlined into '
-  - Caller:          TestH
-  - String:          ' with cost='
-  - Cost:            '30'
-  - String:          ' (threshold='
-  - Threshold:       '412'
-  - String:          ')'
-...
---- !Passed
-Pass:            inline
-Name:            Inlined
-DebugLoc:        { File: basic/or.h, Line: 15, Column: 3 }
-Function:        TestH
-Args:
-  - Callee:          foo
-  - String:          ' inlined into '
-  - Caller:          TestH
-...
---- !Analysis
-Pass:            inline
-Name:            CanBeInlined
-DebugLoc:        { File: basic/or.h, Line: 15, Column: 17 }
-Function:        TestH
-Args:
-  - Callee:          foo
-  - String:          ' can be inlined into '
-  - Caller:          TestH
-  - String:          ' with cost='
-  - Cost:            '30'
-  - String:          ' (threshold='
-  - Threshold:       '412'
-  - String:          ')'
-...
---- !Passed
-Pass:            inline
-Name:            Inlined
-DebugLoc:        { File: basic/or.h, Line: 15, Column: 17 }
-Function:        TestH
-Args:
-  - Callee:          foo
-  - String:          ' inlined into '
-  - Caller:          TestH
-...
---- !Passed
-Pass:            loop-unroll
-Name:            FullyUnrolled
-DebugLoc:        { File: basic/or.h, Line: 9, Column: 3 }
-Function:        TestH
-Args:
-  - String:          'completely unrolled loop with '
-  - UnrollCount:     '16'
-  - String:          ' iterations'
-...
---- !Missed
-Pass:            inline
-Name:            NoDefinition
-DebugLoc:        { File: basic/or.c, Line: 20, Column: 10 }
-Function:        Test
-Args:
-  - Callee:          bar
-  - String:          ' will not be inlined into '
-  - Caller:          Test
-  - String:          ' because its definition is unavailable'
-...
---- !Analysis
-Pass:            inline
-Name:            CanBeInlined
-DebugLoc:        { File: basic/or.c, Line: 18, Column: 3 }
-Function:        Test
-Args:
-  - Callee:          foo
-  - String:          ' can be inlined into '
-  - Caller:          Test
-  - String:          ' with cost='
-  - Cost:            '30'
-  - String:          ' (threshold='
-  - Threshold:       '412'
-  - String:          ')'
-...
---- !Passed
-Pass:            inline
-Name:            Inlined
-DebugLoc:        { File: basic/or.c, Line: 18, Column: 3 }
-Function:        Test
-Args:
-  - Callee:          foo
-  - String:          ' inlined into '
-  - Caller:          Test
-...
---- !Analysis
-Pass:            inline
-Name:            CanBeInlined
-DebugLoc:        { File: basic/or.c, Line: 20, Column: 3 }
-Function:        Test
-Args:
-  - Callee:          foo
-  - String:          ' can be inlined into '
-  - Caller:          Test
-  - String:          ' with cost='
-  - Cost:            '30'
-  - String:          ' (threshold='
-  - Threshold:       '412'
-  - String:          ')'
-...
---- !Passed
-Pass:            inline
-Name:            Inlined
-DebugLoc:        { File: basic/or.c, Line: 20, Column: 3 }
-Function:        Test
-Args:
-  - Callee:          foo
-  - String:          ' inlined into '
-  - Caller:          Test
-...
---- !Analysis
-Pass:            inline
-Name:            CanBeInlined
-DebugLoc:        { File: basic/or.c, Line: 20, Column: 17 }
-Function:        Test
-Args:
-  - Callee:          foo
-  - String:          ' can be inlined into '
-  - Caller:          Test
-  - String:          ' with cost='
-  - Cost:            '30'
-  - String:          ' (threshold='
-  - Threshold:       '412'
-  - String:          ')'
-...
---- !Passed
-Pass:            inline
-Name:            Inlined
-DebugLoc:        { File: basic/or.c, Line: 20, Column: 17 }
-Function:        Test
-Args:
-  - Callee:          foo
-  - String:          ' inlined into '
-  - Caller:          Test
-...
---- !Passed
-Pass:            loop-unroll
-Name:            FullyUnrolled
-DebugLoc:        { File: basic/or.c, Line: 14, Column: 3 }
-Function:        Test
-Args:
-  - String:          'completely unrolled loop with '
-  - UnrollCount:     '16'
-  - String:          ' iterations'
-...
---- !Passed
-Pass:            loop-vectorize
-Name:            Vectorized
-DebugLoc:        { File: basic/or.h, Line: 5, Column: 3 }
-Function:        TestH
-Args:
-  - String:          'vectorized loop (vectorization width: '
-  - VectorizationFactor: '4'
-  - String:          ', interleaved count: '
-  - InterleaveCount: '2'
-  - String:          ')'
-...
---- !Passed
-Pass:            loop-vectorize
-Name:            Vectorized
-DebugLoc:        { File: basic/or.c, Line: 10, Column: 3 }
-Function:        Test
-Args:
-  - String:          'vectorized loop (vectorization width: '
-  - VectorizationFactor: '4'
-  - String:          ', interleaved count: '
-  - InterleaveCount: '2'
-  - String:          ')'
-...
diff --git a/test/tools/opt-viewer/Outputs/basic/basic_or.c.html b/test/tools/opt-viewer/Outputs/basic/basic_or.c.html
deleted file mode 100644
index a97b12855bc..00000000000
--- a/test/tools/opt-viewer/Outputs/basic/basic_or.c.html
+++ /dev/null
@@ -1,257 +0,0 @@
-
-<html>
-<head>
-<link rel='stylesheet' type='text/css' href='style.css'>
-</head>
-<body>
-<div class="centered">
-<table class="source">
-<thead>
-<tr>
-<th style="width: 2%">Line</td>
-<th style="width: 3%">Hotness</td>
-<th style="width: 10%">Optimization</td>
-<th style="width: 70%">Source</td>
-<th style="width: 15%">Inline Context</td>
-</tr>
-</thead>
-<tbody>
-
-<tr>
-<td><a name="L1">1</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>void bar();</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L2">2</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>void foo() { bar(); }</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-red">inline</td>
-<td><pre style="display:inline">             </pre><span class="column-entry-yellow"> bar will not be inlined into foo because its definition is unavailable&nbsp;</span></td>
-<td class="column-entry-yellow">foo</td>
-</tr>
-
-<tr>
-<td><a name="L3">3</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L4">4</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>#include "or.h"</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L5">5</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L6">6</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>void Test(int *res, int *c, int *d, int *p, int n) {</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L7">7</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  int i;</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L8">8</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L9">9</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>#pragma clang loop vectorize(assume_safety)</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L10">10</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  for (i = 0; i < 1600; i++) {</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">loop-vectorize</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> vectorized loop (vectorization width: 4, interleaved count: 2)&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td><a name="L11">11</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L12">12</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  }</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L13">13</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L14">14</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  for (i = 0; i < 16; i++) {</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">loop-unroll</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> completely unrolled loop with 16 iterations&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td><a name="L15">15</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L16">16</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  }</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L17">17</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L18">18</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  foo();</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-white">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo can be inlined into Test with cost=30 (threshold=412)&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo inlined into Test&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td><a name="L19">19</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L20">20</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  foo(); bar(); foo();</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-red">inline</td>
-<td><pre style="display:inline">         </pre><span class="column-entry-yellow"> bar will not be inlined into Test because its definition is unavailable&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-white">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo can be inlined into Test with cost=30 (threshold=412)&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo inlined into Test&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-white">inline</td>
-<td><pre style="display:inline">                </pre><span class="column-entry-yellow"> foo can be inlined into Test with cost=30 (threshold=412)&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">inline</td>
-<td><pre style="display:inline">                </pre><span class="column-entry-yellow"> foo inlined into Test&nbsp;</span></td>
-<td class="column-entry-yellow">Test</td>
-</tr>
-
-<tr>
-<td><a name="L21">21</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>}</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L22">22</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-</tbody>
-</table>
-</body>
-</html>
diff --git a/test/tools/opt-viewer/Outputs/basic/basic_or.h.html b/test/tools/opt-viewer/Outputs/basic/basic_or.h.html
deleted file mode 100644
index 171bb835563..00000000000
--- a/test/tools/opt-viewer/Outputs/basic/basic_or.h.html
+++ /dev/null
@@ -1,214 +0,0 @@
-
-<html>
-<head>
-<link rel='stylesheet' type='text/css' href='style.css'>
-</head>
-<body>
-<div class="centered">
-<table class="source">
-<thead>
-<tr>
-<th style="width: 2%">Line</td>
-<th style="width: 3%">Hotness</td>
-<th style="width: 10%">Optimization</td>
-<th style="width: 70%">Source</td>
-<th style="width: 15%">Inline Context</td>
-</tr>
-</thead>
-<tbody>
-
-<tr>
-<td><a name="L1">1</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>void TestH(int *res, int *c, int *d, int *p, int n) {</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L2">2</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  int i;</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L3">3</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L4">4</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>#pragma clang loop vectorize(assume_safety)</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L5">5</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  for (i = 0; i < 1600; i++) {</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">loop-vectorize</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> vectorized loop (vectorization width: 4, interleaved count: 2)&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td><a name="L6">6</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L7">7</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  }</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L8">8</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L9">9</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  for (i = 0; i < 16; i++) {</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">loop-unroll</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> completely unrolled loop with 16 iterations&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td><a name="L10">10</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>    res[i] = (p[i] == 0) ? res[i] : res[i] + d[i];</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L11">11</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  }</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L12">12</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L13">13</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  foo();</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-white">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo can be inlined into TestH with cost=30 (threshold=412)&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo inlined into TestH&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td><a name="L14">14</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L15">15</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>  foo(); bar(); foo();</pre></div></td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-red">inline</td>
-<td><pre style="display:inline">         </pre><span class="column-entry-yellow"> bar will not be inlined into TestH because its definition is unavailable&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-white">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo can be inlined into TestH with cost=30 (threshold=412)&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">inline</td>
-<td><pre style="display:inline">  </pre><span class="column-entry-yellow"> foo inlined into TestH&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-white">inline</td>
-<td><pre style="display:inline">                </pre><span class="column-entry-yellow"> foo can be inlined into TestH with cost=30 (threshold=412)&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td></td>
-<td></td>
-<td class="column-entry-green">inline</td>
-<td><pre style="display:inline">                </pre><span class="column-entry-yellow"> foo inlined into TestH&nbsp;</span></td>
-<td class="column-entry-yellow">TestH</td>
-</tr>
-
-<tr>
-<td><a name="L16">16</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre>}</pre></div></td>
-</tr>
-
-<tr>
-<td><a name="L17">17</a></td>
-<td></td>
-<td></td>
-<td><div class="highlight"><pre></pre></div></td>
-</tr>
-
-</tbody>
-</table>
-</body>
-</html>
diff --git a/test/tools/opt-viewer/Outputs/basic/index.html b/test/tools/opt-viewer/Outputs/basic/index.html
deleted file mode 100644
index 9fe9a4a7adf..00000000000
--- a/test/tools/opt-viewer/Outputs/basic/index.html
+++ /dev/null
@@ -1,151 +0,0 @@
-
-<html>
-<head>
-<link rel='stylesheet' type='text/css' href='style.css'>
-</head>
-<body>
-<div class="centered">
-<table>
-<tr>
-<td>Source Location</td>
-<td>Hotness</td>
-<td>Function</td>
-<td>Pass</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.c.html#L2">basic/or.c:2:14</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">foo</td>
-<td class="column-entry-red">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.c.html#L10">basic/or.c:10:3</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">Test</td>
-<td class="column-entry-green">loop-vectorize</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.c.html#L14">basic/or.c:14:3</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">Test</td>
-<td class="column-entry-green">loop-unroll</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.c.html#L18">basic/or.c:18:3</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">Test</td>
-<td class="column-entry-white">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.c.html#L18">basic/or.c:18:3</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">Test</td>
-<td class="column-entry-green">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.c.html#L20">basic/or.c:20:3</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">Test</td>
-<td class="column-entry-white">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.c.html#L20">basic/or.c:20:3</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">Test</td>
-<td class="column-entry-green">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.c.html#L20">basic/or.c:20:10</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">Test</td>
-<td class="column-entry-red">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.c.html#L20">basic/or.c:20:17</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">Test</td>
-<td class="column-entry-white">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.c.html#L20">basic/or.c:20:17</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">Test</td>
-<td class="column-entry-green">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.h.html#L5">basic/or.h:5:3</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">TestH</td>
-<td class="column-entry-green">loop-vectorize</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.h.html#L9">basic/or.h:9:3</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">TestH</td>
-<td class="column-entry-green">loop-unroll</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.h.html#L13">basic/or.h:13:3</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">TestH</td>
-<td class="column-entry-white">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.h.html#L13">basic/or.h:13:3</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">TestH</td>
-<td class="column-entry-green">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.h.html#L15">basic/or.h:15:3</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">TestH</td>
-<td class="column-entry-white">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.h.html#L15">basic/or.h:15:3</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">TestH</td>
-<td class="column-entry-green">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.h.html#L15">basic/or.h:15:10</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">TestH</td>
-<td class="column-entry-red">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-1"><a href="basic_or.h.html#L15">basic/or.h:15:17</a></td>
-<td class="column-entry-1"></td>
-<td class="column-entry-1">TestH</td>
-<td class="column-entry-white">inline</td>
-</tr>
-
-<tr>
-<td class="column-entry-0"><a href="basic_or.h.html#L15">basic/or.h:15:17</a></td>
-<td class="column-entry-0"></td>
-<td class="column-entry-0">TestH</td>
-<td class="column-entry-green">inline</td>
-</tr>
-
-</table>
-</body>
-</html>
diff --git a/test/tools/opt-viewer/Outputs/basic/style.css b/test/tools/opt-viewer/Outputs/basic/style.css
deleted file mode 100644
index 0d3347c1578..00000000000
--- a/test/tools/opt-viewer/Outputs/basic/style.css
+++ /dev/null
@@ -1,208 +0,0 @@
-.source {
-  table-layout: fixed;
-  width: 100%;
-  white-space: nowrap;
-}
-.source td {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.red {
-  background-color: #ffd0d0;
-}
-.cyan {
-  background-color: cyan;
-}
-body {
-  font-family: -apple-system, sans-serif;
-}
-pre {
-  margin-top: 0px !important;
-  margin-bottom: 0px !important;
-}
-.source-name-title {
-  padding: 5px 10px;
-  border-bottom: 1px solid #dbdbdb;
-  background-color: #eee;
-  line-height: 35px;
-}
-.centered {
-  display: table;
-  margin-left: left;
-  margin-right: auto;
-  border: 1px solid #dbdbdb;
-  border-radius: 3px;
-}
-.expansion-view {
-  background-color: rgba(0, 0, 0, 0);
-  margin-left: 0px;
-  margin-top: 5px;
-  margin-right: 5px;
-  margin-bottom: 5px;
-  border: 1px solid #dbdbdb;
-  border-radius: 3px;
-}
-table {
-  border-collapse: collapse;
-}
-.light-row {
-  background: #ffffff;
-  border: 1px solid #dbdbdb;
-}
-.column-entry {
-  text-align: right;
-}
-.column-entry-left {
-  text-align: left;
-}
-.column-entry-white {
-  text-align: right;
-  background-color: #ffffff;
-}
-.column-entry-red {
-  text-align: right;
-  background-color: #ffd0d0;
-}
-.column-entry-green {
-  text-align: right;
-  background-color: #d0ffd0;
-}
-.column-entry-yellow {
-  text-align: left;
-  background-color: #ffe1a6;
-}
-.column-entry-0 {
-  background-color: #ffffff;
-}
-.column-entry-1 {
-  background-color: #eeeeee;
-}
-.line-number {
-  text-align: right;
-  color: #aaa;
-}
-.covered-line {
-  text-align: right;
-  color: #0080ff;
-}
-.uncovered-line {
-  text-align: right;
-  color: #ff3300;
-}
-.tooltip {
-  position: relative;
-  display: inline;
-  background-color: #b3e6ff;
-  text-decoration: none;
-}
-.tooltip span.tooltip-content {
-  position: absolute;
-  width: 100px;
-  margin-left: -50px;
-  color: #FFFFFF;
-  background: #000000;
-  height: 30px;
-  line-height: 30px;
-  text-align: center;
-  visibility: hidden;
-  border-radius: 6px;
-}
-.tooltip span.tooltip-content:after {
-  content: '';
-  position: absolute;
-  top: 100%;
-  left: 50%;
-  margin-left: -8px;
-  width: 0; height: 0;
-  border-top: 8px solid #000000;
-  border-right: 8px solid transparent;
-  border-left: 8px solid transparent;
-}
-: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;
-  border-collapse: collapse;
-  border-right: solid 1px #eee;
-  border-left: solid 1px #eee;
-}
-td:first-child {
-  border-left: none;
-}
-td:last-child {
-  border-right: none;
-}
-
-/* Generated with pygmentize -S colorful -f html >> style.css */
-
-.hll { background-color: #ffffcc }
-.c { color: #888888 } /* Comment */
-.err { color: #FF0000; background-color: #FFAAAA } /* Error */
-.k { color: #008800; font-weight: bold } /* Keyword */
-.o { color: #333333 } /* Operator */
-.ch { color: #888888 } /* Comment.Hashbang */
-.cm { color: #888888 } /* Comment.Multiline */
-.cp { color: #557799 } /* Comment.Preproc */
-.cpf { color: #888888 } /* Comment.PreprocFile */
-.c1 { color: #888888 } /* Comment.Single */
-.cs { color: #cc0000; font-weight: bold } /* Comment.Special */
-.gd { color: #A00000 } /* Generic.Deleted */
-.ge { font-style: italic } /* Generic.Emph */
-.gr { color: #FF0000 } /* Generic.Error */
-.gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.gi { color: #00A000 } /* Generic.Inserted */
-.go { color: #888888 } /* Generic.Output */
-.gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
-.gs { font-weight: bold } /* Generic.Strong */
-.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.gt { color: #0044DD } /* Generic.Traceback */
-.kc { color: #008800; font-weight: bold } /* Keyword.Constant */
-.kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
-.kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
-.kp { color: #003388; font-weight: bold } /* Keyword.Pseudo */
-.kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
-.kt { color: #333399; font-weight: bold } /* Keyword.Type */
-.m { color: #6600EE; font-weight: bold } /* Literal.Number */
-.s { background-color: #fff0f0 } /* Literal.String */
-.na { color: #0000CC } /* Name.Attribute */
-.nb { color: #007020 } /* Name.Builtin */
-.nc { color: #BB0066; font-weight: bold } /* Name.Class */
-.no { color: #003366; font-weight: bold } /* Name.Constant */
-.nd { color: #555555; font-weight: bold } /* Name.Decorator */
-.ni { color: #880000; font-weight: bold } /* Name.Entity */
-.ne { color: #FF0000; font-weight: bold } /* Name.Exception */
-.nf { color: #0066BB; font-weight: bold } /* Name.Function */
-.nl { color: #997700; font-weight: bold } /* Name.Label */
-.nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
-.nt { color: #007700 } /* Name.Tag */
-.nv { color: #996633 } /* Name.Variable */
-.ow { color: #000000; font-weight: bold } /* Operator.Word */
-.w { color: #bbbbbb } /* Text.Whitespace */
-.mb { color: #6600EE; font-weight: bold } /* Literal.Number.Bin */
-.mf { color: #6600EE; font-weight: bold } /* Literal.Number.Float */
-.mh { color: #005588; font-weight: bold } /* Literal.Number.Hex */
-.mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
-.mo { color: #4400EE; font-weight: bold } /* Literal.Number.Oct */
-.sb { background-color: #fff0f0 } /* Literal.String.Backtick */
-.sc { color: #0044DD } /* Literal.String.Char */
-.sd { color: #DD4422 } /* Literal.String.Doc */
-.s2 { background-color: #fff0f0 } /* Literal.String.Double */
-.se { color: #666666; font-weight: bold; background-color: #fff0f0 } /* Literal.String.Escape */
-.sh { background-color: #fff0f0 } /* Literal.String.Heredoc */
-.si { background-color: #eeeeee } /* Literal.String.Interpol */
-.sx { color: #DD2200; background-color: #fff0f0 } /* Literal.String.Other */
-.sr { color: #000000; background-color: #fff0ff } /* Literal.String.Regex */
-.s1 { background-color: #fff0f0 } /* Literal.String.Single */
-.ss { color: #AA6600 } /* Literal.String.Symbol */
-.bp { color: #007020 } /* Name.Builtin.Pseudo */
-.vc { color: #336699 } /* Name.Variable.Class */
-.vg { color: #dd7700; font-weight: bold } /* Name.Variable.Global */
-.vi { color: #3333BB } /* Name.Variable.Instance */
-.il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
diff --git a/test/tools/opt-viewer/basic.test b/test/tools/opt-viewer/basic.test
deleted file mode 100644
index e9d9b0ad33e..00000000000
--- a/test/tools/opt-viewer/basic.test
+++ /dev/null
@@ -1,9 +0,0 @@
-# Since we're performing a full compare of the generate HTML files disable
-# syntax highlighting; pygments generates slightly different code with
-# different versions.
-
-RUN: %opt-viewer -s %p/Inputs -o %t %p/Inputs/basic/or.yaml --no-highlight
-RUN: diff %p/Outputs/basic/index.html %t/index.html
-RUN: diff %p/Outputs/basic/basic_or.h.html %t/basic_or.h.html
-RUN: diff %p/Outputs/basic/basic_or.c.html %t/basic_or.c.html
-RUN: ls %t/style.css
diff --git a/test/tools/opt-viewer/lit.local.cfg b/test/tools/opt-viewer/lit.local.cfg
deleted file mode 100644
index 84dda078f97..00000000000
--- a/test/tools/opt-viewer/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if 'have_opt_viewer_modules' not in config.available_features:
-    config.unsupported = True
diff --git a/tools/opt-viewer/opt-viewer.py b/tools/opt-viewer/opt-viewer.py
index d0f14783b17..7253d7c13ee 100755
--- a/tools/opt-viewer/opt-viewer.py
+++ b/tools/opt-viewer/opt-viewer.py
@@ -60,23 +60,19 @@ class SourceFileRenderer:
 
     def render_source_lines(self, stream, line_remarks):
         file_text = stream.read()
-
-        if args.no_highlight:
-            html_highlighted = file_text
-        else:
-            html_highlighted = highlight(
+        html_highlighted = highlight(
             file_text,
-                self.cpp_lexer,
-                self.html_formatter)
+            self.cpp_lexer,
+            self.html_formatter)
 
-            # On Python 3, pygments.highlight() returns a bytes object, not a str.
-            if sys.version_info >= (3, 0):
-              html_highlighted = html_highlighted.decode('utf-8')
+        # On Python 3, pygments.highlight() returns a bytes object, not a str.
+        if sys.version_info >= (3, 0):
+          html_highlighted = html_highlighted.decode('utf-8')
 
-            # Take off the header and footer, these must be
-            #   reapplied line-wise, within the page structure
-            html_highlighted = html_highlighted.replace('<div class="highlight"><pre>', '')
-            html_highlighted = html_highlighted.replace('</pre></div>', '')
+        # Take off the header and footer, these must be
+        #   reapplied line-wise, within the page structure
+        html_highlighted = html_highlighted.replace('<div class="highlight"><pre>', '')
+        html_highlighted = html_highlighted.replace('</pre></div>', '')
 
         for (linenum, html_line) in enumerate(html_highlighted.split('\n'), start=1):
             print('''
@@ -278,11 +274,6 @@ if __name__ == '__main__':
         default=1000,
         type=int,
         help='Maximum number of the hottest remarks to appear on the index page')
-    parser.add_argument(
-        '--no-highlight',
-        action='store_true',
-        default=False,
-        help='Do not use a syntax highlighter when rendering the source code')
     args = parser.parse_args()
 
     print_progress = not args.no_progress_indicator