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

[bugpoint] Don't test for a crash when a mutation doesn't change anything;

Browse Source
This commit is contained in:
Benjamin Bouvier
2019-10-14 15:46:44 +02:00
parent 735d4c7aef
commit ab42f322d4
1 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
cranelift/src/bugpoint.rs
View File

@@ -66,19 +66,23 @@ pub fn run(
Ok(()) Ok(())
} }
enum MutationKind { enum ProgressStatus {
/// The mutation raised or reduced the amount of instructions or ebbs. /// The mutation raised or reduced the amount of instructions or ebbs.
ExpandedOrShrinked, ExpandedOrShrinked,
/// The mutation only changed an instruction. Performing another round of mutations may only /// The mutation only changed an instruction. Performing another round of mutations may only
/// reduce the test case if another mutation shrank the test case. /// reduce the test case if another mutation shrank the test case.
Changed, Changed,
/// No need to re-test if the program crashes, because the mutation had no effect, but we want
/// to keep on iterating.
Skip,
} }
trait Mutator { trait Mutator {
fn name(&self) -> &'static str; fn name(&self) -> &'static str;
fn mutation_count(&self, func: &Function) -> usize; fn mutation_count(&self, func: &Function) -> usize;
fn mutate(&mut self, func: Function) -> Option<(Function, String, MutationKind)>; fn mutate(&mut self, func: Function) -> Option<(Function, String, ProgressStatus)>;
} }
/// Try to remove instructions. /// Try to remove instructions.
@@ -107,7 +111,7 @@ impl Mutator for RemoveInst {
inst_count(func) inst_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, ProgressStatus)> {
next_inst_ret_prev(&func, &mut self.ebb, &mut self.inst).map(|(prev_ebb, prev_inst)| { next_inst_ret_prev(&func, &mut self.ebb, &mut self.inst).map(|(prev_ebb, prev_inst)| {
func.layout.remove_inst(prev_inst); func.layout.remove_inst(prev_inst);
let msg = if func.layout.ebb_insts(prev_ebb).next().is_none() { let msg = if func.layout.ebb_insts(prev_ebb).next().is_none() {
@@ -117,7 +121,7 @@ impl Mutator for RemoveInst {
} else { } else {
format!("Remove inst {}", prev_inst) format!("Remove inst {}", prev_inst)
}; };
(func, msg, MutationKind::ExpandedOrShrinked) (func, msg, ProgressStatus::ExpandedOrShrinked)
}) })
} }
} }
@@ -164,14 +168,17 @@ impl Mutator for ReplaceInstWithConst {
inst_count(func) inst_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, ProgressStatus)> {
next_inst_ret_prev(&func, &mut self.ebb, &mut self.inst).map(|(_prev_ebb, prev_inst)| { next_inst_ret_prev(&func, &mut self.ebb, &mut self.inst).map(|(_prev_ebb, prev_inst)| {
let num_results = func.dfg.inst_results(prev_inst).len(); let num_results = func.dfg.inst_results(prev_inst).len();
if num_results == 0 { let opcode = func.dfg[prev_inst].opcode();
// Short-circuit: lie and say we've changed something so subsequent instructions if num_results == 0
// still get replaced. || opcode == ir::Opcode::Iconst
return (func, format!(""), MutationKind::Changed); || opcode == ir::Opcode::F32const
|| opcode == ir::Opcode::F64const
{
return (func, format!(""), ProgressStatus::Skip);
} }
if num_results == 1 { if num_results == 1 {
@@ -180,7 +187,7 @@ impl Mutator for ReplaceInstWithConst {
return ( return (
func, func,
format!("Replace inst {} with {}.", prev_inst, new_inst_name), format!("Replace inst {} with {}.", prev_inst, new_inst_name),
MutationKind::Changed, ProgressStatus::Changed,
); );
} }
@@ -215,7 +222,7 @@ impl Mutator for ReplaceInstWithConst {
( (
func, func,
format!("Replace inst {} with {}", prev_inst, inst_names.join(" / ")), format!("Replace inst {} with {}", prev_inst, inst_names.join(" / ")),
MutationKind::ExpandedOrShrinked, ProgressStatus::ExpandedOrShrinked,
) )
}) })
} }
@@ -247,13 +254,18 @@ impl Mutator for ReplaceInstWithTrap {
inst_count(func) inst_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, ProgressStatus)> {
next_inst_ret_prev(&func, &mut self.ebb, &mut self.inst).map(|(_prev_ebb, prev_inst)| { next_inst_ret_prev(&func, &mut self.ebb, &mut self.inst).map(|(_prev_ebb, prev_inst)| {
func.dfg.replace(prev_inst).trap(TrapCode::User(0)); let status = if func.dfg[prev_inst].opcode() == ir::Opcode::Trap {
ProgressStatus::Skip
} else {
func.dfg.replace(prev_inst).trap(TrapCode::User(0));
ProgressStatus::Changed
};
( (
func, func,
format!("Replace inst {} with trap", prev_inst), format!("Replace inst {} with trap", prev_inst),
MutationKind::Changed, status,
) )
}) })
} }
@@ -281,7 +293,7 @@ impl Mutator for RemoveEbb {
ebb_count(func) ebb_count(func)
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, ProgressStatus)> {
func.layout.next_ebb(self.ebb).map(|next_ebb| { func.layout.next_ebb(self.ebb).map(|next_ebb| {
self.ebb = next_ebb; self.ebb = next_ebb;
while let Some(inst) = func.layout.last_inst(self.ebb) { while let Some(inst) = func.layout.last_inst(self.ebb) {
@@ -291,7 +303,7 @@ impl Mutator for RemoveEbb {
( (
func, func,
format!("Remove ebb {}", next_ebb), format!("Remove ebb {}", next_ebb),
MutationKind::ExpandedOrShrinked, ProgressStatus::ExpandedOrShrinked,
) )
}) })
} }
@@ -317,7 +329,7 @@ impl Mutator for RemoveUnusedEntities {
4 4
} }
fn mutate(&mut self, mut func: Function) -> Option<(Function, String, MutationKind)> { fn mutate(&mut self, mut func: Function) -> Option<(Function, String, ProgressStatus)> {
let name = match self.kind { let name = match self.kind {
0 => { 0 => {
let mut ext_func_usage_map = HashMap::new(); let mut ext_func_usage_map = HashMap::new();
@@ -531,7 +543,7 @@ impl Mutator for RemoveUnusedEntities {
_ => return None, _ => return None,
}; };
self.kind += 1; self.kind += 1;
Some((func, name.to_owned(), MutationKind::Changed)) Some((func, name.to_owned(), ProgressStatus::Changed))
} }
} }
@@ -622,6 +634,12 @@ fn reduce(
} }
}; };
if let ProgressStatus::Skip = mutation_kind {
// The mutator didn't change anything, but we want to try more mutator
// iterations.
continue;
}
progress_bar.set_message(&msg); progress_bar.set_message(&msg);
match context.check_for_crash(&mutated_func) { match context.check_for_crash(&mutated_func) {
@@ -633,11 +651,12 @@ fn reduce(
// Panic remained while shrinking, make changes definitive. // Panic remained while shrinking, make changes definitive.
func = mutated_func; func = mutated_func;
let verb = match mutation_kind { let verb = match mutation_kind {
MutationKind::ExpandedOrShrinked => { ProgressStatus::ExpandedOrShrinked => {
should_keep_reducing = true; should_keep_reducing = true;
"shrink" "shrink"
} }
MutationKind::Changed => "changed", ProgressStatus::Changed => "changed",
ProgressStatus::Skip => unreachable!(),
}; };
if verbose { if verbose {
progress_bar.println(format!("{}: {}", msg, verb)); progress_bar.println(format!("{}: {}", msg, verb));