Skip to content

Use stack-switching feature #13

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

Open
dhil wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use stack-switching feature #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cd40a0
Use stack-switching feature
dhil Oct 30, 2024
daab681
Update config
dhil Feb 26, 2025
d627b09
dune => ocaml-dune
dhil Feb 26, 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
2 changes: 1 addition & 1 deletion .github/workflows/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ jobs:
- run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
- run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- run: cargo install hyperfine
- run: sudo apt-get install cmake ocaml dune menhir libmenhir-ocaml-dev
- run: sudo apt-get install cmake ocaml ocaml-dune menhir libmenhir-ocaml-dev
- run: ./harness.py -v setup
- run: ./harness.py -v run
18 changes: 9 additions & 9 deletions config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,24 @@
]

MIMALLOC_REVISION = "v2.1.2"
# WebAssembly/binaryen#main as of August 9, 2024
BINARYEN_REVISION = "3386e642c76028438fc783bf97089115ea9a900f"
# wasmfx/wasmfxtime#main as of August 7, 2024
WASMTIME_REVISION = "41c90734bf069d2487dc6d7121372f6295cf43f2"
# wasmfx/specfx#main as of August 7, 2024
SPEC_REVISION = "6d01dfc84d8d9bba6cfeedb0aa078918b082dd3c"
# WebAssembly/binaryen#main as of February 26, 2025
BINARYEN_REVISION = "609bcec0c1c321d2b4805e341a558679ae710e99"
# wasmfx/wasmfxtime#main as of February 26, 2025
WASMTIME_REVISION = "21540296f1c262188636fe0fb373cd2a9600d764"
# wasmfx/specfx#main as of February 26, 2025
SPEC_REVISION = "54d6657b16b7bf134808064e4f77845a2b7c4fcc"

WASMTIME_CARGO_BUILD_ARGS = [
"--features=default,unsafe_disable_continuation_linearity_check"
"--features=default"
]
WASMTIME_RUN_ARGS = [
"-W=exceptions,function-references,typed-continuations",
"-W=exceptions,function-references,stack-switching",
"-Ccache=n",
"-Wwasmfx-stack-size=4096",
"-Wwasmfx-red-zone-size=0",
]
WASMTIME_COMPILE_ARGS = [
"-W=exceptions,function-references,typed-continuations",
"-W=exceptions,function-references,stack-switching",
"-Ccache=n",
]

Expand Down
4 changes: 2 additions & 2 deletions make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WASICC?=../wasi-sdk-22.0/bin/clang
WASICC_FLAGS=--std=c17 -O3 -Wall -Wextra -Werror -DASYNCIFY_DEFAULT_STACK_SIZE=$(ASYNCIFY_DEFAULT_STACK_SIZE)

# Wabt
WABTFX_FLAGS=--enable-multimemory --enable-exception-handling --enable-reference-types --enable-multivalue --enable-bulk-memory --enable-gc --enable-typed-continuations
WABTFX_FLAGS=--enable-multimemory --enable-exception-handling --enable-reference-types --enable-multivalue --enable-bulk-memory --enable-gc --enable-stack-switching

## Wasm optimiser
WASM_OPT?=../binaryenfx/bin/wasm-opt
Expand Down Expand Up @@ -40,7 +40,7 @@ WASMTIMEC=$(WASMTIME) compile
WASMTIMEC_RUN=LD_PRELOAD=$(MIMALLOC) $(WASMTIME) --allow-precompiled -Wwasmfx-stack-size=$(DEFAULT_STACK_SIZE) -Wwasmfx-red-zone-size=0

# WasmFX enabled Wasmtime engine
WASMTIMEFX_FLAGS=-W=exceptions,function-references,typed-continuations
WASMTIMEFX_FLAGS=-W=exceptions,function-references,stack-switching
WASMFXTIMEC=$(WASMTIMEC) $(WASMTIMEFX_FLAGS)
WASMFXTIMEC_RUN=$(WASMTIMEC_RUN) $(WASMTIMEFX_FLAGS)

Expand Down