Added legend to performance plots.

Author: marek-trtik

scripts/collect_stats.py

@@ -16,6 +16,9 @@ def _parse_cmd_line():
 
 
 def _main(cmdline):
+    if not os.path.isdir(cmdline.input):
+        print("ERROR: The input path is not an existing directory.")
+        return
     result = {}
     for root, _, file_names in os.walk(cmdline.input):
         is_other = False
@@ -43,6 +46,7 @@ def _main(cmdline):
             for _, time in stats["table-phases"].items():
                 total_time += time
             result[os.path.basename(xroot)] = {
+                "category": "small" if num_locations < 10000 else "big",
                 "num_goto_program_locations": num_locations,
                 "time_in_seconds": total_time,
                 "memory_in_mega_bytes": 0,

scripts/make_performance_scatter_plots.py

@@ -51,14 +51,15 @@ def choose_colour(colour_index=0):
 def make_scatter_plot(
         pathname,
         format,
-        points,
+        point_groups,
         title=None,
         xaxis_name=None,
         faxis_name=None,
         xaxis_log=False,
         faxis_log=False,
         draw_diagonal=False,
         draw_fitline=False,
+        add_legend=False,
         size_xy=None,
         dpi=None
         ):
@@ -84,23 +85,31 @@ def make_scatter_plot(
     if faxis_log:
         ax.set_yscale('symlog')
     ax.grid(True, linestyle='dotted')
-    xs = []
-    ys = []
-    for x, y in points:
-        xs.append(x)
-        ys.append(y)
-    ax.scatter(xs, ys)
+    all_xs = []
+    all_ys = []
+    idx = 0
+    for group, points in point_groups.items():
+        colour, idx = choose_colour(idx)
+        xs = []
+        ys = []
+        for x, y in points:
+            xs.append(x)
+            ys.append(y)
+        ax.scatter(xs, ys, color=colour, label=group + " (#" + str(len(xs)) + ")")
+        all_xs += xs
+        all_ys += ys
+    ax.legend()
     if draw_diagonal:
         line = mlines.Line2D([0, 1], [0, 1], color=("blue" if draw_fitline else "red"))
         line.set_transform(ax.transAxes)
         ax.add_line(line)
     if draw_fitline:
-        line_coefs = numpy.polyfit(xs, ys, 1)
-        x_lo = min(xs)
-        x_hi = max(xs)
+        line_coefs = numpy.polyfit(all_xs, all_ys, 1)
+        x_lo = min(all_xs)
+        x_hi = max(all_xs)
         n_steps = 1000
         dx = (x_hi - x_lo) / n_steps
-        lxs = sorted(xs + [x_lo + t * dx for t in range(n_steps + 1)])
+        lxs = sorted(all_xs + [x_lo + t * dx for t in range(n_steps + 1)])
         lys = [line_coefs[0] * x + line_coefs[1] for x in lxs]
         ax.plot(lxs, lys, "r-")
     fig.savefig(pathname, bbox_inches='tight', format=format)
@@ -110,11 +119,16 @@ def _main(cmdline):
     with open(cmdline.input, "r") as ifile:
         stats = json.load(ifile)
 
-    time_points = []
-    memory_points = []
+    time_points = {}
+    memory_points = {}
     for _, data in stats.items():
-        time_points.append((data["num_goto_program_locations"], data["time_in_seconds"]))
-        memory_points.append((data["num_goto_program_locations"], data["memory_in_mega_bytes"]))
+        category = "" if "category" not in data else data["category"]
+        if category not in time_points:
+            time_points[category] = []
+        time_points[category].append((data["num_goto_program_locations"], data["time_in_seconds"]))
+        if category not in memory_points:
+            memory_points[category] = []
+        memory_points[category].append((data["num_goto_program_locations"], data["memory_in_mega_bytes"]))
 
     fname_prefix = "security-analyser_stage1_"
 
@@ -125,9 +139,8 @@ def _main(cmdline):
         "Time performance of Stage 1 of the security-analyser",
         "goto-program locations",
         "seconds",
-        True,
-        True,
-        True
+        draw_fitline=True,
+        add_legend=True
         )
     make_scatter_plot(
         os.path.join(cmdline.output, fname_prefix + "memory_perf." + cmdline.format),
@@ -136,9 +149,8 @@ def _main(cmdline):
         "Memory performance of Stage 1 of the security-analyser",
         "goto-program locations",
         "MB",
-        True,
-        True,
-        True
+        draw_fitline=True,
+        add_legend=True
         )