Revert "benchmark improvements (emscripten-core#8414)"

This reverts commit 829a4db.

tests/test_benchmark.py

@@ -45,8 +45,6 @@
 
 PROFILING = 0
 
-LLVM_FEATURE_FLAGS = ['-mnontrapping-fptoint']
-
 
 class Benchmarker(object):
   def __init__(self, name):
@@ -187,7 +185,7 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat
       '-s', 'MINIMAL_RUNTIME=0',
       '-s', 'BENCHMARK=%d' % (1 if IGNORE_COMPILATION and not has_output_parser else 0),
       '-o', final
-    ] + shared_args + emcc_args + LLVM_FEATURE_FLAGS + self.extra_args
+    ] + shared_args + emcc_args + self.extra_args
     if 'FORCE_FILESYSTEM=1' in cmd:
       cmd = [arg if arg != 'FILESYSTEM=0' else 'FILESYSTEM=1' for arg in cmd]
     if PROFILING:
@@ -319,7 +317,7 @@ def cleanup(self):
   ]
 if V8_ENGINE and V8_ENGINE in shared.JS_ENGINES:
   benchmarkers += [
-    EmscriptenBenchmarker(os.environ.get('EMBENCH_NAME') or 'v8', V8_ENGINE),
+    EmscriptenBenchmarker('v8', V8_ENGINE),
   ]
 if os.path.exists(CHEERP_BIN):
   benchmarkers += [

tools/jsrun.py

@@ -43,7 +43,7 @@ def make_command(filename, engine=None, args=[]):
   # label a path to nodejs containing a 'd8' as spidermonkey instead.
   jsengine = os.path.basename(engine[0])
   # Use "'d8' in" because the name can vary, e.g. d8_g, d8, etc.
-  is_d8 = 'd8' in jsengine or 'v8' in jsengine
+  is_d8 = 'd8' in jsengine
   is_jsc = 'jsc' in jsengine
   # Disable true async compilation (async apis will in fact be synchronous) for now
   # due to https://bugs.chromium.org/p/v8/issues/detail?id=6263