Merge branch 'master' into feature/spectests-runner

.circleci/config.yml

@@ -129,6 +129,26 @@ jobs:
             - target/release/deps
           key: v8-test-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}
 
+  test-rust-example:
+    docker:
+      - image: circleci/rust:latest
+    <<: *run_with_build_env_vars
+    steps:
+      - checkout
+      - run:
+          name: "Check Wasmer Rust example"
+          command: |
+            git clone https://github.com/wasmerio/wasmer-rust-example
+            rustup default stable
+            rustup target add wasm32-unknown-unknown
+            cd wasmer-rust-example
+            cd wasm-sample-app
+            cargo build --release
+            cd ..
+            sed -i 's/wasmer-runtime.*/wasmer-runtime = \{ path  = "..\/lib\/runtime" \}/g' Cargo.toml
+            cargo run
+            cargo test
+
   test-macos:
     macos:
       xcode: "9.0"
@@ -383,6 +403,12 @@ workflows:
               only:
                 - trying
                 - staging
+      - test-rust-example:
+          filters:
+            branches:
+              only:
+                - trying
+                - staging
       - test-macos:
           filters:
             branches:

CHANGELOG.md

@@ -5,6 +5,9 @@ All PRs to the Wasmer repository must add to this file.
 Blocks of changes will separated by version increments.
 
 ## **[Unreleased]**
+- [#579](https://github.com/wasmerio/wasmer/pull/579) Fix bug in caching with LLVM and Singlepass backends.
+  Add `default-backend-singlepass`, `default-backend-llvm`, and `default-backend-cranelift` features to `wasmer-runtime`
+  to control the `default_compiler()` function (this is a breaking change).  Add `compiler_for_backend` function in `wasmer-runtime`
 - [#561](https://github.com/wasmerio/wasmer/pull/561) Call the `data_finalizer` field on the `Ctx`
 - [#576](https://github.com/wasmerio/wasmer/pull/576) fix `Drop` of uninit `Ctx`
 - [#542](https://github.com/wasmerio/wasmer/pull/542) Add SIMD support to Wasmer (LLVM backend only)

Cargo.toml

@@ -66,15 +66,16 @@ glob = "0.2.11"
 rustc_version = "0.2.3"
 
 [features]
-default = ["fast-tests", "wasi"]
+default = ["fast-tests", "wasi", "backend-cranelift"]
 "loader-kernel" = ["wasmer-kernel-loader"]
 debug = ["wasmer-runtime-core/debug"]
 trace = ["wasmer-runtime-core/trace"]
 extra-debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"]
 # This feature will allow cargo test to run much faster
 fast-tests = []
-"backend-llvm" = ["wasmer-llvm-backend", "wasmer-runtime-core/backend-llvm"]
-"backend-singlepass" = ["wasmer-singlepass-backend", "wasmer-runtime-core/backend-singlepass"]
+backend-cranelift = ["wasmer-runtime-core/backend-cranelift", "wasmer-runtime/cranelift"]
+backend-llvm = ["wasmer-llvm-backend", "wasmer-runtime-core/backend-llvm", "wasmer-runtime/llvm"]
+backend-singlepass = ["wasmer-singlepass-backend", "wasmer-runtime-core/backend-singlepass", "wasmer-runtime/singlepass"]
 wasi = ["wasmer-wasi"]
 # vfs = ["wasmer-runtime-abi"]
 

bors.toml

@@ -3,6 +3,7 @@ status = [
     "ci/circleci: test",
     "ci/circleci: test-macos",
     "ci/circleci: test-stable",
+    "ci/circleci: test-rust-example",
     "continuous-integration/appveyor/branch"
 ]
 required_approvals = 1

lib/clif-backend/src/code.rs

@@ -304,8 +304,15 @@ impl ModuleCodeGenerator<CraneliftFunctionCodeGenerator, Caller, CodegenError>
 
         let trampolines = Arc::new(Trampolines::new(&*self.isa, module_info));
 
+        let signatures_empty = Map::new();
+        let signatures = if self.signatures.is_some() {
+            &self.signatures.as_ref().unwrap()
+        } else {
+            &signatures_empty
+        };
+
         let (func_resolver, backend_cache) = func_resolver_builder.finalize(
-            &self.signatures.as_ref().unwrap(),
+            signatures,
             Arc::clone(&trampolines),
             handler_data.clone(),
         )?;

lib/runtime-core/Cargo.toml

@@ -55,5 +55,6 @@ cc = "1.0"
 debug = []
 trace = ["debug"]
 # backend flags used in conditional compilation of Backend::variants
+"backend-cranelift" = []
 "backend-singlepass" = []
 "backend-llvm" = []

lib/runtime-core/src/backend.rs

@@ -32,6 +32,7 @@ pub enum Backend {
 impl Backend {
     pub fn variants() -> &'static [&'static str] {
         &[
+            #[cfg(feature = "backend-cranelift")]
             "cranelift",
             #[cfg(feature = "backend-singlepass")]
             "singlepass",
@@ -110,14 +111,20 @@ impl Default for MemoryBoundCheckMode {
     }
 }
 
+#[derive(Debug, Default)]
+pub struct Features {
+    pub simd: bool,
+}
+
 /// Configuration data for the compiler
-#[derive(Default)]
+#[derive(Debug, Default)]
 pub struct CompilerConfig {
     /// Symbol information generated from emscripten; used for more detailed debug messages
     pub symbol_map: Option<HashMap<u32, String>>,
     pub memory_bound_check_mode: MemoryBoundCheckMode,
     pub enforce_stack_check: bool,
     pub track_state: bool,
+    pub features: Features,
 }
 
 pub trait Compiler {

lib/runtime-core/src/cache.rs

@@ -20,6 +20,7 @@ pub enum Error {
     Unknown(String),
     InvalidFile(InvalidFileType),
     InvalidatedCache,
+    UnsupportedBackend(Backend),
 }
 
 impl From<io::Error> for Error {

lib/runtime-core/src/lib.rs

@@ -117,8 +117,26 @@ pub fn validate(wasm: &[u8]) -> bool {
 
 /// The same as `validate` but with an Error message on failure
 pub fn validate_and_report_errors(wasm: &[u8]) -> ::std::result::Result<(), String> {
+    validate_and_report_errors_with_features(wasm, Default::default())
+}
+
+/// The same as `validate_and_report_errors` but with a Features.
+pub fn validate_and_report_errors_with_features(
+    wasm: &[u8],
+    features: backend::Features,
+) -> ::std::result::Result<(), String> {
     use wasmparser::WasmDecoder;
-    let mut parser = wasmparser::ValidatingParser::new(wasm, None);
+    let config = wasmparser::ValidatingParserConfig {
+        operator_config: wasmparser::OperatorValidatorConfig {
+            enable_simd: features.simd,
+            enable_bulk_memory: false,
+            enable_multi_value: false,
+            enable_reference_types: false,
+            enable_threads: false,
+        },
+        mutable_global_imports: false,
+    };
+    let mut parser = wasmparser::ValidatingParser::new(wasm, Some(config));
     loop {
         let state = parser.read();
         match *state {

lib/runtime/Cargo.toml

@@ -32,12 +32,15 @@ path = "../llvm-backend"
 optional = true
 
 [features]
-default = ["default-compiler"]
-default-compiler = ["wasmer-clif-backend"]
-cache = ["default-compiler"]
+default = ["cranelift", "default-backend-cranelift"]
+cranelift = ["wasmer-clif-backend"]
+cache = ["cranelift"]
 debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"]
 llvm = ["wasmer-llvm-backend"]
 singlepass = ["wasmer-singlepass-backend"]
+default-backend-singlepass = ["singlepass"]
+default-backend-llvm = ["llvm"]
+default-backend-cranelift = ["cranelift"]
 
 [[bench]]
 name = "nginx"

lib/runtime/src/cache.rs

@@ -103,7 +103,12 @@ impl Cache for FileSystemCache {
 
         let serialized_cache = Artifact::deserialize(&mmap[..])?;
         unsafe {
-            wasmer_runtime_core::load_cache_with(serialized_cache, &super::default_compiler())
+            wasmer_runtime_core::load_cache_with(
+                serialized_cache,
+                super::compiler_for_backend(backend)
+                    .ok_or_else(|| CacheError::UnsupportedBackend(backend))?
+                    .as_ref(),
+            )
         }
     }
 

lib/runtime/src/lib.rs

@@ -76,6 +76,7 @@
 //! [`wasmer-clif-backend`]: https://crates.io/crates/wasmer-clif-backend
 //! [`compile_with`]: fn.compile_with.html
 
+pub use wasmer_runtime_core::backend::Backend;
 pub use wasmer_runtime_core::codegen::{MiddlewareChain, StreamingCompiler};
 pub use wasmer_runtime_core::export::Export;
 pub use wasmer_runtime_core::global::Global;
@@ -179,17 +180,56 @@ pub fn instantiate(wasm: &[u8], import_object: &ImportObject) -> error::Result<I
 
 /// Get a single instance of the default compiler to use.
 pub fn default_compiler() -> impl Compiler {
-    #[cfg(feature = "llvm")]
+    #[cfg(any(
+        all(
+            feature = "default-backend-llvm",
+            any(
+                feature = "default-backend-cranelift",
+                feature = "default-backend-singlepass"
+            )
+        ),
+        all(
+            feature = "default-backend-cranelift",
+            feature = "default-backend-singlepass"
+        )
+    ))]
+    compile_error!(
+        "The `default-backend-X` features are mutually exclusive.  Please choose just one"
+    );
+
+    #[cfg(feature = "default-backend-llvm")]
     use wasmer_llvm_backend::LLVMCompiler as DefaultCompiler;
 
-    #[cfg(feature = "singlepass")]
+    #[cfg(feature = "default-backend-singlepass")]
     use wasmer_singlepass_backend::SinglePassCompiler as DefaultCompiler;
 
-    #[cfg(not(any(feature = "llvm", feature = "singlepass")))]
+    #[cfg(feature = "default-backend-cranelift")]
     use wasmer_clif_backend::CraneliftCompiler as DefaultCompiler;
 
     DefaultCompiler::new()
 }
 
+pub fn compiler_for_backend(backend: Backend) -> Option<Box<dyn Compiler>> {
+    match backend {
+        #[cfg(feature = "cranelift")]
+        Backend::Cranelift => Some(Box::new(wasmer_clif_backend::CraneliftCompiler::new())),
+
+        #[cfg(feature = "singlepass")]
+        Backend::Singlepass => Some(Box::new(
+            wasmer_singlepass_backend::SinglePassCompiler::new(),
+        )),
+
+        #[cfg(feature = "llvm")]
+        Backend::LLVM => Some(Box::new(wasmer_llvm_backend::LLVMCompiler::new())),
+
+        #[cfg(any(
+            not(feature = "llvm"),
+            not(feature = "singlepass"),
+            not(feature = "cranelift")
+        ))]
+        _ => None,
+    }
+}
+
 /// The current version of this crate
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");

src/bin/kwasmd.rs

@@ -55,6 +55,7 @@ fn handle_client(mut stream: UnixStream) {
             memory_bound_check_mode: MemoryBoundCheckMode::Disable,
             enforce_stack_check: true,
             track_state: false,
+            features: Default::default(),
         },
         &SinglePassCompiler::new(),
     )

src/bin/wasmer.rs

@@ -23,7 +23,7 @@ use wasmer_runtime::{
 };
 use wasmer_runtime_core::{
     self,
-    backend::{Backend, Compiler, CompilerConfig, MemoryBoundCheckMode},
+    backend::{Backend, Compiler, CompilerConfig, Features, MemoryBoundCheckMode},
     debug,
     loader::{Instance as LoadedInstance, LocalLoader},
 };
@@ -67,6 +67,17 @@ enum CLIOptions {
     SelfUpdate,
 }
 
+#[derive(Debug, StructOpt)]
+struct PrestandardFeatures {
+    /// Enable support for the SIMD proposal.
+    #[structopt(long = "enable-simd")]
+    simd: bool,
+
+    /// Enable support for all pre-standard proposals.
+    #[structopt(long = "enable-all")]
+    all: bool,
+}
+
 #[derive(Debug, StructOpt)]
 struct Run {
     // Disable the cache
@@ -134,6 +145,9 @@ struct Run {
     #[structopt(long = "cache-key", hidden = true)]
     cache_key: Option<String>,
 
+    #[structopt(flatten)]
+    features: PrestandardFeatures,
+
     /// Application arguments
     #[structopt(name = "--", raw(multiple = "true"))]
     args: Vec<String>,
@@ -185,6 +199,9 @@ struct Validate {
     /// Input file
     #[structopt(parse(from_os_str))]
     path: PathBuf,
+
+    #[structopt(flatten)]
+    features: PrestandardFeatures,
 }
 
 /// Read the contents of a file
@@ -315,10 +332,14 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
         None
     };
 
+    // Don't error on --enable-all for other backends.
+    if options.features.simd && options.backend != Backend::LLVM {
+        return Err("SIMD is only supported in the LLVM backend for now".to_string());
+    }
+
     if !utils::is_wasm_binary(&wasm_binary) {
         let mut features = wabt::Features::new();
-        if options.backend == Backend::LLVM {
-            // SIMD is only supported in the LLVM backend for now
+        if options.features.simd || options.features.all {
             features.enable_simd();
         }
         wasm_binary = wabt::wat2wasm_with_features(wasm_binary, features)
@@ -357,6 +378,9 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
                 memory_bound_check_mode: MemoryBoundCheckMode::Disable,
                 enforce_stack_check: true,
                 track_state,
+                features: Features {
+                    simd: options.features.simd || options.features.all,
+                },
             },
             &*compiler,
         )
@@ -367,6 +391,9 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
             CompilerConfig {
                 symbol_map: em_symbol_map,
                 track_state,
+                features: Features {
+                    simd: options.features.simd || options.features.all,
+                },
                 ..Default::default()
             },
             &*compiler,
@@ -737,7 +764,12 @@ fn validate_wasm(validate: Validate) -> Result<(), String> {
         ));
     }
 
-    wasmer_runtime_core::validate_and_report_errors(&wasm_binary)
+    wasmer_runtime_core::validate_and_report_errors_with_features(
+        &wasm_binary,
+        Features {
+            simd: validate.features.simd || validate.features.all,
+        },
+    )
     .map_err(|err| format!("Validation failed: {}", err))?;
 
     Ok(())