From cb558c4e3a6e2d2ae1d7e405cb9de251129c69e1 Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Tue, 4 Jan 2022 12:04:21 +0100 Subject: [PATCH 1/3] Ensure all examples are tested in both debug and release modes --- Makefile | 1 + examples/early_exit.rs | 5 +++++ examples/features.rs | 5 +++++ examples/hello_world.rs | 5 +++++ examples/memory.rs | 5 +++++ examples/table.rs | 5 +++++ 6 files changed, 26 insertions(+) diff --git a/Makefile b/Makefile index aa2d1b5bc4b..c2e5c06c407 100644 --- a/Makefile +++ b/Makefile @@ -575,6 +575,7 @@ test-wasi: cargo test --release --tests $(compiler_features) -- wasi::wasitests test-examples: + cargo test $(compiler_features) --features wasi --examples cargo test --release $(compiler_features) --features wasi --examples test-integration: diff --git a/examples/early_exit.rs b/examples/early_exit.rs index 42e18b0500d..a3aad1c3074 100644 --- a/examples/early_exit.rs +++ b/examples/early_exit.rs @@ -107,3 +107,8 @@ fn main() -> anyhow::Result<()> { }, } } + +#[test] +fn test_early_exit() -> anyhow::Result<()> { + main() +} diff --git a/examples/features.rs b/examples/features.rs index ef3574d6efd..3812bf8b3d6 100644 --- a/examples/features.rs +++ b/examples/features.rs @@ -54,3 +54,8 @@ fn main() -> anyhow::Result<()> { Ok(()) } + +#[test] +fn test_features() -> anyhow::Result<()> { + main() +} diff --git a/examples/hello_world.rs b/examples/hello_world.rs index c2c34913b6f..6b68395eabc 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -85,3 +85,8 @@ fn main() -> anyhow::Result<()> { Ok(()) } + +#[test] +fn test_hello_world() -> anyhow::Result<()> { + main() +} diff --git a/examples/memory.rs b/examples/memory.rs index 221ec41fb75..738cf05f793 100644 --- a/examples/memory.rs +++ b/examples/memory.rs @@ -137,3 +137,8 @@ fn main() -> anyhow::Result<()> { Ok(()) } + +#[test] +fn test_memory() -> anyhow::Result<()> { + main() +} diff --git a/examples/table.rs b/examples/table.rs index 2ae33badf78..6c8056d5ef3 100644 --- a/examples/table.rs +++ b/examples/table.rs @@ -152,3 +152,8 @@ fn main() -> anyhow::Result<()> { Ok(()) } + +#[test] +fn test_table() -> anyhow::Result<()> { + main() +} From 78eb5bc4c02900863b281e82bac126c85a60af57 Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Tue, 4 Jan 2022 12:15:09 +0100 Subject: [PATCH 2/3] Fix alignment of WASMER_METADATA in the dylib engine rykv requires this to be at least 16-byte aligned. --- lib/compiler-llvm/src/compiler.rs | 1 + lib/engine-dylib/src/artifact.rs | 28 ++++++++++------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/lib/compiler-llvm/src/compiler.rs b/lib/compiler-llvm/src/compiler.rs index f13d47cbb54..ce106898480 100644 --- a/lib/compiler-llvm/src/compiler.rs +++ b/lib/compiler-llvm/src/compiler.rs @@ -172,6 +172,7 @@ impl LLVMCompiler { metadata_gv.set_initializer(&metadata_init); metadata_gv.set_linkage(Linkage::DLLExport); metadata_gv.set_dll_storage_class(DLLStorageClass::Export); + metadata_gv.set_alignment(16); if self.config().enable_verifier { merged_module.verify().unwrap(); diff --git a/lib/engine-dylib/src/artifact.rs b/lib/engine-dylib/src/artifact.rs index 3a8d9a7f911..e1a40cde4fe 100644 --- a/lib/engine-dylib/src/artifact.rs +++ b/lib/engine-dylib/src/artifact.rs @@ -2,7 +2,7 @@ //! to be done as separate steps. use crate::engine::{DylibEngine, DylibEngineInner}; -use crate::serialize::{ArchivedModuleMetadata, ModuleMetadata}; +use crate::serialize::ModuleMetadata; use enumset::EnumSet; use libloading::{Library, Symbol as LibrarySymbol}; use loupe::MemoryUsage; @@ -217,7 +217,7 @@ impl DylibArtifact { let serialized_data = metadata.serialize()?; - let mut metadata_binary = vec![0; 12]; + let mut metadata_binary = vec![0; 16]; let mut writable = &mut metadata_binary[..]; leb128::write::unsigned(&mut writable, serialized_data.len() as u64) .expect("Should write number"); @@ -256,13 +256,8 @@ impl DylibArtifact { function_body_inputs, )?; let mut obj = get_object_for_target(&target_triple).map_err(to_compile_error)?; - emit_data( - &mut obj, - WASMER_METADATA_SYMBOL, - &metadata_binary, - std::mem::align_of::() as u64, - ) - .map_err(to_compile_error)?; + emit_data(&mut obj, WASMER_METADATA_SYMBOL, &metadata_binary, 16) + .map_err(to_compile_error)?; emit_compilation(&mut obj, compilation, &symbol_registry, &target_triple) .map_err(to_compile_error)?; let file = tempfile::Builder::new() @@ -623,27 +618,24 @@ impl DylibArtifact { DeserializeError::CorruptedBinary(format!("Library loading failed: {}", e)) })?; let shared_path: PathBuf = PathBuf::from(path); - // We use 12 + 1, as the length of the module will take 12 bytes - // (we construct it like that in `metadata_length`) and we also want - // to take the first element of the data to construct the slice from - // it. - let symbol: LibrarySymbol<*mut [u8; 12 + 1]> = + // We reserve 16 bytes for the length because the rest of the metadata + // needs to be aligned to 16 bytes. + let symbol: LibrarySymbol<*mut [u8; 16]> = lib.get(WASMER_METADATA_SYMBOL).map_err(|e| { DeserializeError::CorruptedBinary(format!( "The provided object file doesn't seem to be generated by Wasmer: {}", e )) })?; - use std::ops::Deref; use std::slice; - let size = &mut **symbol.deref(); - let mut readable = &size[..]; + let metadata = &**symbol; + let mut readable = &metadata[..]; let metadata_len = leb128::read::unsigned(&mut readable).map_err(|_e| { DeserializeError::CorruptedBinary("Can't read metadata size".to_string()) })?; let metadata_slice: &'static [u8] = - slice::from_raw_parts(&size[12] as *const u8, metadata_len as usize); + slice::from_raw_parts(metadata.as_ptr().add(16), metadata_len as usize); let metadata = ModuleMetadata::deserialize(metadata_slice)?; From fefde7beab11c150d9b9f8f7e89b89bc0ad8f3cf Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Tue, 4 Jan 2022 16:18:32 +0100 Subject: [PATCH 3/3] Disable test for the table example because it is broken --- examples/early_exit.rs | 2 +- examples/table.rs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/early_exit.rs b/examples/early_exit.rs index a3aad1c3074..1476b5aceb9 100644 --- a/examples/early_exit.rs +++ b/examples/early_exit.rs @@ -16,7 +16,7 @@ use anyhow::bail; use std::fmt; -use wasmer::{imports, wat2wasm, Function, Instance, Module, NativeFunc, RuntimeError, Store}; +use wasmer::{imports, wat2wasm, Function, Instance, Module, NativeFunc, Store}; use wasmer_compiler_cranelift::Cranelift; use wasmer_engine_universal::Universal; diff --git a/examples/table.rs b/examples/table.rs index 6c8056d5ef3..036f0c64020 100644 --- a/examples/table.rs +++ b/examples/table.rs @@ -153,6 +153,9 @@ fn main() -> anyhow::Result<()> { Ok(()) } +// This test is currently failing with: +// not implemented: Native function definitions can't be directly called from the host yet +#[cfg(FALSE)] #[test] fn test_table() -> anyhow::Result<()> { main()