A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
fuzz: Enable winch-aarch64 (#12646)
Saúl Cabrera332b4ce6bf48
diff --git a/crates/fuzzing/src/generators/config.rs b/crates/fuzzing/src/generators/config.rsindex 1663e963c5..cb3544982e 100644--- a/crates/fuzzing/src/generators/config.rs+++ b/crates/fuzzing/src/generators/config.rs@@ -671,7 +671,7 @@ impl WasmtimeConfig {// config features are enabled based on the compiler strategy, and we// don't want to make the same fuzz input DNA generate different test// cases on different targets.- if cfg!(not(target_arch = "x86_64")) {+ if cfg!(not(any(target_arch = "x86_64", target_arch = "aarch64"))) {log::warn!("want to compile with Winch but host architecture does not support it");@@ -700,6 +700,14 @@ impl WasmtimeConfig {config.config.simd_enabled = false;}+ // Account for the proposals that are currently only+ // supported on x64.+ if cfg!(target_arch = "aarch64") {+ config.config.simd_enabled = false;+ config.config.wide_arithmetic_enabled = false;+ config.config.threads_enabled = false;+ }+// Tuning the following engine options is currently not supported// by Winch.self.signals_based_traps = true;diff --git a/crates/fuzzing/src/oracles/diff_wasmtime.rs b/crates/fuzzing/src/oracles/diff_wasmtime.rsindex 0a1cc04d3f..60f7ee6faf 100644--- a/crates/fuzzing/src/oracles/diff_wasmtime.rs+++ b/crates/fuzzing/src/oracles/diff_wasmtime.rs@@ -273,7 +273,7 @@ mod tests {#[test]fn smoke_winch() {- if !cfg!(target_arch = "x86_64") {+ if !cfg!(target_arch = "x86_64") || !cfg!(target_arch = "aarch64") {return;}crate::oracles::engine::smoke_test_engine(|u, config| {diff --git a/crates/fuzzing/src/oracles/engine.rs b/crates/fuzzing/src/oracles/engine.rsindex 57857a6ec6..dacbe7148e 100644--- a/crates/fuzzing/src/oracles/engine.rs+++ b/crates/fuzzing/src/oracles/engine.rs@@ -28,9 +28,9 @@ pub fn build()?),"wasmi" => Box::new(WasmiEngine::new(config)),- #[cfg(target_arch = "x86_64")]+ #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]"winch" => Box::new(WasmtimeEngine::new(u, config, CompilerStrategy::Winch)?),- #[cfg(not(target_arch = "x86_64"))]+ #[cfg(not(any(target_arch = "x86_64", target_arch = "aarch64")))]"winch" => return Ok(None),#[cfg(feature = "fuzz-spec-interpreter")]diff --git a/fuzz/fuzz_targets/differential.rs b/fuzz/fuzz_targets/differential.rsindex 9d02f9b1ae..b949e7794a 100644--- a/fuzz/fuzz_targets/differential.rs+++ b/fuzz/fuzz_targets/differential.rs@@ -271,7 +271,7 @@ impl RuntimeStats {let total = v8 + spec + wasmi + wasmtime + winch + pulley;println!("\twasmi: {:.02}%, spec: {:.02}%, wasmtime: {:.02}%, v8: {:.02}%, \- winch: {:.02}, \+ winch: {:.02}%, \pulley: {:.02}%",wasmi as f64 / total as f64 * 100f64,spec as f64 / total as f64 * 100f64,