explodingcamera · explodingcamera · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -5,5 +5,5 @@ test-mvp="test --package tinywasm --test test-mvp --release -- --enable "
 test-2="test --package tinywasm --test test-two --release -- --enable "
 test-wast="test --package tinywasm --test test-wast -- --enable "
 test-wast-release="test --package tinywasm --test test-wast --release -- --enable "
-generate-charts="test --package tinywasm --test generate-charts -- --enable "
+generate-charts="run --package scripts --bin generate-charts --release"
 benchmark="bench -p benchmarks --bench"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -7,7 +7,25 @@ on:
     branches: [main]
 
 jobs:
+  build-wasm:
+    name: Build wasm
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install Rust toolchain & Binaryen
+        run: rustup update && rustup target add wasm32-unknown-unknown && sudo apt-get install -y binaryen wabt
+      - name: Build wasm
+        run: ./examples/rust/build.sh
+      - name: Save artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: wasm
+          path: examples/rust/out
+
   test-std:
+    needs: build-wasm
     name: Test with default features on stable Rust
     runs-on: ubuntu-latest
 
@@ -16,15 +34,14 @@ jobs:
         with:
           submodules: true
 
-      - name: Install stable Rust toolchain & Binaryen
-        run: |
-          rustup update stable
-          rustup update nightly
-          rustup target add wasm32-unknown-unknown
-          sudo apt-get install -y binaryen wabt
+      - name: Install latest stable Rust toolchain
+        run: rustup update stable
 
-      - name: Build wasm
-        run: ./examples/rust/build.sh
+      - name: Load wasm
+        uses: actions/download-artifact@v4
+        with:
+          name: wasm
+          path: examples/rust/out
 
       - name: Build (stable)
         run: cargo +stable build --workspace
@@ -36,6 +53,7 @@ jobs:
         run: cargo +stable test-mvp
 
   test-no-std:
+    needs: build-wasm
     name: Test without default features on nightly Rust
     runs-on: ubuntu-latest
 
@@ -44,14 +62,14 @@ jobs:
         with:
           submodules: true
 
-      - name: Install nightly Rust toolchain & Binaryen
-        run: |
-          rustup update nightly
-          rustup target add wasm32-unknown-unknown
-          sudo apt-get install -y binaryen wabt
+      - name: Install latest nightly Rust toolchain
+        run: rustup update nightly
 
-      - name: Build wasm
-        run: ./examples/rust/build.sh
+      - name: Load wasm
+        uses: actions/download-artifact@v4
+        with:
+          name: wasm
+          path: examples/rust/out
 
       - name: Build (nightly, no default features)
         run: cargo +nightly build --workspace --no-default-features
@@ -61,3 +79,58 @@ jobs:
 
       - name: Run MVP testsuite (nightly)
         run: cargo +nightly test-mvp
+
+  test-m1:
+    needs: build-wasm
+    name: Test on arm64 (Apple M1)
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install stable Rust toolchain
+        run: rustup update stable
+
+      - name: Load wasm
+        uses: actions/download-artifact@v4
+        with:
+          name: wasm
+          path: examples/rust/out
+
+      - name: Build (stable)
+        run: cargo +stable build
+      - name: Run tests (stable)
+        run: cargo +stable test
+      - name: Run MVP testsuite
+        run: cargo +stable test-mvp
+
+  test-armv7:
+    needs: build-wasm
+    name: Test on armv7 (32-Bit Raspberry Pi)
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Load wasm
+        uses: actions/download-artifact@v4
+        with:
+          name: wasm
+          path: examples/rust/out
+
+      - name: Run all tests (for the default workspace members)
+        uses: houseabsolute/[email protected]
+        with:
+          command: test
+          target: armv7-unknown-linux-gnueabihf
+          toolchain: nightly
+
+      - name: Run MVP testsuite
+        uses: houseabsolute/[email protected]
+        with:
+          command: test
+          args: "-p tinywasm --test test-mvp --release -- --enable"
+          target: armv7-unknown-linux-gnueabihf
+          toolchain: nightly
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Improved documentation and added more tests
+- Tests can now be run on more targets
+- Nightly version has been updated to fix broken builds in some cases
 - Enhance support for scripted language bindings by making Imports and Module cloneable
+- Add `aarch64-apple-darwin` and `armv7-unknown-linux-gnueabihf` targets to CI
 
 ### Removed
 
@@ -75,7 +78,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 **All Commits**: https://github.com/explodingcamera/tinywasm/compare/v0.1.0...v0.2.0
 
-- Support for br_table
+- Support for `br_table`
 - Memory trapping improvements
 - Implicit function label scopes
 - else Instructions

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members=["crates/*"]
+members=["crates/*", "benchmarks", "scripts"]
 default-members=[".", "crates/tinywasm", "crates/types", "crates/parser"]
 resolver="2"
 
@@ -40,4 +40,4 @@ debug=true
 
 [patch.crates-io]
 # https://github.com/servo/pathfinder/pull/548 & https://github.com/servo/pathfinder/issues/558
-pathfinder_simd={git="https://github.com/explodingcamera/pathfinder", rev="4ada8c2484f6bdd2a57546f055000c2df8e65eab"}
+pathfinder_simd={git="https://github.com/servo/pathfinder", rev="30419d07660dc11a21e42ef4a7fa329600cff152"}
diff --git a/crates/benchmarks/Cargo.toml → benchmarks/Cargo.toml b/crates/benchmarks/Cargo.toml → benchmarks/Cargo.toml
@@ -5,7 +5,7 @@ edition.workspace=true
 
 [dependencies]
 criterion={version="0.5", features=["html_reports"]}
-tinywasm={path="../../crates/tinywasm", features=["unsafe"]}
+tinywasm={path="../crates/tinywasm", features=["unsafe"]}
 wat={version="1.0"}
 wasmi={version="0.31", features=["std"]}
 wasmer={version="4.2", features=["cranelift", "singlepass"]}

diff --git a/crates/benchmarks/benches/argon2id.rs → benchmarks/benches/argon2id.rs b/crates/benchmarks/benches/argon2id.rs → benchmarks/benches/argon2id.rs
@@ -36,7 +36,7 @@ fn run_native(params: (i32, i32, i32)) {
     run_native(params.0, params.1, params.2)
 }
 
-const ARGON2ID: &[u8] = include_bytes!("../../../examples/rust/out/argon2id.wasm");
+const ARGON2ID: &[u8] = include_bytes!("../../examples/rust/out/argon2id.wasm");
 fn criterion_benchmark(c: &mut Criterion) {
     let twasm = wasm_to_twasm(ARGON2ID);
     let params = (1000, 2, 1);

diff --git a/crates/benchmarks/benches/fibonacci.rs → benchmarks/benches/fibonacci.rs b/crates/benchmarks/benches/fibonacci.rs → benchmarks/benches/fibonacci.rs
@@ -45,7 +45,7 @@ fn run_native_recursive(n: i32) -> i32 {
     run_native_recursive(n - 1) + run_native_recursive(n - 2)
 }
 
-const FIBONACCI: &[u8] = include_bytes!("../../../examples/rust/out/fibonacci.wasm");
+const FIBONACCI: &[u8] = include_bytes!("../../examples/rust/out/fibonacci.wasm");
 fn criterion_benchmark(c: &mut Criterion) {
     let twasm = wasm_to_twasm(FIBONACCI);
 

diff --git a/crates/benchmarks/benches/selfhosted.rs → benchmarks/benches/selfhosted.rs b/crates/benchmarks/benches/selfhosted.rs → benchmarks/benches/selfhosted.rs
@@ -4,7 +4,7 @@ use criterion::{criterion_group, criterion_main, Criterion};
 
 fn run_native() {
     use tinywasm::*;
-    let module = tinywasm::Module::parse_bytes(include_bytes!("../../../examples/rust/out/print.wasm")).expect("parse");
+    let module = tinywasm::Module::parse_bytes(include_bytes!("../../examples/rust/out/print.wasm")).expect("parse");
     let mut store = Store::default();
     let mut imports = Imports::default();
     imports.define("env", "printi32", Extern::typed_func(|_: FuncContext<'_>, _: i32| Ok(()))).expect("define");
@@ -51,7 +51,7 @@ fn run_wasmer(wasm: &[u8]) {
     hello.call(&mut store, &[]).expect("call");
 }
 
-const TINYWASM: &[u8] = include_bytes!("../../../examples/rust/out/tinywasm.wasm");
+const TINYWASM: &[u8] = include_bytes!("../../examples/rust/out/tinywasm.wasm");
 fn criterion_benchmark(c: &mut Criterion) {
     {
         let mut group = c.benchmark_group("selfhosted-parse");

diff --git a/crates/benchmarks/benches/util/mod.rs → benchmarks/benches/util/mod.rs b/crates/benchmarks/benches/util/mod.rs → benchmarks/benches/util/mod.rs
@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use tinywasm::{self, parser::Parser, types::TinyWasmModule};
+use tinywasm::{parser::Parser, types::TinyWasmModule};
 
 pub fn parse_wasm(wasm: &[u8]) -> TinyWasmModule {
     let parser = Parser::new();

diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
@@ -17,4 +17,3 @@ tinywasm-types={version="0.5.0", path="../types", default-features=false}
 default=["std", "logging"]
 logging=["log"]
 std=["tinywasm-types/std"]
-
diff --git a/crates/tinywasm/Cargo.toml b/crates/tinywasm/Cargo.toml
@@ -25,7 +25,6 @@ owo-colors={version="4.0"}
 eyre={version="0.6"}
 serde_json={version="1.0"}
 serde={version="1.0", features=["derive"]}
-plotters={version="0.3"}
 pretty_env_logger="0.5"
 
 [features]
@@ -36,10 +35,6 @@ parser=["tinywasm-parser"]
 unsafe=["tinywasm-types/unsafe"]
 archive=["tinywasm-types/archive"]
 
-[[test]]
-name="generate-charts"
-harness=false
-
 [[test]]
 name="test-mvp"
 harness=false

diff --git a/crates/tinywasm/src/runtime/stack/block_stack.rs b/crates/tinywasm/src/runtime/stack/block_stack.rs
@@ -3,7 +3,7 @@ use alloc::vec::Vec;
 use tinywasm_types::BlockArgs;
 
 #[derive(Debug, Clone, Default)]
-pub(crate) struct BlockStack(Vec<BlockFrame>); // TODO: maybe Box<[LabelFrame]> by analyzing the lable count when parsing the module?
+pub(crate) struct BlockStack(Vec<BlockFrame>); // TODO: maybe Box<[LabelFrame]> by analyzing the label count when parsing the module?
 
 impl BlockStack {
     #[inline]

diff --git a/crates/tinywasm/tests/charts/mod.rs b/crates/tinywasm/tests/charts/mod.rs
diff --git a/crates/tinywasm/tests/generate-charts.rs b/crates/tinywasm/tests/generate-charts.rs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@ tinywasm-types={version="0.5.0", path="../types", default-features=false}
		default=["std", "logging"]
		logging=["log"]
		std=["tinywasm-types/std"]