Merge branch 'feature/update-clif-small-simd-improvement' into cranel…

…ift-simd # Conflicts: # Cargo.lock # fuzz/Cargo.lock # lib/compiler-cranelift/Cargo.toml # lib/deprecated/runtime-core/Cargo.lock
JesseStutler · May 14, 2021 · a5ba236 · a5ba236
2 parents f6dcfef + 80b4817
commit a5ba236
Show file tree

Hide file tree

Showing 40 changed files with 1,938 additions and 665 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C
 ## **[Unreleased]**
 
 ### Added
+- [#2306](https://github.com/wasmerio/wasmer/pull/2306) Add support for the latest version of the Wasm SIMD proposal to compiler LLVM.
 - [#2296](https://github.com/wasmerio/wasmer/pull/2296) Add support for the bulk memory proposal in compiler Singlepass and compiler LLVM.
 - [#2208](https://github.com/wasmerio/wasmer/pull/2208) Add a new CHANGELOG.md specific to our C API to make it easier for users primarily consuming our C API to keep up to date with changes that affect them.
 - [#2103](https://github.com/wasmerio/wasmer/pull/2103) Add middleware (incl. metering) in the C API.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -148,6 +148,9 @@ test-jit = [
 # that raise signals because that interferes with tarpaulin.
 coverage = []
 
+[profile.dev]
+split-debuginfo = "unpacked"
+
 [[bench]]
 name = "static_and_dynamic_functions"
 harness = false

diff --git a/examples/imports_function_env.rs b/examples/imports_function_env.rs
@@ -118,7 +118,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("New counter value (host): {:?}", counter_value);
     assert_eq!(counter_value, 5);
 
-    println!("New counter value (guest): {:?}", counter_value);
+    println!("New counter value (guest): {:?}", result);
     assert_eq!(result, 5);
 
     Ok(())

diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
@@ -26,7 +26,7 @@ cfg-if = "0.1"
 wat = { version = "1.0", optional = true }
 thiserror = "1.0"
 more-asserts = "0.2"
-target-lexicon = { version = "0.11", default-features = false }
+target-lexicon = { version = "0.12", default-features = false }
 loupe = "0.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
@@ -66,11 +66,6 @@ cranelift = [
     "wasmer-compiler-cranelift",
     "compiler",
 ]
-# Enable Cranelift experimental x64 backend
-cranelift-experimental-x64 = [
-    "cranelift",
-    "wasmer-compiler-cranelift/experimental-x64",
-]
 llvm = [
     "wasmer-compiler-llvm",
     "compiler",

diff --git a/lib/api/src/externals/function.rs b/lib/api/src/externals/function.rs
@@ -480,6 +480,7 @@ impl Function {
         // Call the trampoline.
         if let Err(error) = unsafe {
             wasmer_call_trampoline(
+                &self.store,
                 self.exported.vm_function.vmctx,
                 trampoline,
                 self.exported.vm_function.address,

diff --git a/lib/api/src/module.rs b/lib/api/src/module.rs
@@ -275,7 +275,8 @@ impl Module {
             // of this steps traps, we still need to keep the instance alive
             // as some of the Instance elements may have placed in other
             // instance tables.
-            self.artifact.finish_instantiation(&instance_handle)?;
+            self.artifact
+                .finish_instantiation(&self.store, &instance_handle)?;
 
             Ok(instance_handle)
         }

diff --git a/lib/api/src/native.rs b/lib/api/src/native.rs
@@ -131,6 +131,7 @@ macro_rules! impl_native_traits {
                     };
                     unsafe {
                         wasmer_vm::wasmer_call_trampoline(
+                            &self.store,
                             self.vmctx(),
                             trampoline,
                             self.address(),
@@ -145,8 +146,8 @@ macro_rules! impl_native_traits {
                             // TODO: we can probably remove this copy by doing some clever `transmute`s.
                             // we know it's not overlapping because `using_rets_array` is false
                             std::ptr::copy_nonoverlapping(src_pointer,
-                                                            rets_list,
-                                                            num_rets);
+                                                          rets_list,
+                                                          num_rets);
                         }
                     }
                     Ok(Rets::from_array(rets_list_array))