From 809f3b0d6a90d78f10be808b9a426e58e582c168 Mon Sep 17 00:00:00 2001 From: Alwin Berger Date: Fri, 7 Feb 2025 12:43:42 +0100 Subject: [PATCH] config changes --- fuzzers/FRET/benchmark/build_all_demos.sh | 8 ++++++++ fuzzers/FRET/benchmark/plot_all_benchmarks.sh | 8 +++++--- fuzzers/FRET/benchmark/target_symbols.csv | 1 + fuzzers/FRET/src/systemstate/helpers.rs | 6 ++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/fuzzers/FRET/benchmark/build_all_demos.sh b/fuzzers/FRET/benchmark/build_all_demos.sh index 857bd54781..c425c464d4 100644 --- a/fuzzers/FRET/benchmark/build_all_demos.sh +++ b/fuzzers/FRET/benchmark/build_all_demos.sh @@ -50,4 +50,12 @@ build COPTER_DEMO $SUFFIX export FUZZ_INT_ACTIVATION=1 FUZZ_BYTES=0 SUFFIX="_seq_int" build COPTER_DEMO $SUFFIX export FUZZ_INT_ACTIVATION=1 FUZZ_BYTES=1 SUFFIX="_seq_full" +build COPTER_DEMO $SUFFIX + +export PARTITION_INPUT=1 +export FUZZ_INT_ACTIVATION=0 FUZZ_BYTES=1 SUFFIX="_par_bytes" +build COPTER_DEMO $SUFFIX +export FUZZ_INT_ACTIVATION=1 FUZZ_BYTES=0 SUFFIX="_par_int" +build COPTER_DEMO $SUFFIX +export FUZZ_INT_ACTIVATION=1 FUZZ_BYTES=1 SUFFIX="_par_full" build COPTER_DEMO $SUFFIX \ No newline at end of file diff --git a/fuzzers/FRET/benchmark/plot_all_benchmarks.sh b/fuzzers/FRET/benchmark/plot_all_benchmarks.sh index 48607b3c64..9ab34addff 100644 --- a/fuzzers/FRET/benchmark/plot_all_benchmarks.sh +++ b/fuzzers/FRET/benchmark/plot_all_benchmarks.sh @@ -9,7 +9,7 @@ export SUFFIX="_seq_bytes" plot waters $SUFFIX #plot release $SUFFIX -#plot copter $SUFFIX +plot copter $SUFFIX #plot interact $SUFFIX # Only interrupts @@ -18,7 +18,7 @@ export SUFFIX="_seq_int" plot waters $SUFFIX plot release $SUFFIX -#plot copter $SUFFIX +plot copter $SUFFIX #plot interact $SUFFIX # Full @@ -30,4 +30,6 @@ plot waters $SUFFIX plot copter $SUFFIX #plot interact $SUFFIX -# plot copter "_seq_stateless_full" +plot copter "_seq_stateless_full" + +plot copter "_par_full" diff --git a/fuzzers/FRET/benchmark/target_symbols.csv b/fuzzers/FRET/benchmark/target_symbols.csv index c63ec22e0e..057072c1cc 100644 --- a/fuzzers/FRET/benchmark/target_symbols.csv +++ b/fuzzers/FRET/benchmark/target_symbols.csv @@ -10,6 +10,7 @@ release_seq_full,main_release,FUZZ_INPUT,4096,trigger_Qemu_break,T3,0#10000;1#50 release_seq_int,main_release,FUZZ_INPUT,4096,trigger_Qemu_break,T3,0#10000;1#5000;2#2000;3#3000 release_seq_bytes,main_release,FUZZ_INPUT,4096,trigger_Qemu_break,T3, copter_seq_full,main_osek,FUZZ_INPUT,4096,trigger_Qemu_break,FC,0#20000 +copter_par_full,main_osek,FUZZ_INPUT,4096,trigger_Qemu_break,FC,0#20000 copter_seq_int,main_osek,FUZZ_INPUT,4096,trigger_Qemu_break,FC,0#20000 copter_seq_bytes,main_osek,FUZZ_INPUT,4096,trigger_Qemu_break,FC, copter_par_bytes,main_osek,FUZZ_INPUT,4096,trigger_Qemu_break,FC, diff --git a/fuzzers/FRET/src/systemstate/helpers.rs b/fuzzers/FRET/src/systemstate/helpers.rs index 690081b5d9..9a9afa87d9 100644 --- a/fuzzers/FRET/src/systemstate/helpers.rs +++ b/fuzzers/FRET/src/systemstate/helpers.rs @@ -6,10 +6,7 @@ use std::cmp::min; use crate::{fuzzer::{DO_NUM_INTERRUPT, FIRST_INT}, time::clock::QEMU_ISNS_PER_USEC}; -use super::{ - target_os::{SystemTraceData, TargetSystem}, - ExecInterval, -}; +use super::ExecInterval; //============================= API symbols @@ -183,6 +180,7 @@ where /// Build an ABB-profile from a stretch of intervals /// returns mapping: task_name -> (abb_addr -> (interval_count, exec_count, exec_time)) +#[allow(unused)] pub fn abb_profile( mut intervals: Vec, ) -> HashMap> {