Use CMake to build binaryen.js (#2464)

Fixes #2453

As a bonus this also provides a port of wasm-opt etc. with NODERAWFS
and everything seems to work, that is, you can run stuff like

nodejs wasm-opt.js input.wasm --metrics

Author: kripken

CMakeLists.txt

@@ -161,10 +161,27 @@ ELSE()
   ENDIF()
   ADD_DEBUG_COMPILE_FLAG("-O0")
   ADD_DEBUG_COMPILE_FLAG("-g3")
-  ADD_NONDEBUG_COMPILE_FLAG("-O2")
+  IF (EMSCRIPTEN)
+    # really focus on minimizing output size when compiling sources
+    ADD_NONDEBUG_COMPILE_FLAG("-Oz")
+  ELSE()
+    ADD_NONDEBUG_COMPILE_FLAG("-O2")
+  ENDIF()
   ADD_NONDEBUG_COMPILE_FLAG("-UNDEBUG") # Keep asserts.
 ENDIF()
 
+IF (EMSCRIPTEN)
+  # link with -O3 for metadce and other powerful optimizations. note that we
+  # must use add_link_options so that this appears after CMake's default -O2
+  add_link_options("-O3")
+  ADD_LINK_FLAG("-s SINGLE_FILE")
+  ADD_LINK_FLAG("-s ALLOW_MEMORY_GROWTH=1")
+  ADD_COMPILE_FLAG("-s DISABLE_EXCEPTION_CATCHING=0")
+  ADD_LINK_FLAG("-s DISABLE_EXCEPTION_CATCHING=0")
+  # make the tools immediately usable on Node.js
+  ADD_LINK_FLAG("-s NODERAWFS")
+ENDIF()
+
 # clang doesn't print colored diagnostics when invoked from Ninja
 IF (UNIX AND
     CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
@@ -196,7 +213,6 @@ SET(binaryen_objs
 
 # Sources.
 
-
 SET(binaryen_SOURCES
   src/binaryen-c.cpp
 )
@@ -212,12 +228,6 @@ INSTALL(TARGETS binaryen DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 INSTALL(FILES src/binaryen-c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-# if binaryen.js was built (using "./build-js.sh", currently
-# optional), install it
-IF(EXISTS "${PROJECT_SOURCE_DIR}/out/binaryen.js")
-  INSTALL(FILES out/binaryen.js DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
-ENDIF()
-
 SET(wasm-shell_SOURCES
   src/tools/wasm-shell.cpp
 )
@@ -308,6 +318,33 @@ SET_PROPERTY(TARGET wasm-reduce PROPERTY CXX_STANDARD 14)
 SET_PROPERTY(TARGET wasm-reduce PROPERTY CXX_STANDARD_REQUIRED ON)
 INSTALL(TARGETS wasm-reduce DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+# binaryen.js
+#
+# Note that we can't emit binaryen.js directly, as there is libbinaryen already
+# declared earlier, so we create binaryen_js.js, which must then be copied.
+IF (EMSCRIPTEN)
+  SET(binaryen_js_SOURCES
+    src/binaryen-c.cpp
+  )
+  ADD_EXECUTABLE(binaryen_js
+                 ${binaryen_js_SOURCES})
+  TARGET_LINK_LIBRARIES(binaryen_js wasm asmjs emscripten-optimizer passes ir cfg support wasm)
+  # note that SHELL: is needed as otherwise cmake will coalesce -s link flags
+  # in an incorrect way for emscripten
+  TARGET_LINK_LIBRARIES(binaryen_js "-s WASM=0")
+  TARGET_LINK_LIBRARIES(binaryen_js "-s WASM_ASYNC_COMPILATION=0")
+  TARGET_LINK_LIBRARIES(binaryen_js "-s MODULARIZE_INSTANCE=1")
+  TARGET_LINK_LIBRARIES(binaryen_js "-s NO_FILESYSTEM=0")
+  TARGET_LINK_LIBRARIES(binaryen_js "-s NODERAWFS=0")
+  TARGET_LINK_LIBRARIES(binaryen_js "-s 'EXPORT_NAME=\"Binaryen\"'")
+  TARGET_LINK_LIBRARIES(binaryen_js "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-post.js")
+  TARGET_LINK_LIBRARIES(binaryen_js optimized "--closure 1")
+  TARGET_LINK_LIBRARIES(binaryen_js debug "--profiling")
+  SET_PROPERTY(TARGET binaryen_js PROPERTY CXX_STANDARD 14)
+  SET_PROPERTY(TARGET binaryen_js PROPERTY CXX_STANDARD_REQUIRED ON)
+  INSTALL(TARGETS binaryen_js DESTINATION ${CMAKE_INSTALL_BINDIR})
+ENDIF()
+
 # Testing
 #
 # Currently just some very simple smoke tests.

build-js.sh

@@ -1,6 +1,9 @@
 set -e
 echo "travis-test build"
-./build-js.sh -g
+emconfigure cmake -DCMAKE_BUILD_TYPE=Release
+emmake make -j4 binaryen_js
+mkdir out
+cp bin/binaryen_js.js out/binaryen.js
 echo "travis-test test"
 python3 -m scripts.test.binaryenjs
 echo "travis-test yay!"