Update Wasmi CLI arguments and default config

crates/cli/src/args.rs

@@ -82,6 +82,10 @@ pub struct Args {
     #[clap(long = "invoke", value_name = "FUNCTION")]
     invoke: Option<String>,
 
+    /// Enable lazy Wasm compilation.
+    #[clap(long = "lazy")]
+    lazy: bool,
+
     /// Enable execution fiel metering with N units of fuel.
     ///
     /// The execution will trap after running out of the N units of fuel.
@@ -114,6 +118,11 @@ impl Args {
         self.fuel
     }
 
+    /// Returns `true` if lazy Wasm compilation is enabled.
+    pub fn lazy(&self) -> bool {
+        self.lazy
+    }
+
     /// Pre-opens all directories given in `--dir` and returns them for use by the [`WasiCtx`].
     ///
     /// # Errors

crates/cli/src/context.rs

@@ -1,7 +1,7 @@
 use crate::utils;
 use anyhow::{anyhow, Error};
 use std::path::Path;
-use wasmi::{Config, ExternType, Func, FuncType, Instance, Module, Store};
+use wasmi::{CompilationMode, Config, ExternType, Func, FuncType, Instance, Module, Store};
 use wasmi_wasi::WasiCtx;
 
 /// The [`Context`] for the `wasmi` CLI application.
@@ -23,11 +23,23 @@ impl Context {
     ///
     /// - If parsing, validating, compiling or instantiating the Wasm module failed.
     /// - If adding WASI defintions to the linker failed.
-    pub fn new(wasm_file: &Path, wasi_ctx: WasiCtx, fuel: Option<u64>) -> Result<Self, Error> {
+    pub fn new(
+        wasm_file: &Path,
+        wasi_ctx: WasiCtx,
+        fuel: Option<u64>,
+        lazy: bool,
+    ) -> Result<Self, Error> {
         let mut config = Config::default();
+        config.wasm_tail_call(true);
+        config.wasm_extended_const(true);
         if fuel.is_some() {
             config.consume_fuel(true);
         }
+        let mode = match lazy {
+            true => CompilationMode::Lazy,
+            false => CompilationMode::Eager,
+        };
+        config.compilation_mode(mode);
         let engine = wasmi::Engine::new(&config);
         let wasm_bytes = utils::read_wasm_or_wat(wasm_file)?;
         let module = wasmi::Module::new(&engine, &mut &wasm_bytes[..]).map_err(|error| {

crates/cli/src/main.rs

@@ -20,7 +20,7 @@ fn main() -> Result<()> {
     let args = Args::parse();
     let wasm_file = args.wasm_file();
     let wasi_ctx = args.wasi_context()?;
-    let mut ctx = Context::new(wasm_file, wasi_ctx, args.fuel())?;
+    let mut ctx = Context::new(wasm_file, wasi_ctx, args.fuel(), args.lazy())?;
     let (func_name, func) = get_invoked_func(&args, &ctx)?;
     let ty = func.ty(ctx.store());
     let func_args = utils::decode_func_args(&ty, args.func_args())?;