diff --git a/fuzzers/FRET/benchmark/Snakefile b/fuzzers/FRET/benchmark/Snakefile index 12c4b80db8..17daa39a4e 100644 --- a/fuzzers/FRET/benchmark/Snakefile +++ b/fuzzers/FRET/benchmark/Snakefile @@ -2,9 +2,9 @@ import csv import os envvars: "BENCHDIR" -def_flags="--release --no-default-features --features std,snapshot_fast,restarting,do_hash_notify_state,do_hash_notify_value,fuzz_int,trace_job_response_times,observe_systemstate_unordered" +def_flags="--release --no-default-features --features std,snapshot_fast,restarting,do_hash_notify_state,fuzz_int,trace_job_response_times,observe_systemstate_unordered" benchdir=os.environ["BENCHDIR"] -RUNTIME=int(os.environ["RUNTIME"]) if "RUNTIME" in os.environ else (3600*24) +RUNTIME=int(os.environ["RUNTIME"]) if "RUNTIME" in os.environ else (3600*8) TARGET_SET=['feedgeneration100', 'stgwoet', 'frafl'] TARGET_REPLICA_NUMBER=int(os.environ["TARGET_REPLICA_NUMBER"]) if "TARGET_REPLICA_NUMBER" in os.environ else 10 RANDOM_REPLICA_NUMBER=int(os.environ["RANDOM_REPLICA_NUMBER"]) if "RANDOM_REPLICA_NUMBER" in os.environ else 1 @@ -95,7 +95,7 @@ rule build_stg_abbpath: output: directory("{benchdir}/bins/target_stg_abbpath") shell: - "cp -r -a --reflink=auto {input} {output} && cargo build --target-dir {output} {def_flags},config_stg_abbpath" + "cp -r -a --reflink=auto {input} {output} && cargo build --target-dir {output} {def_flags},config_stg_abbpath,feed_job_wort,feed_job_woet,feed_stg_abb_woet" rule build_stg_edge: input: @@ -263,7 +263,8 @@ rule quicktest: params: benchdir=benchdir input: - expand("{benchdir}/timedump/{fuzzer}/{target}{variant}#{num}.time", benchdir=benchdir, fuzzer=['feedgeneration100', 'stg', 'random'], target=['polycopter'], variant=['_seq_dataflow_full'], num=range(0,int( 1 ))), + expand("{benchdir}/timedump/{fuzzer}/{target}{variant}#{num}.time", benchdir=benchdir, fuzzer=['feedgeneration100', 'stgwoet'], target=['watersgen1'], variant=['_par_bytes'], num=range(1,int( 9 ))), + expand("{benchdir}/timedump/{fuzzer}/{target}{variant}#{num}.time", benchdir=benchdir, fuzzer=['random'], target=['watersgen1'], variant=['_par_bytes'], num=range(0,int( 0 ))), rule eval_bytes: params: @@ -325,4 +326,4 @@ rule plot_benchmarks: rule plot_traces: shell: - "bash scripts/plot_all_traces.sh {benchdir}" \ No newline at end of file + "bash scripts/plot_all_traces.sh {benchdir}" diff --git a/fuzzers/FRET/src/systemstate/target_os/freertos/post_processing.rs b/fuzzers/FRET/src/systemstate/target_os/freertos/post_processing.rs index 19bbd43764..9c9705b99a 100644 --- a/fuzzers/FRET/src/systemstate/target_os/freertos/post_processing.rs +++ b/fuzzers/FRET/src/systemstate/target_os/freertos/post_processing.rs @@ -176,7 +176,7 @@ pub(super) fn refine_system_states( #[cfg(feature = "observe_systemstate_unordered")] { // respect the order of the first ``lookahead`` tasks and sort the rest by hash value - const LOOKAHEAD : usize = 2; + const LOOKAHEAD : usize = 1; collector.get_mut(LOOKAHEAD..).map(|slice| slice.sort_by(|a, b| { a.cmp(&*b) })); } // collect delay list