Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and document Emscripten link-time options #174

Merged
merged 7 commits into from
Mar 4, 2025
Merged

Update and document Emscripten link-time options #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20545e5
Update and document Emscripten link-time options
mpwarres Oct 11, 2024
5f4384e
Merge branch 'main' into emscripten-build-options
mpwarres Mar 3, 2025
a14a906
Address review comments:
mpwarres Mar 3, 2025
afab577
Further changes from code review
mpwarres Mar 3, 2025
1e4863d
Update build action to use actions/cache@v4
mpwarres Mar 3, 2025
7c81e69
Merge branch 'actions' into emscripten-build-options
mpwarres Mar 3, 2025
6dadc2d
Merge branch 'main' into emscripten-build-options
mpwarres Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,23 @@ PKG_CONFIG_PATH = ${EMSDK}/upstream/emscripten/cache/sysroot/lib/pkgconfig
WASM_LIBS = $(shell $(PKG_CONFIG) $(WASM_DEPS) $(PROTO_DEPS) \
--with-path=$(PKG_CONFIG_PATH) --libs | sed -e 's/-pthread //g')

# See proxy_wasm_cc_binary build rule definition in bazel/defs.bzl for
# explanation of emscripten link options.
EMSCRIPTEN_LINK_OPTS := --no-entry \
--js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js \
-sSTANDALONE_WASM -sEXPORTED_FUNCTIONS=_malloc \
-sALLOW_MEMORY_GROWTH=1 -sINITIAL_HEAP=64KB


debug-deps:
# WASM_DEPS : ${WASM_DEPS}
# WASM_LIBS : ${WASM_LIBS}
# PROTO_DEPS: ${PROTO_DEPS}
# PROTO_OPTS: ${PROTO_OPTS}

# TODO(mpwarres): Add Emscripten stack/heap size params in PR#174.
%.wasm %.wat: %.cc
em++ --no-entry -sSTANDALONE_WASM -sEXPORTED_FUNCTIONS=_malloc \
--std=c++17 -O3 -flto \
--js-library ${PROXY_WASM_CPP_SDK}/proxy_wasm_intrinsics.js \
em++ --std=c++17 -O3 -flto \
${EMSCRIPTEN_LINK_OPTS} \
-I${PROXY_WASM_CPP_SDK} \
${CPP_CONTEXT_LIB} \
${PROTO_OPTS} \
Expand Down
10 changes: 10 additions & 0 deletions bazel/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,20 @@ def proxy_wasm_cc_binary(
"@proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_js",
],
linkopts = linkopts + [
# Setting to indicate module is a "reactor library" without a main() entry point:
# https://emscripten.org/docs/tools_reference/settings_reference.html#standalone-wasm
"--no-entry",
# File listing additional functions that Emscripten should expect to be implemented by the host:
# https://emscripten.org/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.html#implement-c-in-javascript
"--js-library=$(location @proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_js)",
# Emit Wasm module that can run without JavaScript
"-sSTANDALONE_WASM",
# Give host code access to Emscripten's _malloc() function
"-sEXPORTED_FUNCTIONS=_malloc",
# Allow allocating memory past initial heap size
"-sALLOW_MEMORY_GROWTH=1",
# Initial amount of heap memory. 64KB matches Rust SDK starting heap size.
"-sINITIAL_HEAP=64KB",
],
tags = tags + [
"manual",
Expand Down