Fixes for #5998 (#1341)

* binaryen.js and wasm.js don't need filesystem support

* newest emscripten no longer uses Runtime.*

* build fixes for binaryen.js and wasm.js also move binaryen.js to use standard emscripten MODULARIZE

* run binaryen.js in all possible engines ; update js builds

* don't emit debug build to a different name, just emit binaryen.js. makes testing easier and safer

* remove volatile things from binaryen.js info printing in tests

Author: kripken

auto_update_tests.py

@@ -239,6 +239,7 @@
     print s
     f = open('a.js', 'w')
     f.write(open(os.path.join('bin', 'binaryen.js')).read())
+    # node/shell test support
     f.write(open(os.path.join('test', 'binaryen.js', s)).read())
     f.close()
     cmd = [MOZJS, 'a.js']

bin/binaryen.js

@@ -40,26 +40,23 @@ fi
 EMCC_ARGS="-std=c++11 --memory-init-file 0"
 EMCC_ARGS="$EMCC_ARGS -s ALLOW_MEMORY_GROWTH=1"
 EMCC_ARGS="$EMCC_ARGS -s DEMANGLE_SUPPORT=1"
+EMCC_ARGS="$EMCC_ARGS -s NO_FILESYSTEM=1"
 EMCC_ARGS="$EMCC_ARGS -s DISABLE_EXCEPTION_CATCHING=0" # Exceptions are thrown and caught when optimizing endless loops
 OUT_FILE_SUFFIX=
 
 if [ "$1" == "-g" ]; then
   EMCC_ARGS="$EMCC_ARGS -O2" # need emcc js opts to be decently fast
   EMCC_ARGS="$EMCC_ARGS --llvm-opts 0 --llvm-lto 0"
   EMCC_ARGS="$EMCC_ARGS -profiling"
-  OUT_FILE_SUFFIX=-g
 else
   EMCC_ARGS="$EMCC_ARGS -Oz"
   EMCC_ARGS="$EMCC_ARGS --llvm-lto 1"
   EMCC_ARGS="$EMCC_ARGS -s ELIMINATE_DUPLICATE_FUNCTIONS=1"
+  EMCC_ARGS="$EMCC_ARGS --closure 1"
   # Why these settings?
   # See https://gist.github.com/rsms/e33c61a25a31c08260161a087be03169
 fi
 
-if [ "$1" != "-g" ]; then
-  EMCC_ARGS="$EMCC_ARGS --closure 1"
-fi
-
 echo "building shared bitcode"
 
 "$EMSCRIPTEN/em++" \
@@ -138,6 +135,7 @@ echo "building wasm.js"
   -Isrc/ \
   -o bin/wasm${OUT_FILE_SUFFIX}.js \
   -s MODULARIZE=1 \
+  -s 'EXTRA_EXPORTED_RUNTIME_METHODS=["writeAsciiToMemory"]' \
   -s 'EXPORT_NAME="WasmJS"'
 
 echo "building binaryen.js"
@@ -580,5 +578,10 @@ export_function "_BinaryenSetAPITracing"
   -Isrc/ \
   -s EXPORTED_FUNCTIONS=[${EXPORTED_FUNCTIONS}] \
   -o bin/binaryen${OUT_FILE_SUFFIX}.js \
-  --pre-js src/js/binaryen.js-pre.js \
-  --post-js src/js/binaryen.js-post.js
+  --post-js src/js/binaryen.js-post.js \
+  -s MODULARIZE=1 \
+  -s 'EXPORT_NAME="Binaryen"'
+
+# Create a singleton instance from the MODULARIZE module
+echo "Binaryen = Binaryen();" >> bin/binaryen${OUT_FILE_SUFFIX}.js
+

bin/wasm.js

@@ -358,25 +358,24 @@ def run_binaryen_js_tests():
     if not s.endswith('.js'): continue
     print s
     f = open('a.js', 'w')
-    f.write(open(os.path.join(options.binaryen_bin, 'binaryen.js')).read())
-    # node test support
-    f.write('\nif (typeof require === "function") var Binaryen = module.exports;\n')
+    binaryen_js = open(os.path.join(options.binaryen_bin, 'binaryen.js')).read()
+    f.write(binaryen_js)
     test_path = os.path.join(options.binaryen_test, 'binaryen.js', s)
     test = open(test_path).read()
     need_wasm = 'WebAssembly.' in test # some tests use wasm support in the VM
-    if MOZJS:
-      cmd = [MOZJS]
-    elif NODEJS and not need_wasm: # TODO: check if node is new and has wasm support
-      cmd = [NODEJS]
-    else:
-      continue # we can't run it
-    cmd += ['a.js']
     f.write(test)
     f.close()
-    out = run_command(cmd, stderr=subprocess.STDOUT)
-    expected = open(os.path.join(options.binaryen_test, 'binaryen.js', s + '.txt')).read()
-    if expected not in out:
-      fail(out, expected)
+    def test(engine):
+      cmd = [engine, 'a.js']
+      out = run_command(cmd, stderr=subprocess.STDOUT)
+      expected = open(os.path.join(options.binaryen_test, 'binaryen.js', s + '.txt')).read()
+      if expected not in out:
+        fail(out, expected)
+    # run in all possible shells
+    if MOZJS:
+      test(MOZJS)
+    if NODEJS and not need_wasm: # TODO: check if node is new and has wasm support
+      test(NODEJS)
 
 def run_validator_tests():
   print '\n[ running validation tests... ]\n'

build-js.sh

@@ -1,3 +1,13 @@
+function cleanInfo(info) {
+  var ret = {};
+  for (var x in info) {
+    if (x !== 'name' && x !== 'body' && x !== 'type') {
+      ret[x] = info[x];
+    }
+  }
+  return ret;
+}
+
 var module = new Binaryen.Module();
 
 var signature = module.addFunctionType("i", Binaryen.i32, []);
@@ -13,15 +23,17 @@ console.log("GetFunction is equal: " + (func === module.getFunction("a-function"
 
 module.runPassesOnFunction(func, ["precompute"]);
 
-console.log("getFunctionTypeInfo=" + JSON.stringify(Binaryen.getFunctionTypeInfo(signature)));
-var info = Binaryen.getFunctionInfo(func);
-console.log("getFunctionInfo=" + JSON.stringify(info));
-console.log("getExpressionInfo(body)=" + JSON.stringify(Binaryen.getExpressionInfo(info.body)));
-console.log(Binaryen.emitText(info.body));
+var sigInfo = Binaryen.getFunctionTypeInfo(signature);
+console.log("getFunctionTypeInfo=" + JSON.stringify(cleanInfo(sigInfo)));
+var funcInfo = Binaryen.getFunctionInfo(func);
+console.log("getFunctionInfo=" + JSON.stringify(cleanInfo(funcInfo)));
+var expInfo = Binaryen.getExpressionInfo(funcInfo.body);
+console.log("getExpressionInfo(body)=" + JSON.stringify(cleanInfo(expInfo)));
+console.log(Binaryen.emitText(funcInfo.body));
 
 module.removeFunction("a-function");
 
-module.addGlobal("a-global", Binaryen.i32, false, info.body);
+module.addGlobal("a-global", Binaryen.i32, false, funcInfo.body);
 
 module.validate();
 

check.py

@@ -1,7 +1,7 @@
 GetFunction is equal: true
-getFunctionTypeInfo={"name":5366144,"params":[],"result":1}
-getFunctionInfo={"name":5399120,"type":5366144,"params":[],"result":1,"vars":[],"body":5366312}
-getExpressionInfo(body)={"id":15,"type":1,"value":3}
+getFunctionTypeInfo={"params":[],"result":1}
+getFunctionInfo={"params":[],"result":1,"vars":[]}
+getExpressionInfo(body)={"id":15,"value":3}
 (i32.const 3)
 
 (module

src/js/binaryen.js-post.js

@@ -1,6 +1,16 @@
 
 // kitchen sink, tests the full API
 
+function cleanInfo(info) {
+  var ret = {};
+  for (var x in info) {
+    if (x !== 'value') {
+      ret[x] = info[x];
+    }
+  }
+  return ret;
+}
+
 var module;
 
 // helpers
@@ -212,7 +222,7 @@ function test_core() {
   ];
 
   // Test expression utility
-  console.log("getExpressionInfo=" + JSON.stringify(Binaryen.getExpressionInfo(valueList[3])));
+  console.log("getExpressionInfo=" + JSON.stringify(cleanInfo(Binaryen.getExpressionInfo(valueList[3]))));
   console.log(Binaryen.emitText(valueList[3])); // test printing a standalone expression
 
   console.log("getExpressionInfo(i32.const)=" + JSON.stringify(Binaryen.getExpressionInfo(module.i32.const(5))));