Add options to wasmtime and wasm2obj to pick compilation strategy.

wasmtime-api/src/context.rs

@@ -22,8 +22,13 @@ impl Context {
         }
     }
 
-    pub fn create(flags: settings::Flags, features: Features, debug_info: bool) -> Context {
-        Context::new(create_compiler(flags), features, debug_info)
+    pub fn create(
+        flags: settings::Flags,
+        features: Features,
+        debug_info: bool,
+        strategy: CompilationStrategy,
+    ) -> Context {
+        Context::new(create_compiler(flags, strategy), features, debug_info)
     }
 
     pub(crate) fn debug_info(&self) -> bool {
@@ -52,12 +57,12 @@ impl PartialEq for Context {
     }
 }
 
-pub(crate) fn create_compiler(flags: settings::Flags) -> Compiler {
+pub(crate) fn create_compiler(flags: settings::Flags, strategy: CompilationStrategy) -> Compiler {
     let isa = {
         let isa_builder =
             cranelift_native::builder().expect("host machine is not a supported target");
         isa_builder.finish(flags)
     };
 
-    Compiler::new(isa, CompilationStrategy::Auto)
+    Compiler::new(isa, strategy)
 }

wasmtime-api/src/runtime.rs

@@ -6,7 +6,7 @@ use crate::context::{create_compiler, Context};
 use crate::r#ref::HostRef;
 
 use cranelift_codegen::{ir, settings};
-use wasmtime_jit::Features;
+use wasmtime_jit::{CompilationStrategy, Features};
 
 // Runtime Environment
 
@@ -21,6 +21,7 @@ pub struct Config {
     flags: settings::Flags,
     features: Features,
     debug_info: bool,
+    strategy: CompilationStrategy,
 }
 
 impl Config {
@@ -29,14 +30,21 @@ impl Config {
             debug_info: false,
             features: Default::default(),
             flags: default_flags(),
+            strategy: CompilationStrategy::Auto,
         }
     }
 
-    pub fn new(flags: settings::Flags, features: Features, debug_info: bool) -> Config {
+    pub fn new(
+        flags: settings::Flags,
+        features: Features,
+        debug_info: bool,
+        strategy: CompilationStrategy,
+    ) -> Config {
         Config {
             flags,
             features,
             debug_info,
+            strategy,
         }
     }
 
@@ -51,6 +59,10 @@ impl Config {
     pub(crate) fn features(&self) -> &Features {
         &self.features
     }
+
+    pub(crate) fn strategy(&self) -> CompilationStrategy {
+        self.strategy
+    }
 }
 
 // Engine
@@ -74,7 +86,7 @@ impl Engine {
 
     pub fn create_wasmtime_context(&self) -> wasmtime_jit::Context {
         let flags = self.config.flags().clone();
-        wasmtime_jit::Context::new(Box::new(create_compiler(flags)))
+        wasmtime_jit::Context::new(Box::new(create_compiler(flags, self.config.strategy())))
     }
 }
 
@@ -92,9 +104,10 @@ impl Store {
         let flags = engine.borrow().config().flags().clone();
         let features = engine.borrow().config().features().clone();
         let debug_info = engine.borrow().config().debug_info();
+        let strategy = engine.borrow().config().strategy();
         Store {
             engine,
-            context: Context::create(flags, features, debug_info),
+            context: Context::create(flags, features, debug_info, strategy),
             global_exports: Rc::new(RefCell::new(HashMap::new())),
             signature_cache: HashMap::new(),
         }