Support all exported metrics in plotting scripts (#981)

scripts/plot_whisker.py

@@ -20,7 +20,10 @@ import json
 
 import matplotlib.pyplot as plt
 
+from plot_utils import METRICS, add_metric_argument, validate_metric
+
 parser = argparse.ArgumentParser(description=__doc__)
+add_metric_argument(parser)
 parser.add_argument("file", help="JSON file with benchmark results")
 parser.add_argument("--title", help="Plot Title")
 parser.add_argument("--sort-by", choices=["median"], help="Sort method")
@@ -30,26 +33,30 @@ parser.add_argument(
 parser.add_argument("-o", "--output", help="Save image to the given filename.")
 
 args = parser.parse_args()
+metric_label, metric_scale = METRICS[args.metric]
 
 with open(args.file, encoding="utf-8") as f:
     results = json.load(f)["results"]
+validate_metric(parser, results, args.metric)
 
 if args.labels:
     labels = args.labels.split(",")
 else:
     labels = [b.get("name", b["command"]) for b in results]
-times = [[m["time_wall_clock"]["value"] for m in b["measurements"]] for b in results]
+values = [
+    [m[args.metric]["value"] / metric_scale for m in b["measurements"]] for b in results
+]
 
 if args.sort_by == "median":
-    medians = [b["summary"]["time_wall_clock"]["median"] for b in results]
+    medians = [b["summary"][args.metric]["median"] for b in results]
     indices = sorted(range(len(labels)), key=lambda k: medians[k])
     labels = [labels[i] for i in indices]
-    times = [times[i] for i in indices]
+    values = [values[i] for i in indices]
 
 plt.figure(figsize=(10, 6), constrained_layout=True)
-boxplot = plt.boxplot(times, vert=True, patch_artist=True)
+boxplot = plt.boxplot(values, vert=True, patch_artist=True)
 cmap = plt.get_cmap("rainbow")
-colors = [cmap(val / len(times)) for val in range(len(times))]
+colors = [cmap(val / len(values)) for val in range(len(values))]
 
 for patch, color in zip(boxplot["boxes"], colors):
     patch.set_facecolor(color)
@@ -57,7 +64,7 @@ for patch, color in zip(boxplot["boxes"], colors):
 if args.title:
     plt.title(args.title)
 plt.legend(handles=boxplot["boxes"], labels=labels, loc="best", fontsize="medium")
-plt.ylabel("Time [s]")
+plt.ylabel(metric_label)
 plt.ylim(0, None)
 plt.xticks(list(range(1, len(labels) + 1)), labels, rotation=45)
 if args.output: