S2wasm runtime funcs (#1027)

* Generate stackSave function in s2wasm

* Generate stackAlloc in s2wasm

* Generate stackRestore in s2wasm

* Update dot_s tests for runtime functions

* Add s2wasm check for exporting runtime functions

* Fix flake8 for s2wasm.py

* Rename wasmBuilder to builder

1 files changed, 11 insertions, 4 deletions

diff --git a/scripts/test/s2wasm.py b/scripts/test/s2wasm.py
index bf7c97fbe..e89a65099 100755
--- a/scripts/test/s2wasm.py
+++ b/scripts/test/s2wasm.py
@@ -94,14 +94,21 @@ def test_linker():
   # bar should be linked from the archive
   fail_if_not_contained(output, '(func $bar')
 
-  # Test exporting memory growth function
+  # Test exporting memory growth function and emscripten runtime functions
   cmd = S2WASM + [
       os.path.join(options.binaryen_test, 'linker', 'main.s'),
       '--emscripten-glue', '--allow-memory-growth']
   output = run_command(cmd)
-  fail_if_not_contained(
-      output, '(export "__growWasmMemory" (func $__growWasmMemory))')
-  fail_if_not_contained(output, '(func $__growWasmMemory (param $newSize i32)')
+  expected_funcs = [
+      ('__growWasmMemory', '(param $newSize i32)'),
+      ('stackSave', '(result i32)'),
+      ('stackAlloc', '(param $0 i32) (result i32)'),
+      ('stackRestore', '(param $0 i32)'),
+  ]
+  for name, extra in expected_funcs:
+    space = ' ' if extra else ''
+    fail_if_not_contained(output, '(export "{0}" (func ${0}))'.format(name))
+    fail_if_not_contained(output, '(func ${0}'.format(name + space + extra))
 
 
 if __name__ == '__main__':