T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuzz: log Wasm contents to file when log::debug is enabled

Browse Source 
Previously, the WAT was printed as a log message. This change
standardizes all of the oracles to use `log_wasm`, which emits a `.wasm`
and `.wat` file for each case if `log::debug` is enabled and prints a
message with the names of the created files. Closes #3140.
This commit is contained in:
Andrew Brown
2021-08-10 12:03:21 -07:00
parent cbabcacb0f
commit 76a93dc112
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/fuzzing/src/oracles.rs
View File

@@ -621,6 +621,7 @@ impl wasm_smith::Config for SingleFunctionModuleConfig {
/// should be rare if modules are generated appropriately. /// should be rare if modules are generated appropriately.
pub fn differential_wasmi_execution(wasm: &[u8], config: &crate::generators::Config) -> Option<()> { pub fn differential_wasmi_execution(wasm: &[u8], config: &crate::generators::Config) -> Option<()> {
crate::init_fuzzing(); crate::init_fuzzing();
log_wasm(wasm);
// Instantiate wasmi module and instance. // Instantiate wasmi module and instance.
let wasmi_module = wasmi::Module::from_buffer(&wasm[..]).ok()?; let wasmi_module = wasmi::Module::from_buffer(&wasm[..]).ok()?;
@@ -696,7 +697,6 @@ pub fn differential_wasmi_execution(wasm: &[u8], config: &crate::generators::Con
(&Ok(None), &Ok(None)) => {} (&Ok(None), &Ok(None)) => {}
(&Err(_), &Err(_)) => {} (&Err(_), &Err(_)) => {}
_ => { _ => {
show_wat(wasm);
panic!( panic!(
"Values do not match: wasmi returned {:?}; wasmtime returned {:?}", "Values do not match: wasmi returned {:?}; wasmtime returned {:?}",
wasmi_val, wasmtime_val wasmi_val, wasmtime_val
@@ -705,7 +705,6 @@ pub fn differential_wasmi_execution(wasm: &[u8], config: &crate::generators::Con
} }
if wasmi_mem.current_size().0 != wasmtime_mem.size(&wasmtime_store) as usize { if wasmi_mem.current_size().0 != wasmtime_mem.size(&wasmtime_store) as usize {
show_wat(wasm);
panic!("resulting memories are not the same size"); panic!("resulting memories are not the same size");
} }
@@ -726,7 +725,6 @@ pub fn differential_wasmi_execution(wasm: &[u8], config: &crate::generators::Con
} }
if &wasmi_buf[..] != &wasmtime_slice[..] { if &wasmi_buf[..] != &wasmtime_slice[..] {
show_wat(wasm);
panic!("memory contents are not equal"); panic!("memory contents are not equal");
} }
@@ -739,8 +737,8 @@ pub fn differential_wasmi_execution(wasm: &[u8], config: &crate::generators::Con
/// May return `None` if we early-out due to a rejected fuzz config. /// May return `None` if we early-out due to a rejected fuzz config.
pub fn differential_spec_execution(wasm: &[u8], config: &crate::generators::Config) -> Option<()> { pub fn differential_spec_execution(wasm: &[u8], config: &crate::generators::Config) -> Option<()> {
crate::init_fuzzing(); crate::init_fuzzing();
debug!("WAT: {}", wasm2wat(wasm));
debug!("config: {:#?}", config); debug!("config: {:#?}", config);
log_wasm(wasm);
// Run the spec interpreter first, then Wasmtime. The order is important // Run the spec interpreter first, then Wasmtime. The order is important
// because both sides (OCaml runtime and Wasmtime) register signal handlers; // because both sides (OCaml runtime and Wasmtime) register signal handlers;
@@ -778,7 +776,6 @@ pub fn differential_spec_execution(wasm: &[u8], config: &crate::generators::Conf
.zip(wasmtime_vals) .zip(wasmtime_vals)
.all(|(s, w)| matches(s, w)); .all(|(s, w)| matches(s, w));
if !all_match { if !all_match {
show_wat(wasm);
panic!( panic!(
"Values do not match: spec returned {:?}; wasmtime returned {:?}", "Values do not match: spec returned {:?}; wasmtime returned {:?}",
spec_vals, wasmtime_vals spec_vals, wasmtime_vals
@@ -801,7 +798,6 @@ pub fn differential_spec_execution(wasm: &[u8], config: &crate::generators::Conf
} }
// If only one side fails, fail the fuzz the test. // If only one side fails, fail the fuzz the test.
_ => { _ => {
show_wat(wasm);
panic!( panic!(
"Only one side failed: spec returned {:?}; wasmtime returned {:?}", "Only one side failed: spec returned {:?}; wasmtime returned {:?}",
&spec_vals, &wasmtime_vals &spec_vals, &wasmtime_vals
@@ -846,19 +842,6 @@ fn run_in_wasmtime(
wasmtime_vals.map(|v| v.to_vec()) wasmtime_vals.map(|v| v.to_vec())
} }
/// Print the Wasm as WAT on `stderr`.
fn show_wat(wasm: &[u8]) {
eprintln!("wat:\n{}\n", wasm2wat(wasm));
}
/// Convert the Wasm module to a `String`; an error
fn wasm2wat(wasm: &[u8]) -> String {
match wasmprinter::print_bytes(&wasm[..]) {
Ok(s) => s,
Err(e) => format!("wasm2wat failed: {}", e),
}
}
// Introspect wasmtime module to find the name of the first exported function. // Introspect wasmtime module to find the name of the first exported function.
fn first_exported_function(module: &wasmtime::Module) -> Option<String> { fn first_exported_function(module: &wasmtime::Module) -> Option<String> {
for e in module.exports() { for e in module.exports() {