change feedback order

This commit is contained in:
Alwin Berger 2023-02-20 12:28:39 +01:00
parent d118ff0056
commit 7420aabeeb
2 changed files with 20 additions and 10 deletions

View File

@ -74,6 +74,15 @@ rule run_bench:
script="export FUZZ_RANDOM=1\n"+script script="export FUZZ_RANDOM=1\n"+script
shell(script) shell(script)
rule all_bins:
input:
"bins/target_random",
"bins/target_feedlongest",
"bins/target_feedaflnolongest",
"bins/target_afl",
"bins/target_state",
"bins/target_graph"
rule all_periodic: rule all_periodic:
input: input:
expand("timedump/{fuzzer}/{target}.{num}", fuzzer=['random','afl','state','graph'], target=['waters'],num=range(0,10)) expand("timedump/{fuzzer}/{target}.{num}", fuzzer=['random','afl','state','graph'], target=['waters'],num=range(0,10))

View File

@ -220,30 +220,31 @@ pub fn fuzz() {
); );
#[cfg(feature = "feed_afl")] #[cfg(feature = "feed_afl")]
let mut feedback = feedback_or!( let mut feedback = feedback_or!(
feedback,
// New maximization map feedback linked to the edges observer and the feedback state // New maximization map feedback linked to the edges observer and the feedback state
MaxMapFeedback::new_tracking(&edges_observer, true, true), MaxMapFeedback::new_tracking(&edges_observer, true, true)
feedback
); );
#[cfg(feature = "feed_longest")] #[cfg(feature = "feed_longest")]
let mut feedback = feedback_or!( let mut feedback = feedback_or!(
// afl feedback needs to be activated first for MapIndexesMetadata
feedback,
// Feedback to reward any input which increses the execution time // Feedback to reward any input which increses the execution time
ExecTimeIncFeedback::new(), ExecTimeIncFeedback::new()
feedback
); );
#[cfg(all(feature = "systemstate",not(any(feature = "feed_systemgraph",feature = "feed_systemtrace"))))] #[cfg(all(feature = "systemstate",not(any(feature = "feed_systemgraph",feature = "feed_systemtrace"))))]
let mut feedback = feedback_or!( let mut feedback = feedback_or!(
DumpSystraceFeedback::with_dump(env::var("TRACE_DUMP").ok().map(PathBuf::from)), feedback,
feedback DumpSystraceFeedback::with_dump(env::var("TRACE_DUMP").ok().map(PathBuf::from))
); );
#[cfg(feature = "feed_systemtrace")] #[cfg(feature = "feed_systemtrace")]
let mut feedback = feedback_or!( let mut feedback = feedback_or!(
NovelSystemStateFeedback::default(), feedback,
feedback NovelSystemStateFeedback::default()
); );
#[cfg(feature = "feed_systemgraph")] #[cfg(feature = "feed_systemgraph")]
let mut feedback = feedback_or!( let mut feedback = feedback_or!(
SysMapFeedback::default(), feedback,
feedback SysMapFeedback::default()
); );
// A feedback to choose if an input is a solution or not // A feedback to choose if an input is a solution or not