Feedback

Author: sbc100

README.md

@@ -65,6 +65,7 @@ This repository contains code that builds the following tools in `bin/`:
  * **wasm2asm**: A WebAssembly-to-asm.js compiler (still experimental).
  * **wasm-merge**: Combines wasm files into a single big wasm file (without sophisticated linking).
  * **wasm-ctor-eval**: A tool that can execute C++ global constructors ahead of time. Used by Emscripten.
+ * **wasm-emscripten-finalize**: Takes a wasm binary produced by llvm+lld and performs emscripten-specific passes over it.
  * **wasm.js**: wasm.js contains Binaryen components compiled to JavaScript, including the interpreter, `asm2wasm`, the S-Expression parser, etc., which allow you to use Binaryen with Emscripten and execute code compiled to WASM even if the browser doesn't have native support yet. This can be useful as a (slow) polyfill.
  * **binaryen.js**: A standalone JavaScript library that exposes Binaryen methods for [creating and optimizing WASM modules](https://github.com/WebAssembly/binaryen/blob/master/test/binaryen.js/hello-world.js).
 

auto_update_tests.py

@@ -21,7 +21,7 @@
 
 from scripts.test.support import run_command, split_wast, node_test_glue, node_has_webassembly
 from scripts.test.shared import (
-    ASM2WASM, MOZJS, NODEJS, S2WASM, WASM_OPT, WASM_AS, WASM_DIS,
+    ASM2WASM, MOZJS, NODEJS, WASM_OPT, WASM_AS, WASM_DIS,
     WASM_CTOR_EVAL, WASM_MERGE, WASM_REDUCE, WASM2ASM, WASM_METADCE,
     WASM_EMSCRIPTEN_FINALIZE, BINARYEN_INSTALL_DIR,
     files_with_pattern, has_shell_timeout)
@@ -69,35 +69,6 @@ def update_asm_js_tests():
             run_command(cmd)
 
 
-def update_dot_s_tests():
-  extension_arg_map = {
-    '.wast': [],
-    '.clamp.wast': ['--trap-mode=clamp'],
-    '.js.wast': ['--trap-mode=js'],
-    '.jscall.wast': ['--emscripten-reserved-function-pointers=3'],
-  }
-  for dot_s_dir in ['dot_s', 'llvm_autogenerated']:
-    for s in sorted(os.listdir(os.path.join('test', dot_s_dir))):
-      if not s.endswith('.s'):
-        continue
-      print '..', s
-      for ext, ext_args in extension_arg_map.iteritems():
-        wasm = s.replace('.s', ext)
-        expected_file = os.path.join('test', dot_s_dir, wasm)
-        if ext != '.wast' and not os.path.exists(expected_file):
-          continue
-
-        full = os.path.join('test', dot_s_dir, s)
-        stack_alloc = ['--allocate-stack=1024'] if dot_s_dir == 'llvm_autogenerated' else []
-        cmd = S2WASM + [full, '--emscripten-glue'] + stack_alloc + ext_args
-        if s.startswith('start_'):
-          cmd.append('--start')
-        actual = run_command(cmd, stderr=subprocess.PIPE, expected_err='')
-
-        with open(expected_file, 'w') as o:
-          o.write(actual)
-
-
 def update_lld_tests():
   print '\n[ checking wasm-emscripten-finalize testcases... ]\n'
 

scripts/test/shared.py

@@ -191,7 +191,6 @@ def wrap_with_valgrind(cmd):
   WASM_DIS = wrap_with_valgrind(WASM_DIS)
   ASM2WASM = wrap_with_valgrind(ASM2WASM)
   WASM_SHELL = wrap_with_valgrind(WASM_SHELL)
-  S2WASM = wrap_with_valgrind(S2WASM)
 
 os.environ['BINARYEN'] = os.getcwd()