--no-js-ffi opt to disable JS FFI mangling. (#984)

* Always use scripts.test.shared for bin paths.

Update scripts/test/shared.py to add WASM_MERGE relative to build
directory.  Update auto_update_tests.py to use scripts.test.shared
variables for all bin paths. Update check.py to use
scripts.test.shared for wasm-merge path (this was missing).

This allows check.py and auto_update_tests.py to be run from the
source directory using built binaries in a different location.

* --no-legalize-javascript-ffi disables JS FFI mangling.

For JS/Web platform, calls to JS imports are wrapped to convert i64 to
i32 and f32 to f64. Likewise calls from JS into exports do the inverse
wrapping. This change provides an option to disable that wrapping and
use the original types for the call.

Includes tests test/noffi_f32.asm.js and test/noffi_i64.asm.js to make
sure neither f32->f64 nor i64->i32 type mangling is happening when
--no-legalize-javascript-ffi is specified.

To fully disable JS FFI mangling when using emscripten, the fastcomp
FFI mangling must also be disabled using the
-emscripten-legalize-javascript-ffi=0 flag.

1 files changed, 15 insertions, 11 deletions

diff --git a/auto_update_tests.py b/auto_update_tests.py
index 9eb0fb50c..0c07001e2 100755
--- a/auto_update_tests.py
+++ b/auto_update_tests.py
@@ -3,6 +3,8 @@
 import os, sys, subprocess, difflib
 
 from scripts.test.support import run_command, split_wast
+from scripts.test.shared import (
+    ASM2WASM, S2WASM, WASM_SHELL, WASM_OPT, WASM_AS, WASM_DIS)
 
 print '[ processing and updating testcases... ]\n'
 
@@ -10,7 +12,7 @@ for asm in sorted(os.listdir('test')):
   if asm.endswith('.asm.js'):
     for precise in [0, 1, 2]:
       for opts in [1, 0]:
-        cmd = [os.path.join('bin', 'asm2wasm'), os.path.join('test', asm)]
+        cmd = ASM2WASM + [os.path.join('test', asm)]
         wasm = asm.replace('.asm.js', '.fromasm')
         if not precise:
           cmd += ['--emit-potential-traps', '--ignore-implicit-traps']
@@ -26,13 +28,15 @@ for asm in sorted(os.listdir('test')):
           cmd += ['-O']
         if 'debugInfo' in asm:
           cmd += ['-g']
+        if 'noffi' in asm:
+          cmd += ['--no-legalize-javascript-ffi']
         if precise and opts:
           # test mem init importing
           open('a.mem', 'wb').write(asm)
           cmd += ['--mem-init=a.mem']
           if asm[0] == 'e':
             cmd += ['--mem-base=1024']
-        if 'i64' in asm or 'wasm-only' in asm:
+        if 'i64' in asm or 'wasm-only' in asm or 'noffi' in asm:
           cmd += ['--wasm-only']
         print ' '.join(cmd)
         actual = run_command(cmd)
@@ -45,7 +49,7 @@ for dot_s_dir in ['dot_s', 'llvm_autogenerated']:
     wasm = s.replace('.s', '.wast')
     full = os.path.join('test', dot_s_dir, s)
     stack_alloc = ['--allocate-stack=1024'] if dot_s_dir == 'llvm_autogenerated' else []
-    cmd = [os.path.join('bin', 's2wasm'), full, '--emscripten-glue'] + stack_alloc
+    cmd = S2WASM + [full, '--emscripten-glue'] + stack_alloc
     if s.startswith('start_'):
       cmd.append('--start')
     actual = run_command(cmd, stderr=subprocess.PIPE, expected_err='')
@@ -70,11 +74,11 @@ for t in sorted(os.listdir(os.path.join('test', 'print'))):
   if t.endswith('.wast'):
     print '..', t
     wasm = os.path.basename(t).replace('.wast', '')
-    cmd = [os.path.join('bin', 'wasm-shell'), os.path.join('test', 'print', t), '--print']
+    cmd = WASM_SHELL + [os.path.join('test', 'print', t), '--print']
     print '    ', ' '.join(cmd)
     actual, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
     with open(os.path.join('test', 'print', wasm + '.txt'), 'w') as o: o.write(actual)
-    cmd = [os.path.join('bin', 'wasm-shell'), os.path.join('test', 'print', t), '--print-minified']
+    cmd = WASM_SHELL + [os.path.join('test', 'print', t), '--print-minified']
     print '    ', ' '.join(cmd)
     actual, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
     with open(os.path.join('test', 'print', wasm + '.minified.txt'), 'w') as o: o.write(actual)
@@ -89,14 +93,14 @@ for t in sorted(os.listdir(os.path.join('test', 'passes'))):
     for module, asserts in split_wast(t):
       assert len(asserts) == 0
       with open('split.wast', 'w') as o: o.write(module)
-      cmd = [os.path.join('bin', 'wasm-opt')] + opts + ['split.wast', '--print']
+      cmd = WASM_OPT + opts + ['split.wast', '--print']
       actual += run_command(cmd)
     with open(os.path.join('test', 'passes', passname + '.txt'), 'w') as o: o.write(actual)
 
 print '\n[ checking wasm-opt -o notation... ]\n'
 
 wast = os.path.join('test', 'hello_world.wast')
-cmd = [os.path.join('bin', 'wasm-opt'), wast, '-o', 'a.wast', '-S']
+cmd = WASM_OPT + [wast, '-o', 'a.wast', '-S']
 run_command(cmd)
 open(wast, 'w').write(open('a.wast').read())
 
@@ -105,14 +109,14 @@ print '\n[ checking binary format testcases... ]\n'
 for wast in sorted(os.listdir('test')):
   if wast.endswith('.wast') and not wast in []: # blacklist some known failures
     for debug_info in [0, 1]:
-      cmd = [os.path.join('bin', 'wasm-as'), os.path.join('test', wast), '-o', 'a.wasm']
+      cmd = WASM_AS + [os.path.join('test', wast), '-o', 'a.wasm']
       if debug_info: cmd += ['-g']
       print ' '.join(cmd)
       if os.path.exists('a.wasm'): os.unlink('a.wasm')
       subprocess.check_call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
       assert os.path.exists('a.wasm')
 
-      cmd = [os.path.join('bin', 'wasm-dis'), 'a.wasm', '-o', 'a.wast']
+      cmd = WASM_DIS + ['a.wasm', '-o', 'a.wast']
       print ' '.join(cmd)
       if os.path.exists('a.wast'): os.unlink('a.wast')
       subprocess.check_call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -177,7 +181,7 @@ for t in os.listdir('test'):
     print '..', t
     t = os.path.join('test', t)
     f = t + '.from-wast'
-    cmd = [os.path.join('bin', 'wasm-opt'), t, '--print']
+    cmd = WASM_OPT + [t, '--print']
     actual = run_command(cmd)
     actual = actual.replace('printing before:\n', '')
     open(f, 'w').write(actual)
@@ -188,7 +192,7 @@ for t in os.listdir('test'):
   if t.endswith('.wasm') and not t.startswith('spec'):
     print '..', t
     t = os.path.join('test', t)
-    cmd = [os.path.join('bin', 'wasm-dis'), t]
+    cmd = WASM_DIS + [t]
     actual = run_command(cmd)
 
     open(t + '.fromBinary', 'w').write(actual)