chore: improve global testing

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

Author: explodingcamera

crates/tinywasm/src/instance.rs

@@ -42,7 +42,8 @@ impl ModuleInstance {
         let func_addrs = store.add_funcs(module.data.funcs.into(), idx);
         let table_addrs = store.add_tables(module.data.table_types.into(), idx);
         let mem_addrs = store.add_mems(module.data.memory_types.into(), idx);
-        let global_addrs = store.add_globals(module.data.globals.into(), idx);
+
+        let global_addrs = store.add_globals(module.data.globals.into(), &module.data.imports, idx);
         let elem_addrs = store.add_elems(module.data.elements.into(), idx);
         let data_addrs = store.add_datas(module.data.data.into(), idx);
 

crates/tinywasm/src/module.rs

@@ -59,7 +59,9 @@ impl Module {
         // imports: Option<()>,
     ) -> Result<ModuleInstance> {
         let instance = ModuleInstance::instantiate(store, self)?;
-        let _ = instance.start(store)?;
+
+        // TODO: this currently panics if theres no start fn
+        // let _ = instance.start(store)?;
         Ok(instance)
     }
 }

crates/tinywasm/src/store.rs

@@ -5,7 +5,7 @@ use core::{
 
 use alloc::{format, rc::Rc, vec::Vec};
 use tinywasm_types::{
-    Addr, Data, Element, ElementKind, FuncAddr, Function, Global, GlobalType, Instruction, MemAddr, MemoryType,
+    Addr, Data, Element, ElementKind, FuncAddr, Function, Global, GlobalType, Import, Instruction, MemAddr, MemoryType,
     ModuleInstanceAddr, TableAddr, TableType, TypeAddr, ValType,
 };
 
@@ -141,11 +141,39 @@ impl Store {
     }
 
     /// Add globals to the store, returning their addresses in the store
-    pub(crate) fn add_globals(&mut self, globals: Vec<Global>, idx: ModuleInstanceAddr) -> Vec<Addr> {
+    pub(crate) fn add_globals(
+        &mut self,
+        globals: Vec<Global>,
+        imports: &[Import],
+        idx: ModuleInstanceAddr,
+    ) -> Vec<Addr> {
         let global_count = self.data.globals.len();
         let mut global_addrs = Vec::with_capacity(global_count);
+
+        // TODO: initialize imported globals
+        let imported_globals = imports
+            .iter()
+            .filter_map(|import| match &import.kind {
+                tinywasm_types::ImportKind::Global(t) => Some(t),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+
+        for (i, global) in imported_globals.into_iter().enumerate() {
+            log::debug!("imported global: {:?}", global);
+            self.data.globals.push(Rc::new(RefCell::new(GlobalInstance::new(
+                global.clone(),
+                global.ty.default_value().into(),
+                idx,
+            ))));
+            global_addrs.push((i + global_count) as Addr);
+        }
+
+        let global_count = self.data.globals.len();
+        log::debug!("globals: {:?}", globals);
         for (i, global) in globals.into_iter().enumerate() {
             // TODO: initialize globals
+
             use tinywasm_types::ConstInstruction::*;
             let val = match global.init {
                 F32Const(f) => RawWasmValue::from(f),
@@ -168,6 +196,7 @@ impl Store {
 
             global_addrs.push((i + global_count) as Addr);
         }
+        log::debug!("global_addrs: {:?}", global_addrs);
         global_addrs
     }
 

crates/tinywasm/tests/generated/mvp.csv

@@ -1,9 +1,13 @@
 use crate::testsuite::util::*;
-use std::borrow::Cow;
+use std::{
+    borrow::Cow,
+    panic::{catch_unwind, AssertUnwindSafe},
+};
 
 use super::TestSuite;
 use eyre::{eyre, Result};
 use log::{debug, error, info};
+use tinywasm::ModuleInstance;
 use tinywasm_types::TinyWasmModule;
 use wast::{lexer::Lexer, parser::ParseBuffer, Wast};
 
@@ -45,20 +49,33 @@ impl TestSuite {
         let buf = ParseBuffer::new_with_lexer(lexer).expect("failed to create parse buffer");
         let wast_data = wast::parser::parse::<Wast>(&buf).expect("failed to parse wat");
 
-        let mut last_module: Option<TinyWasmModule> = None;
+        let mut store = tinywasm::Store::default();
+        let mut last_module: Option<ModuleInstance> = None;
+
         println!("running {} tests for group: {}", wast_data.directives.len(), group_name);
         for (i, directive) in wast_data.directives.into_iter().enumerate() {
             let span = directive.span();
             use wast::WastDirective::*;
-            // let name = format!("{}-{}", group_name, i);
 
             match directive {
                 Wat(mut module) => {
                     debug!("got wat module");
 
-                    let result = catch_unwind_silent(move || parse_module_bytes(&module.encode().unwrap()))
-                        .map_err(|e| eyre!("failed to parse module: {:?}", try_downcast_panic(e)))
-                        .and_then(|res| res);
+                    // TODO: Reusing store beaks some things
+                    store = tinywasm::Store::default();
+                    let result = catch_unwind(AssertUnwindSafe(|| {
+                        let m = parse_module_bytes(&module.encode().expect("failed to encode module"))
+                            .expect("failed to parse module");
+                        tinywasm::Module::from(m)
+                            .instantiate(&mut store)
+                            .map_err(|e| {
+                                println!("failed to instantiate module: {:?}", e);
+                                e
+                            })
+                            .expect("failed to instantiate module")
+                    }))
+                    .map_err(|e| eyre!("failed to parse module: {:?}", try_downcast_panic(e)))
+                    .and_then(|res| Ok(res));
 
                     match &result {
                         Err(_) => last_module = None,
@@ -132,7 +149,7 @@ impl TestSuite {
                             .collect::<Result<Vec<_>>>()
                             .expect("failed to convert args");
 
-                        exec_fn(module, name, &args).map(|_| ())
+                        exec_fn_instance(module, &mut store, name, &args).map(|_| ())
                     });
 
                     match res {
@@ -189,10 +206,11 @@ impl TestSuite {
                                 e
                             })?;
 
-                        let outcomes = exec_fn(last_module.as_ref(), invoke.name, &args).map_err(|e| {
-                            error!("failed to execute function: {:?}", e);
-                            e
-                        })?;
+                        let outcomes =
+                            exec_fn_instance(last_module.as_ref(), &mut store, invoke.name, &args).map_err(|e| {
+                                error!("failed to execute function: {:?}", e);
+                                e
+                            })?;
 
                         debug!("outcomes: {:?}", outcomes);
 

crates/tinywasm/tests/generated/progress-mvp.svg

@@ -1,4 +1,4 @@
-use std::panic;
+use std::panic::{self, AssertUnwindSafe};
 
 use eyre::{eyre, Result};
 use tinywasm_types::{TinyWasmModule, WasmValue};
@@ -19,6 +19,20 @@ pub fn try_downcast_panic(panic: Box<dyn std::any::Any + Send>) -> String {
     )
 }
 
+pub fn exec_fn_instance(
+    instance: Option<&tinywasm::ModuleInstance>,
+    store: &mut tinywasm::Store,
+    name: &str,
+    args: &[tinywasm_types::WasmValue],
+) -> Result<Vec<tinywasm_types::WasmValue>, tinywasm::Error> {
+    let Some(instance) = instance else {
+        return Err(tinywasm::Error::Other("no instance found".to_string()));
+    };
+
+    let func = instance.exported_func_by_name(store, name)?;
+    func.call(store, args)
+}
+
 pub fn exec_fn(
     module: Option<&TinyWasmModule>,
     name: &str,
@@ -34,10 +48,10 @@ pub fn exec_fn(
     instance.exported_func_by_name(&store, name)?.call(&mut store, args)
 }
 
-pub fn catch_unwind_silent<F: FnOnce() -> R + panic::UnwindSafe, R>(f: F) -> std::thread::Result<R> {
+pub fn catch_unwind_silent<F: FnOnce() -> R, R>(f: F) -> std::thread::Result<R> {
     let prev_hook = panic::take_hook();
     panic::set_hook(Box::new(|_| {}));
-    let result = panic::catch_unwind(f);
+    let result = panic::catch_unwind(AssertUnwindSafe(|| f()));
     panic::set_hook(prev_hook);
     result
 }

crates/tinywasm/tests/testsuite/run.rs

@@ -245,6 +245,12 @@ pub enum ValType {
     ExternRef,
 }
 
+impl ValType {
+    pub fn default_value(&self) -> WasmValue {
+        WasmValue::default_for(*self)
+    }
+}
+
 /// A WebAssembly External Kind.
 ///
 /// See <https://webassembly.github.io/spec/core/syntax/types.html#external-types>