diff --git a/fuzzers/FRET/Cargo.toml b/fuzzers/FRET/Cargo.toml index 869303d657..2770b993df 100644 --- a/fuzzers/FRET/Cargo.toml +++ b/fuzzers/FRET/Cargo.toml @@ -42,9 +42,9 @@ sched_stg_pathhash = ['sched_stg'] # every path in the stg sched_stg_abbhash = ['sched_stg'] # every path of abbs sched_stg_aggregatehash = ['sched_stg'] # every aggregated path (order independent) # overall_configs -config_genetic = ["gensize_100","feed_genetic","sched_genetic"] -config_afl = ["feed_afl","sched_afl","observe_hitcounts"] -config_frafl = ["feed_afl","sched_afl","feed_longest"] +config_genetic = ["gensize_100","feed_genetic","sched_genetic","trace_stg"] +config_afl = ["feed_afl","sched_afl","observe_hitcounts","trace_stg"] +config_frafl = ["feed_afl","sched_afl","feed_longest","trace_stg"] config_stg = ["feed_stg_aggregatehash","sched_stg_aggregatehash","mutate_stg"] [profile.release] diff --git a/fuzzers/FRET/benchmark/Snakefile b/fuzzers/FRET/benchmark/Snakefile index 48922abb68..e93ef48269 100644 --- a/fuzzers/FRET/benchmark/Snakefile +++ b/fuzzers/FRET/benchmark/Snakefile @@ -254,50 +254,10 @@ rule clusterfuzz: rule all_new: input: expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['feedgeneration100', 'frafl', 'stg'], target=['waters', 'watersv2'],num=range(0,3)), - expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['feedgeneration100_int', 'frafl_int', 'stg_int'], target=['waters_int', 'watersv2_int'],num=range(0,3)) - expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['random', 'stgpath'], target=['waters', 'watersv2'],num=range(0,3)) + expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['feedgeneration100_int', 'frafl_int', 'stg_int'], target=['waters_int', 'watersv2_int'],num=range(0,3)), + expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['random', 'stgpath'], target=['waters', 'watersv2'],num=range(0,3)), expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['random_int', 'stgpath_int'], target=['waters_int', 'watersv2_int'],num=range(0,3)) --- rule build_stgpath: --- output: --- directory("bins/target_stgpath_int") --- shell: --- "cargo build --target-dir {output} {def_flags},config_stg,sched_stg_pathhash,feed_stg_pathhash" - --- rule build_stgabb: --- output: --- directory("bins/target_stgabb_int") --- shell: --- "cargo build --target-dir {output} {def_flags},config_stg,sched_stg_abbhash,feed_stg_abbhash" - --- rule build_stgaggregate: --- output: --- directory("bins/target_stgaggregate_int") --- shell: --- "cargo build --target-dir {output} {def_flags},config_stg,sched_stg_aggregatehash,feed_stg_aggregatehash" - --- rule build_stgpath_int: --- output: --- directory("bins/target_stgpath_int") --- shell: --- "cargo build --target-dir {output} {def_flags},config_stg,fuzz_int,sched_stg_pathhash,feed_stg_pathhash" - --- rule build_stgabb_int: --- output: --- directory("bins/target_stgabb_int") --- shell: --- "cargo build --target-dir {output} {def_flags},config_stg,fuzz_int,sched_stg_abbhash,feed_stg_abbhash" - --- rule build_stgaggregate_int: --- output: --- directory("bins/target_stgaggregate_int") --- shell: --- "cargo build --target-dir {output} {def_flags},config_stg,fuzz_int,sched_stg_aggregatehash,feed_stg_aggregatehash" - --- rule custom_test: --- input: --- expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['stgpath', 'stgabb', 'stgaggregate'], target=['waters','watersv2','interact'],num=range(0,2)), --- expand("timedump/{fuzzer}/{target}#{num}.time", fuzzer=['stgpath_int', 'stgabb_int', 'stgaggregate_int'], target=['waters_int','watersv2_int','interact_int'],num=range(0,2)), rule all_bins: