diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index d6c74ce..48b2832 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -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 diff --git a/config.py b/config.py index 67f1809..7b04dfe 100644 --- a/config.py +++ b/config.py @@ -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", ] diff --git a/make.config b/make.config index f037497..68131cd 100644 --- a/make.config +++ b/make.config @@ -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 @@ -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)