Attempt to fix test/benchmark/benchmark_sse.py. NFC (#25355)

The script at least will run now. I'm not sure if the resulting web page
is correct yet.

There is a bug in the resulting html that I didn't know how to fix, but
at least the python script now runs
and produces html output.

Author: sbc100

test/sse/benchmark_sse.h renamed to test/benchmark/benchmark_sse.h

@@ -33,7 +33,7 @@ float hmax(__m128 m) {
   return fmax(fmax(f[0], f[1]), fmax(f[2], f[3]));
 }
 
-#include "../tick.h"
+#include "tick.h"
 
 const int N = 8*1024*1024;
 

test/benchmark/benchmark_sse.py

@@ -7,72 +7,65 @@
 import json
 import os
 import re
-import shutil
 import sys
-import tempfile
-from subprocess import Popen
+import subprocess
 
-__rootpath__ = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+__scriptdir__ = os.path.dirname(os.path.abspath(__file__))
+__testdir__ = os.path.dirname(os.path.dirname(__file__))
+__rootpath__ = os.path.dirname(__testdir__)
+print(__rootpath__)
 sys.path.insert(0, __rootpath__)
+sys.path.insert(0, __testdir__)
 
-from tools.shared import WINDOWS, CLANG_CXX, EMCC, PIPE
+from tools.shared import WINDOWS, CLANG_CXX, EMCC
 from tools.shared import run_process
 from tools.config import V8_ENGINE
 from common import EMRUN, test_file
 import clang_native
 
-temp_dir = tempfile.mkdtemp()
-
 # System info
-system_info = Popen([EMRUN, '--system_info'], stdout=PIPE, stderr=PIPE).communicate()
+system_info = subprocess.check_output([EMRUN, '--system_info'], stderr=subprocess.STDOUT, text=True)
 
 # Native info
-native_info = Popen(['clang', '-v'], stdout=PIPE, stderr=PIPE).communicate()
+native_info = subprocess.check_output(['clang', '-v'], stderr=subprocess.STDOUT, text=True)
 
 # Emscripten info
-emscripten_info = Popen([EMCC, '-v'], stdout=PIPE, stderr=PIPE).communicate()
+emscripten_info = subprocess.check_output([EMCC, '-v'], stderr=subprocess.STDOUT, text=True)
 
 
 def run_benchmark(benchmark_file, results_file, build_args):
+    out_dir = os.path.join(__rootpath__, 'out')
+    results_file = os.path.join(out_dir, results_file)
     # Run native build
-    out_file = os.path.join(temp_dir, 'benchmark_sse_native')
+    out_file = os.path.join(out_dir, 'benchmark_sse_native')
     if WINDOWS:
         out_file += '.exe'
     cmd = [CLANG_CXX] + clang_native.get_clang_native_args() + [benchmark_file, '-O3', '-o', out_file]
     print('Building native version of the benchmark:')
     print(' '.join(cmd))
     run_process(cmd, env=clang_native.get_clang_native_env())
 
-    native_results = Popen([out_file], stdout=PIPE, stderr=PIPE).communicate()
-    print(native_results[0])
+    native_results = subprocess.check_output(out_file)
+    print('native_results', native_results)
 
     # Run emscripten build
-    out_file = os.path.join(temp_dir, 'benchmark_sse_html.js')
-    cmd = [EMCC, benchmark_file, '-O3', '-sTOTAL_MEMORY=536870912', '-o', out_file] + build_args
+    out_file = os.path.join(out_dir, 'benchmark_sse_html.js')
+    cmd = [EMCC, benchmark_file, '-sENVIRONMENT=web,shell,node', '-msimd128', '-O3', '-sTOTAL_MEMORY=536870912', '-o', out_file] + build_args
     print('Building Emscripten version of the benchmark:')
     print(' '.join(cmd))
     run_process(cmd)
 
-    cmd = V8_ENGINE + ['--experimental-wasm-simd', os.path.basename(out_file)]
+    cmd = V8_ENGINE + [os.path.basename(out_file)]
     print(' '.join(cmd))
-    old_dir = os.getcwd()
-    os.chdir(os.path.dirname(out_file))
-    wasm_results = Popen(cmd, stdout=PIPE, stderr=PIPE).communicate()
-    os.chdir(old_dir)
-
-    if not wasm_results:
-        raise Exception('Unable to run benchmark in V8!')
+    wasm_results = subprocess.check_output(cmd, cwd=out_dir, text=True)
 
-    if not wasm_results[0].strip():
-        print(wasm_results[1])
-        sys.exit(1)
-
-    print(wasm_results[0])
+    print('wasm_results', wasm_results)
 
     def strip_comments(text):
-        return re.sub('//.*?\n|/\*.*?\*/', '', text, re.S) # noqa
+        return re.sub(r'//.*?\n|/\*.*?\*/', '', text, flags=re.S) # noqa
 
-    benchmark_results = strip_comments(wasm_results[0])
+    benchmark_results = strip_comments(wasm_results)
+    print('stripped', benchmark_results)
 
     # Strip out unwanted print output.
     benchmark_results = benchmark_results[benchmark_results.find('{'):].strip()
@@ -81,9 +74,7 @@ def strip_comments(text):
 
     print(benchmark_results)
 
-    shutil.rmtree(temp_dir)
-
-    native_results = json.loads(native_results[0])
+    native_results = json.loads(native_results)
     benchmark_results = benchmark_results[benchmark_results.index('{'):benchmark_results.rindex('}') + 1]
     wasm_results = json.loads(benchmark_results)
 
@@ -94,11 +85,11 @@ def strip_comments(text):
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
     <script src="https://code.highcharts.com/highcharts.js"></script>
     <script src="https://code.highcharts.com/modules/exporting.js"></script><b>System Info:</b><br/>
-    ''' + system_info[0].replace('\n', '<br/>') + '''
+    ''' + system_info.replace('\n', '<br/>') + '''
     <b>Native Clang Compiler:</b><br/>
-    ''' + native_info[1].replace('\n', '<br/>') + '''
+    ''' + native_info.replace('\n', '<br/>') + '''
     <b>Emscripten Compiler:</b><br/>
-    ''' + emscripten_info[0].replace('\n', '<br/>')
+    ''' + emscripten_info.replace('\n', '<br/>')
 
     charts_native = {}
     charts_html = {}
@@ -294,12 +285,12 @@ def format_comparison(a, b):
 if __name__ == '__main__':
     suite = sys.argv[1].lower() if len(sys.argv) == 2 else None
     if suite in ['sse', 'sse1']:
-        run_benchmark(test_file('sse/benchmark_sse1.cpp'), 'results_sse1.html', ['-msse'])
+        run_benchmark(test_file('benchmark/benchmark_sse1.cpp'), 'results_sse1.html', ['-msse'])
     elif suite == 'sse2':
-        run_benchmark(test_file('sse/benchmark_sse2.cpp'), 'results_sse2.html', ['-msse2'])
+        run_benchmark(test_file('benchmark/benchmark_sse2.cpp'), 'results_sse2.html', ['-msse2'])
     elif suite == 'sse3':
-        run_benchmark(test_file('sse/benchmark_sse3.cpp'), 'results_sse3.html', ['-msse3'])
+        run_benchmark(test_file('benchmark/benchmark_sse3.cpp'), 'results_sse3.html', ['-msse3'])
     elif suite == 'ssse3':
-        run_benchmark(test_file('sse/benchmark_ssse3.cpp'), 'results_ssse3.html', ['-mssse3'])
+        run_benchmark(test_file('benchmark/benchmark_ssse3.cpp'), 'results_ssse3.html', ['-mssse3'])
     else:
-        raise Exception('Usage: python test/benchmark_sse.py sse1|sse2|sse3')
+        raise Exception('Usage: python test/benchmark/benchmark_sse.py sse1|sse2|sse3')