Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion crates/fuzzing/src/generators/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crates/fuzzing/src/oracles/diff_wasmtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand Down
4 changes: 2 additions & 2 deletions crates/fuzzing/src/oracles/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/differential.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down