tests: improve wast tests

Signed-off-by: Henry <[email protected]>

Author: explodingcamera

.cargo/config.toml

@@ -2,5 +2,6 @@
 version-dev="workspaces version --no-git-commit --force tinywasm*"
 dev="run -- -l debug run"
 
-test-mvp="test --package tinywasm --test mvp -- test_mvp --exact --nocapture --ignored"
-generate-charts="test --package tinywasm --test mvp -- generate_charts --ignored"
+test-mvp="test --package tinywasm --test test-mvp"
+test-wast="test --package tinywasm --test test-wast --"
+generate-charts="test --package tinywasm --test generate-charts"

README.md

@@ -18,8 +18,8 @@
 I'm currently working on supporting the WebAssembly MVP (1.0) specification. You can see the current status in the graph below. The goal is to support all the features of the MVP specification and then move on to the next version.
 
 <p align="center">
-  <a href="https://raw.githubusercontent.com/explodingcamera/tinywasm/main/crates/tinywasm/tests/progress-mvp.svg">
-    <img align="center" src="./crates/tinywasm/tests/progress-mvp.svg" width="800" alt="">
+  <a href="https://raw.githubusercontent.com/explodingcamera/tinywasm/main/crates/tinywasm/tests/generated/progress-mvp.svg">
+    <img align="center" src="./crates/tinywasm/tests/generated/progress-mvp.svg" width="800" alt="">
   </a>
 </p>
 

crates/parser/src/conversion.rs

@@ -242,7 +242,7 @@ pub(crate) fn process_const_operators(ops: OperatorsReader) -> Result<ConstInstr
     assert!(ops.len() >= 2);
     assert!(matches!(ops[ops.len() - 1], wasmparser::Operator::End));
 
-    Ok(process_const_operator(ops[ops.len() - 2].clone())?)
+    process_const_operator(ops[ops.len() - 2].clone())
 }
 
 pub fn process_const_operator(op: wasmparser::Operator) -> Result<ConstInstruction> {

crates/tinywasm/Cargo.toml

@@ -31,3 +31,15 @@ default=["std", "parser", "logging"]
 logging=["log", "tinywasm-types/logging", "tinywasm-parser?/logging"]
 std=["tinywasm-parser?/std", "tinywasm-types/std"]
 parser=["tinywasm-parser"]
+
+[[test]]
+name="generate-charts"
+harness=false
+
+[[test]]
+name="test-mvp"
+harness=false
+
+[[test]]
+name="test-wast"
+harness=false

crates/tinywasm/src/runtime/executor/mod.rs

@@ -307,6 +307,11 @@ fn exec_one(
         I32DivU => checked_arithmetic_cast!(checked_div, i32, u32, stack, crate::Trap::DivisionByZero),
         I64DivU => checked_arithmetic_cast!(checked_div, i64, u64, stack, crate::Trap::DivisionByZero),
 
+        I32RemS => checked_arithmetic!(checked_rem, i32, stack, crate::Trap::DivisionByZero),
+        I64RemS => checked_arithmetic!(checked_rem, i64, stack, crate::Trap::DivisionByZero),
+        I32RemU => checked_arithmetic_cast!(checked_rem, i32, u32, stack, crate::Trap::DivisionByZero),
+        I64RemU => checked_arithmetic_cast!(checked_rem, i64, u64, stack, crate::Trap::DivisionByZero),
+
         F32ConvertI32S => conv_1!(i32, f32, stack),
         F32ConvertI64S => conv_1!(i64, f32, stack),
         F64ConvertI32S => conv_1!(i32, f64, stack),

crates/tinywasm/tests/generate-charts.rs

@@ -0,0 +1,16 @@
+mod charts;
+use eyre::Result;
+
+fn main() -> Result<()> {
+    generate_charts()
+}
+
+fn generate_charts() -> Result<()> {
+    // Create a line chart
+    charts::create_progress_chart(
+        std::path::Path::new("./tests/generated/mvp.csv"),
+        std::path::Path::new("./tests/generated/progress-mvp.svg"),
+    )?;
+
+    Ok(())
+}

crates/tinywasm/tests/mvp.csv renamed to crates/tinywasm/tests/generated/mvp.csv

@@ -0,0 +1,22 @@
+mod testsuite;
+use eyre::{eyre, Result};
+use testsuite::TestSuite;
+
+fn main() -> Result<()> {
+    test_mvp()
+}
+
+fn test_mvp() -> Result<()> {
+    let mut test_suite = TestSuite::new();
+
+    test_suite.run(wasm_testsuite::MVP_TESTS)?;
+    test_suite.save_csv("./tests/generated/mvp.csv", env!("CARGO_PKG_VERSION"))?;
+
+    if test_suite.failed() {
+        eprintln!("\n\nfailed one or more tests:\n{:#?}", test_suite);
+        Err(eyre!("failed one or more tests"))
+    } else {
+        println!("\n\npassed all tests:\n{:#?}", test_suite);
+        Ok(())
+    }
+}