diff --git a/bench/diff/diff.ml b/bench/diff/diff.ml index a1d61a852..d1f3b6c70 100644 --- a/bench/diff/diff.ml +++ b/bench/diff/diff.ml @@ -117,20 +117,34 @@ let () = Format.printf "tool2 had %03d tasks tool1 did not found@\n@\n" (count_reached2 - count_common); Format.printf - "on commonly reached tasks, tool 1 took %04f sec. (mean %04f) and \ - tool 2 took %06f sec. (mean %04f)@\n" + "on commonly reached tasks, tool 1 took %04f sec. (mean %04f, median \ + %04f, min %04f, max %04f) and tool 2 took %06f sec. (mean %04f, median \ + %04f, min %04f, max %04f)@\n" (Runs.sum_clock reached_common_1) (Runs.mean_clock reached_common_1) + (Runs.median_clock reached_common_1) + (Runs.min_clock reached_common_1) + (Runs.max_clock reached_common_1) (Runs.sum_clock reached_common_2) - (Runs.mean_clock reached_common_2); + (Runs.mean_clock reached_common_2) + (Runs.median_clock reached_common_2) + (Runs.min_clock reached_common_2) + (Runs.max_clock reached_common_2); Format.printf - "on *not commonly* reached tasks, tool 1 took %04f sec. (mean %04f) and \ - tool 2 took %06f sec. (mean %04f)@\n\ + "on *not commonly* reached tasks, tool 1 took %04f sec. (mean %04f, median \ + %04f, min %04f, max %04f) and tool 2 took %06f sec. (mean %04f, median \ + %04f, min %04f, max %04f)@\n\ @\n" (Runs.sum_clock reached_only_1) (Runs.mean_clock reached_only_1) + (Runs.median_clock reached_only_1) + (Runs.min_clock reached_only_1) + (Runs.max_clock reached_only_1) (Runs.sum_clock reached_only_2) - (Runs.mean_clock reached_only_2); + (Runs.mean_clock reached_only_2) + (Runs.median_clock reached_only_2) + (Runs.min_clock reached_only_2) + (Runs.max_clock reached_only_2); Format.printf "among tasks reached only by tool 1, tool 2 replied %03d nothing, %03d \ timeout, %02d other and %02d killed@\n" @@ -144,4 +158,14 @@ let () = (Runs.count_nothing report1_found_by_2_not_by_1) (Runs.count_timeout report1_found_by_2_not_by_1) (Runs.count_other report1_found_by_2_not_by_1) - (Runs.count_killed report1_found_by_2_not_by_1) + (Runs.count_killed report1_found_by_2_not_by_1); + Format.printf "tasks solved only by tool 1:@\n @[%a@]@\n" + (Format.pp_print_list + ~pp_sep:(fun fmt () -> Format.fprintf fmt "@\n") + Fpath.pp ) + (Runs.files reached_only_1); + Format.printf "tasks solved only by tool 2:@\n @[%a@]@\n" + (Format.pp_print_list + ~pp_sep:(fun fmt () -> Format.fprintf fmt "@\n") + Fpath.pp ) + (Runs.files reached_only_2) diff --git a/bench/report/runs.ml b/bench/report/runs.ml index 033f96b0e..c2cc3e0a5 100644 --- a/bench/report/runs.ml +++ b/bench/report/runs.ml @@ -61,6 +61,15 @@ let max_clock runs = max clock current_max ) 0. runs +let median_clock runs = + let n = List.length runs in + if n = 0 then 0. + else if n mod 2 = 0 then + ( Run.clock (List.nth runs (n / 2)) + +. Run.clock (List.nth runs ((n / 2) + 1)) ) + /. 2. + else List.nth runs (n / 2) |> Run.clock + let sum_clock runs = List.fold_left (fun sum r -> Run.clock r +. sum) 0. runs let mean_clock runs = sum_clock runs /. (count_all runs |> float_of_int) diff --git a/bench/report/runs.mli b/bench/report/runs.mli index 884bff1a5..c620667ce 100644 --- a/bench/report/runs.mli +++ b/bench/report/runs.mli @@ -36,6 +36,8 @@ val sum_clock : t -> float val mean_clock : t -> float +val median_clock : t -> float + val sum_utime : t -> float val mean_utime : t -> float