Merge remote-tracking branch 'origin/next' into feat/c-api

Author: explodingcamera

.cargo/config.toml

@@ -1,12 +1,14 @@
 [alias]
-version-dev="workspaces version --no-git-commit --force tinywasm*"
-test-wasm-1="test --package tinywasm --test test-wasm-1 --release"
-test-wasm-2="test --package tinywasm --test test-wasm-2 --release"
-test-wasm-3="test --package tinywasm --test test-wasm-3 --release"
-test-wast="test --package tinywasm --test test-wast"
-test-wasm-custom="test --package tinywasm --test test-wasm-custom --release"
-cli="run -p tinywasm-cli --bin tinywasm --release --"
-doom="run --manifest-path ./examples/doom/Cargo.toml --release --"
+bench-suite = "bench -p bench --bench suite --"
+cli = "run -p tinywasm-cli --bin tinywasm --release --"
+coremark = "run --release -p bench -- coremark"
+doom = "run --manifest-path ./examples/doom/Cargo.toml --release --"
+test-wasm-1 = "test --package tinywasm --test test-wasm-1 --release"
+test-wasm-2 = "test --package tinywasm --test test-wasm-2 --release"
+test-wasm-3 = "test --package tinywasm --test test-wasm-3 --release"
+test-wasm-custom = "test --package tinywasm --test test-wasm-custom --release"
+test-wast = "test --package tinywasm --test test-wast"
+version-dev = "workspaces version --no-git-commit --force tinywasm*"
 
 [target.x86_64-unknown-linux-gnu]
-rustflags=["-C", "target-cpu=x86-64-v3"]
+rustflags = ["-C", "target-cpu=x86-64-v3"]

.github/workflows/audit.yaml

@@ -29,7 +29,7 @@ jobs:
       security-events: write
     uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@a345acffa64b0eaede81a3d9aae6141214d9c8fc # v2.6.0
     with:
-      runs-on: ubuntu-24.04
+      runs-on: ubuntu-26.04
       upload-sarif: false
       scan-args: --lockfile=./Cargo.lock
 
@@ -41,6 +41,6 @@ jobs:
       security-events: write
     uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@a345acffa64b0eaede81a3d9aae6141214d9c8fc # v2.6.0
     with:
-      runs-on: ubuntu-24.04
+      runs-on: ubuntu-26.04
       fail-on-vuln: false
       scan-args: --lockfile=./Cargo.lock

.github/workflows/release.yaml

@@ -71,7 +71,7 @@ jobs:
           if-no-files-found: error
 
   publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     environment: release
     permissions:
       id-token: write

.github/workflows/test.yaml

@@ -28,78 +28,55 @@ jobs:
       - run: make -C crates/c-api test
       - run: make -C crates/c-api test TINYWASM_C_API_PREFIX=test_ TARGET_DIR=../../target/c-api-prefixed
 
-  build-wasm:
-    name: Build wasm
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          submodules: true
-          persist-credentials: false
-      - name: Install Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@ecabd13d1c56bd1345c230e542e9144811ad706f # v2.0.0
-        with:
-          toolchain: nightly
-          components: rust-src
-          rustflags: ""
-          target: wasm32-unknown-unknown
-      - name: Install Binaryen
-        run: |
-          BINARYEN_VERSION=version_129
-          BINARYEN_DIR="binaryen-${BINARYEN_VERSION}"
-          BINARYEN_ARCHIVE="${BINARYEN_DIR}-x86_64-linux.tar.gz"
-          curl -L "https://github.com/WebAssembly/binaryen/releases/download/${BINARYEN_VERSION}/${BINARYEN_ARCHIVE}" -o "/tmp/${BINARYEN_ARCHIVE}"
-          echo "50b9fa62b9abea752da92ec57e0c555fee578760cd237c40107957715d2976ba  /tmp/${BINARYEN_ARCHIVE}" | sha256sum -c -
-          tar -xzf "/tmp/${BINARYEN_ARCHIVE}" -C /tmp
-          sudo install "/tmp/${BINARYEN_DIR}/bin/wasm-opt" /usr/local/bin/wasm-opt
-      - name: Install WABT
-        run: sudo apt-get install -y wabt
-      - name: Build wasm
-        run: ./examples/rust/build.sh
-      - name: Save artifacts
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: wasm
-          path: examples/rust/out
-
   run-tests:
-    needs: build-wasm
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-26.04
             rust: stable
             name: "Linux x86 (stable)"
-          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - os: ubuntu-26.04
             rust: nightly
             name: "Linux x86 (nightly)"
-          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+          - os: ubuntu-26.04
             rust: nightly
             name: "Linux x86 (nightly tail calls)"
+            target: x86_64-unknown-linux-gnu
             args: "--features tinywasm/nightly-tail-calls"
-          - os: ubuntu-latest
+          - os: ubuntu-26.04
             rust: stable
             name: "Linux x86 (stable, no default features)"
+            target: x86_64-unknown-linux-gnu
             args: "--no-default-features"
-          - os: ubuntu-latest
+          - os: ubuntu-26.04
             rust: nightly
             name: "Linux x86 (nightly, no default features)"
+            target: x86_64-unknown-linux-gnu
             args: "--no-default-features"
-          - os: ubuntu-latest
+          - os: ubuntu-26.04
             rust: nightly
             name: "Linux x86 (nightly tail calls, no default features)"
+            target: x86_64-unknown-linux-gnu
             args: "--no-default-features --features tinywasm/nightly-tail-calls"
-          - os: macos-14
+          - os: macos-26
             rust: stable
             name: "macOS arm64 (Apple M1)"
-          - os: ubuntu-latest
+            target: aarch64-apple-darwin
+          - os: windows-2025
+            rust: stable
+            name: "Windows x86_64"
+            target: x86_64-pc-windows-msvc
+          - os: ubuntu-26.04-arm
             rust: stable
             name: "Linux arm64"
             target: aarch64-unknown-linux-gnu
-          - os: ubuntu-latest
+          - os: ubuntu-26.04-arm
             rust: stable
             name: "Linux armv7"
             target: armv7-unknown-linux-gnueabihf
+            args: "--release"
 
     name: Run tests on ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
@@ -114,28 +91,25 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@ecabd13d1c56bd1345c230e542e9144811ad706f # v2.0.0
         with:
           toolchain: ${{ matrix.rust }}
+          target: ${{ matrix.target }}
           rustflags: ""
+          build-warnings: warn
           components: rustfmt, clippy
-        if: matrix.target == ''
 
-      - name: Load wasm
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: wasm
-          path: examples/rust/out
+      - name: Install armv7 tools
+        run: sudo apt-get update && sudo apt-get install -y gcc-arm-linux-gnueabihf qemu-user
+        if: matrix.target == 'armv7-unknown-linux-gnueabihf'
 
       - name: Run tests
-        run: cargo test --workspace ${{ matrix.args }} && cargo test --workspace ${{ matrix.args }} --examples
-        if: matrix.target == ''
+        run: cargo test --workspace --target ${{ matrix.target }} ${{ matrix.args }}
+        env:
+          CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
+          CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER: qemu-arm -L /usr/arm-linux-gnueabihf
 
-      - name: Run clippy
-        run: cargo clippy --workspace ${{ matrix.args }}
-        if: matrix.target == ''
+      - name: Run examples
+        run: cargo test --workspace --target ${{ matrix.target }} ${{ matrix.args }} --examples
+        if: matrix.target != 'armv7-unknown-linux-gnueabihf'
 
-      - name: Run tests (${{ matrix.target }})
-        uses: houseabsolute/actions-rust-cross@21b0f18dc621b25bfae556ff2791fca4173121e8 # v1.0.8
-        with:
-          command: test
-          target: ${{ matrix.target }}
-          toolchain: ${{ matrix.rust }}
-        if: matrix.target != ''
+      - name: Run clippy
+        run: cargo clippy --workspace --target ${{ matrix.target }} ${{ matrix.args }}
+        if: matrix.target != 'armv7-unknown-linux-gnueabihf'

.gitignore

@@ -1,4 +1,5 @@
 /target
+/crates/bench/guest/target
 notes.md
 examples/*/out/*
 examples/*/target

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added WebAssembly threads support, including atomic wait/notify and cross-store shared memory with `MemoryShared`.
 - Added new `Memory::data` and `Memory::data_mut` methods for direct access to linear memory.
 - Added several internal methods to support a future c-api crate
 

CONTRIBUTING.md

@@ -23,7 +23,7 @@ cargo fmt --all -- --check
 cargo clippy --workspace
 cargo test --workspace
 cargo run --example basic
-cargo bench --bench tinywasm
+cargo bench-suite
 ```
 
 WebAssembly test commands:
@@ -38,18 +38,11 @@ cargo test-wast crates/tinywasm/tests/wasm-custom/table-basics.wast
 
 Set `RUST_LOG=debug` when running `cargo test-wast` to see executor debug logs.
 
-The `rust` example requires the `wasm32-unknown-unknown` target, the `rust-src` component, [Binaryen](https://github.com/WebAssembly/binaryen), and [WABT](https://github.com/WebAssembly/wabt):
-
-```bash
-./examples/rust/build.sh
-cargo run --example rust -- hello
-```
-
 You can use [samply](https://github.com/mstange/samply/) for profiling:
 
 ```bash
 cargo install --locked samply
-samply record -- cargo run --profile samply --example rust -- tinywasm
+samply record -- cargo bench-suite execute/nested_tinywasm
 ```
 
 Keep changes focused and external dependencies to a minimum. Update public documentation, the README, and the unreleased changelog when applicable.

Cargo.lock

@@ -45,32 +45,9 @@ unused_dependencies = "allow"  # false-positive on libm
 [workspace.lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ["cfg(rust_analyzer)"] }
 
-[[example]]
-name = "rust"
-test = false
-
-[[bench]]
-harness = false
-name = "argon2id"
-
-[[bench]]
-harness = false
-name = "fibonacci"
-
-[[bench]]
-harness = false
-name = "tinywasm"
-
-[[bench]]
-harness = false
-name = "tinywasm_modes"
-
 [dev-dependencies]
 anyhow.workspace = true
-criterion.workspace = true
-pretty_env_logger.workspace = true
-tinywasm = { path = "crates/tinywasm", features = ["state"] }
-tinywasm-parser.workspace = true
+tinywasm = { path = "crates/tinywasm", features = ["send", "state"] }
 tinywasm-wasi.workspace = true
 wat.workspace = true
 

Cargo.toml

@@ -58,7 +58,7 @@ See its [README](./crates/c-api/README.md) for installation and usage.
 ## Cargo Features
 
 - **`full`:** Enables `archive`, `debug`, `parallel-parser`, `parser`, `state`, and `validate`. Enabled by default.
-- **`std`:** Enables `std` and parsing from files and streams. Enabled by default.
+- **`std`:** Enables parsing from files and streams, shared memory handles, and blocking atomic wait/notify across stores. Enabled by default.
 - **`parser`:** Enables `tinywasm-parser` and top-level parse helpers. Enabled by default.
 - **`validate`:** Enables WebAssembly validation while parsing. Enabled by default and configurable through [`ParserOptions`](https://docs.rs/tinywasm/latest/tinywasm/parser/struct.ParserOptions.html).
 - **`parallel-parser`:** Parallelizes function parsing when `std` is enabled. Enabled by default.
@@ -116,14 +116,18 @@ TinyWasm generally implements non-JavaScript core proposals at [phase 4](https:/
 | [**Garbage Collection**](https://github.com/WebAssembly/gc)                                                      | 🟢     | 0.11.0             |
 | [**Exception Handling**](https://github.com/WebAssembly/exception-handling)                                      | 🟢     | 0.11.0             |
 | [**Compact Import Section**](https://github.com/WebAssembly/compact-import-section)                              | 🟢     | 0.11.0             |
+| [**Threads**](https://github.com/WebAssembly/threads)                                                            | 🚧     | next               |
 | [**Stack Switching**](https://github.com/WebAssembly/stack-switching)                                            | 🌑     | -                  |
-| [**Threads**](https://github.com/WebAssembly/threads)                                                            | 🌑     | -                  |
 
 **Legend**\
 🌑 -- not available\
 🚧 -- in development/partially supported\
 🟢 -- fully supported
 
+## Benchmarks
+
+Tinywasm includes a small benchmark suite at [`crates/bench`](crates/bench) that runs a set of WebAssembly modules and measures execution time. For comparisons with other runtimes, check out the great [wasmi-benchmarks](https://github.com/wasmi-labs/wasmi-benchmarks) repository.
+
 ## See Also
 
 If you're looking for a WebAssembly runtime with JIT compilation, better performance or other advanced features, check out these other runtimes: