Merge wasmerio#822

822: Cranelift backend update to fork of clif version 0.43.1 r=bjfish a=bjfish The corresponding update to fork is here (which should merge first): wasmerio/cranelift#4  # Description  # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Brandon Fish <[email protected]> Co-authored-by: Syrus Akbary <[email protected]>
evilj0e · Sep 24, 2019 · 961328e · 961328e
2 parents 42e4871 + 588a77d
commit 961328e
Show file tree

Hide file tree

Showing 14 changed files with 96 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Blocks of changes will separated by version increments.
 
 ## **[Unreleased]**
 
+- [#822](https://github.com/wasmerio/wasmer/pull/822) Update Cranelift fork version to `0.43.1`
 - [#829](https://github.com/wasmerio/wasmer/pull/829) Fix deps on `make bench-*` commands; benchmarks don't compile other backends now
 - [#807](https://github.com/wasmerio/wasmer/pull/807) Implement Send for `Instance`, breaking change on `ImportObject`, remove method `get_namespace` replaced with `with_namespace` and `maybe_with_namespace`
 - [#817](https://github.com/wasmerio/wasmer/pull/817) Add document for tracking features across backends and language integrations, [docs/feature_matrix.md]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml
@@ -10,15 +10,15 @@ readme = "README.md"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.7.0" }
-cranelift-native = { version = "0.31" }
-cranelift-codegen = { version = "0.31" }
-cranelift-entity = { version = "0.31" }
-cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.33" }
-cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.33" }
-target-lexicon = "0.4"
-wasmparser = "0.35.1"
-byteorder = "1.3"
-nix = "0.15"
+cranelift-native = "0.43.1"
+cranelift-codegen = "0.43.1"
+cranelift-entity = "0.43.1"
+cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.43.1" }
+cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.43.1" }
+target-lexicon = "0.8.1"
+wasmparser = "0.37.0"
+byteorder = "1.3.2"
+nix = "0.15.0"
 libc = "0.2.60"
 rayon = "1.1"
 

diff --git a/lib/clif-backend/src/code.rs b/lib/clif-backend/src/code.rs
@@ -1117,7 +1117,18 @@ impl FunctionCodeGenerator<CodegenError> for CraneliftFunctionCodeGenerator {
 
     fn feed_local(&mut self, ty: WpType, n: usize) -> Result<(), CodegenError> {
         let mut next_local = self.next_local;
-        cranelift_wasm::declare_locals(&mut self.builder(), n as u32, ty, &mut next_local)?;
+        let mut builder = FunctionBuilder::new(
+            &mut self.func,
+            &mut self.func_translator.func_ctx,
+            &mut self.position,
+        );
+        cranelift_wasm::declare_locals(
+            &mut builder,
+            n as u32,
+            ty,
+            &mut next_local,
+            &mut self.func_env,
+        )?;
         self.next_local = next_local;
         Ok(())
     }

diff --git a/lib/clif-backend/src/lib.rs b/lib/clif-backend/src/lib.rs
@@ -34,15 +34,15 @@ extern crate serde;
 fn get_isa() -> Box<dyn isa::TargetIsa> {
     let flags = {
         let mut builder = settings::builder();
-        builder.set("opt_level", "best").unwrap();
+        builder.set("opt_level", "speed_and_size").unwrap();
         builder.set("jump_tables_enabled", "false").unwrap();
 
         if cfg!(not(test)) {
             builder.set("enable_verifier", "false").unwrap();
         }
 
         let flags = settings::Flags::new(builder);
-        debug_assert_eq!(flags.opt_level(), settings::OptLevel::Best);
+        debug_assert_eq!(flags.opt_level(), settings::OptLevel::SpeedAndSize);
         flags
     };
     isa::lookup(Triple::host()).unwrap().finish(flags)

diff --git a/lib/clif-backend/src/relocation.rs b/lib/clif-backend/src/relocation.rs
@@ -202,6 +202,11 @@ impl binemit::RelocSink for RelocSink {
             }
         }
     }
+
+    fn reloc_constant(&mut self, _: u32, _: cranelift_codegen::binemit::Reloc, _: u32) {
+        unimplemented!()
+    }
+
     fn reloc_jt(
         &mut self,
         _offset: binemit::CodeOffset,

diff --git a/lib/clif-backend/src/resolver.rs b/lib/clif-backend/src/resolver.rs
@@ -10,7 +10,10 @@ use crate::{
 use rayon::prelude::*;
 
 use byteorder::{ByteOrder, LittleEndian};
-use cranelift_codegen::{ir, isa, Context};
+use cranelift_codegen::{
+    binemit::{Stackmap, StackmapSink},
+    ir, isa, Context,
+};
 use std::{
     mem,
     ptr::{write_unaligned, NonNull},
@@ -58,6 +61,11 @@ pub struct FuncResolverBuilder {
     import_len: usize,
 }
 
+pub struct NoopStackmapSink {}
+impl StackmapSink for NoopStackmapSink {
+    fn add_stackmap(&mut self, _: u32, _: Stackmap) {}
+}
+
 impl FuncResolverBuilder {
     pub fn new_from_backend_cache(
         backend_cache: BackendCache,
@@ -109,12 +117,13 @@ impl FuncResolverBuilder {
                         ctx.func = func.to_owned();
                         let mut reloc_sink = RelocSink::new();
                         let mut local_trap_sink = LocalTrapSink::new();
-
+                        let mut stackmap_sink = NoopStackmapSink {};
                         ctx.compile_and_emit(
                             isa,
                             &mut code_buf,
                             &mut reloc_sink,
                             &mut local_trap_sink,
+                            &mut stackmap_sink,
                         )
                         .map_err(|e| CompileError::InternalError { msg: e.to_string() })?;
                         ctx.clear();

diff --git a/lib/clif-backend/src/trampoline.rs b/lib/clif-backend/src/trampoline.rs
@@ -1,4 +1,5 @@
 use crate::cache::TrampolineCache;
+use crate::resolver::NoopStackmapSink;
 use cranelift_codegen::{
     binemit::{NullTrapSink, Reloc, RelocSink},
     cursor::{Cursor, FuncCursor},
@@ -19,6 +20,11 @@ struct NullRelocSink {}
 impl RelocSink for NullRelocSink {
     fn reloc_ebb(&mut self, _: u32, _: Reloc, _: u32) {}
     fn reloc_external(&mut self, _: u32, _: Reloc, _: &ir::ExternalName, _: i64) {}
+
+    fn reloc_constant(&mut self, _: u32, _: Reloc, _: u32) {
+        unimplemented!()
+    }
+
     fn reloc_jt(&mut self, _: u32, _: Reloc, _: ir::JumpTable) {}
 }
 
@@ -89,12 +95,13 @@ impl Trampolines {
             ctx.func = trampoline_func;
 
             let mut code_buf = Vec::new();
-
+            let mut stackmap_sink = NoopStackmapSink {};
             ctx.compile_and_emit(
                 isa,
                 &mut code_buf,
                 &mut NullRelocSink {},
                 &mut NullTrapSink {},
+                &mut stackmap_sink,
             )
             .expect("unable to compile trampolines");
             ctx.clear();

diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.7.0" }
-wasmparser = "0.35.1"
+wasmparser = "0.37.0"
 smallvec = "0.6"
 goblin = "0.0.24"
 libc = "0.2.60"

diff --git a/lib/runtime-abi/Cargo.toml b/lib/runtime-abi/Cargo.toml
@@ -12,7 +12,7 @@ libc = "0.2.60"
 wasmer-runtime-core = { path = "../runtime-core" }
 failure = "0.1"
 tar = "0.4"
-wasmparser = "0.35.1"
+wasmparser = "0.37.0"
 zstd = "0.4"
 
 # [target.'cfg(unix)'.dependencies.zbox]