Update Wasmi specific Wast testsuite (#1685)

* update Wasmi specific testsuite

* update Wasmi specific Wast testsuite

* update wasmi-wast submodule

Author: Robbepop

crates/wast/src/lib.rs

@@ -136,6 +136,33 @@ impl WastRunner {
         Ok(())
     }
 
+    /// Sets up the Wasmi specific testsuite module for `self`.
+    pub fn register_wasmitest(&mut self) -> Result<(), wasmi::Error> {
+        self.linker.func_wrap("wasmitest", "identity-0", || {})?;
+        self.linker
+            .func_wrap("wasmitest", "identity-1", |v0: i64| -> i64 { v0 })?;
+        self.linker.func_wrap(
+            "wasmitest",
+            "identity-2",
+            |v0: i64, v1: i64| -> (i64, i64) { (v0, v1) },
+        )?;
+        self.linker
+            .func_wrap("wasmitest", "offset-1", |v0: i64| -> i64 { v0 + 1 })?;
+        self.linker
+            .func_wrap("wasmitest", "offset-2", |v0: i64, v1: i64| -> (i64, i64) {
+                (v0 + 1, v1 + 2)
+            })?;
+        self.linker
+            .func_wrap("wasmitest", "sum-3", |v0: i64, v1: i64, v2: i64| -> i64 {
+                v0.wrapping_add(v1).wrapping_add(v2)
+            })?;
+        self.linker
+            .func_wrap("wasmitest", "iota-3", |v0: i64| -> (i64, i64, i64) {
+                (v0.wrapping_add(1), v0.wrapping_add(2), v0.wrapping_add(3))
+            })?;
+        Ok(())
+    }
+
     /// Converts the [`WastArgCore`][`wast::core::WastArgCore`] into a [`wasmi::Val`] if possible.
     fn value(&mut self, value: &WastArgCore) -> Option<Val> {
         use wasmi::{ExternRef, Func, Ref};

crates/wast/tests/mod.rs

@@ -7,6 +7,9 @@ fn process_wast(path: &'static str, wast: &'static str, config: Config) {
     if let Err(error) = runner.register_spectest() {
         panic!("{path}: failed to setup Wasm spectest module: {error}");
     }
+    if let Err(error) = runner.register_wasmitest() {
+        panic!("{path}: failed to setup Wasmi test module: {error:?}");
+    }
     if let Err(error) = runner.process_directives(path, wast) {
         panic!("{error:#}")
     }
@@ -182,6 +185,7 @@ macro_rules! foreach_test {
             fn spec_wide_arithmetic("spec/proposals/wide-arithmetic/wide-arithmetic");
 
             // Wasmi specific test cases and regression tests.
+            fn wasmi_fibonacci("wasmi/tests/fibonacci");
             fn wasmi_wide_arithmetic("wasmi/tests/wide-arithmetic");
             fn wasmi_replace_result("wasmi/tests/replace-result");
             fn wasmi_local_tee("wasmi/tests/local-tee");
@@ -192,6 +196,10 @@ macro_rules! foreach_test {
             fn wasmi_many_inout("wasmi/tests/many-inout");
             fn wasmi_copy_span("wasmi/tests/copy-span");
             fn wasmi_audit("wasmi/tests/audit");
+            fn wasmi_call("wasmi/tests/call");
+            fn wasmi_call_indirect("wasmi/tests/call-indirect");
+            fn wasmi_return_call("wasmi/tests/return-call");
+            fn wasmi_return_call_indirect("wasmi/tests/return-call-indirect");
             // Wasmi: binary operators
             fn wasmi_i32_add("wasmi/tests/op/i32-add");
             fn wasmi_i32_sub("wasmi/tests/op/i32-sub");