Try #2224:

wasmerio · Apr 1, 2021 · 5472d05 · 5472d05
2 parents 7a6ea72 + 656c8bc
commit 5472d05
Show file tree

Hide file tree

Showing 6 changed files with 233 additions and 181 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
diff --git a/lib/compiler-cranelift/Cargo.toml b/lib/compiler-cranelift/Cargo.toml
@@ -15,9 +15,9 @@ edition = "2018"
 wasmer-compiler = { path = "../compiler", version = "1.0.2", features = ["translator"], default-features = false }
 wasmer-vm = { path = "../vm", version = "1.0.2" }
 wasmer-types = { path = "../types", version = "1.0.2", default-features = false, features = ["std"] }
-cranelift-entity = { version = "0.70", default-features = false }
-cranelift-codegen = { version = "0.70", default-features = false, features = ["x86", "arm64"] }
-cranelift-frontend = { version = "0.70", default-features = false }
+cranelift-entity = { version = "0.72", default-features = false }
+cranelift-codegen = { version = "0.72", default-features = false, features = ["x86", "arm64"] }
+cranelift-frontend = { version = "0.72", default-features = false }
 tracing = "0.1"
 hashbrown = { version = "0.9", optional = true }
 rayon = "1.5"
@@ -29,7 +29,7 @@ loupe = "0.1"
 
 [dev-dependencies]
 target-lexicon = { version = "0.11", default-features = false }
-cranelift-codegen = { version = "0.70", features = ["enable-serde", "all-arch"] }
+cranelift-codegen = { version = "0.72", features = ["enable-serde", "all-arch"] }
 lazy_static = "1.4"
 
 [badges]

diff --git a/lib/compiler-cranelift/src/config.rs b/lib/compiler-cranelift/src/config.rs
@@ -62,12 +62,6 @@ impl Cranelift {
         self
     }
 
-    /// Enable SIMD support.
-    pub fn enable_simd(&mut self, enable: bool) -> &mut Self {
-        self.enable_simd = enable;
-        self
-    }
-
     /// The optimization levels when optimizing the IR.
     pub fn opt_level(&mut self, opt_level: CraneliftOptLevel) -> &mut Self {
         self.opt_level = opt_level;
@@ -153,18 +147,15 @@ impl Cranelift {
             .set("enable_verifier", enable_verifier)
             .expect("should be valid flag");
 
-        let opt_level = if self.enable_simd {
-            "none"
-        } else {
-            match self.opt_level {
-                CraneliftOptLevel::None => "none",
-                CraneliftOptLevel::Speed => "speed",
-                CraneliftOptLevel::SpeedAndSize => "speed_and_size",
-            }
-        };
-
         flags
-            .set("opt_level", opt_level)
+            .set(
+                "opt_level",
+                match self.opt_level {
+                    CraneliftOptLevel::None => "none",
+                    CraneliftOptLevel::Speed => "speed",
+                    CraneliftOptLevel::SpeedAndSize => "speed_and_size",
+                },
+            )
             .expect("should be valid flag");
 
         let enable_simd = if self.enable_simd { "true" } else { "false" };