diff --git a/fuzzers/FRET/benchmark/Snakefile b/fuzzers/FRET/benchmark/Snakefile index 1cccaf3c70..7ac15faa8d 100644 --- a/fuzzers/FRET/benchmark/Snakefile +++ b/fuzzers/FRET/benchmark/Snakefile @@ -192,7 +192,8 @@ rule tarnsform_trace: "{remote}timedump/{fuzzer}/{target}#{num}_case.trace.ron", output: "{remote}timedump/{fuzzer}/{target}#{num}_case.jobs.csv", - "{remote}timedump/{fuzzer}/{target}#{num}_case.resp.csv" + "{remote}timedump/{fuzzer}/{target}#{num}_case.resp.csv", + "{remote}timedump/{fuzzer}/{target}#{num}_case.abbs.csv" run: with open('target_symbols.csv') as csvfile: reader = csv.DictReader(csvfile) @@ -206,8 +207,8 @@ rule tarnsform_trace: bkp=line['return_function'] select_task=line['select_task'] script=""" - echo $(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -t {select_task} - $(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -t {select_task} + echo $(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -p {output[2]} -t {select_task} + $(pwd)/../../../../state2gantt/target/debug/state2gantt -i {input} -a {output[0]} -r {output[1]} -p {output[2]} -t {select_task} """ shell(script) diff --git a/fuzzers/FRET/src/systemstate/mod.rs b/fuzzers/FRET/src/systemstate/mod.rs index 1c470ef866..e4883b99b6 100644 --- a/fuzzers/FRET/src/systemstate/mod.rs +++ b/fuzzers/FRET/src/systemstate/mod.rs @@ -194,7 +194,6 @@ pub struct ExecInterval { pub end_state: u64, pub start_capture: (CaptureEvent, String), pub end_capture: (CaptureEvent, String), - pub interval_name: String, pub level: u8, tick_spend_preempted: u64, pub abb: Option diff --git a/fuzzers/FRET/src/systemstate/observers.rs b/fuzzers/FRET/src/systemstate/observers.rs index 64dbe02346..fe1208cd6f 100644 --- a/fuzzers/FRET/src/systemstate/observers.rs +++ b/fuzzers/FRET/src/systemstate/observers.rs @@ -504,7 +504,6 @@ fn states2intervals(trace: Vec, meta: Vec<(u64, Capt start_capture: (meta[i].1, meta[i].2.clone()), end_capture: (meta[i+1].1, meta[i+1].2.clone()), level: level, - interval_name: String::new(), tick_spend_preempted: 0, abb: None }); @@ -620,7 +619,6 @@ fn add_abb_info(trace: &mut Vec, table: &HashMap