data-aggregator: per-function + durations

Change-Id: I1dc7791fe9af7f848f56093e0554c61973b7a1f3

tools/analysis/data-aggregator/CMakeLists.txt

@@ -1 +1 @@
-install(PROGRAMS resulttype-occurrences_coverage.sh resulttype-occurrences.sh symbol-occurrences_coverage.sh symbol-occurrences.sh translation-unit-occurrences.sh DESTINATION bin)
+install(PROGRAMS function-occurrences.sh resulttype-occurrences.sh resulttype-occurrences_coverage.sh symbol-occurrences.sh symbol-occurrences_coverage.sh translation-unit-occurrences.sh variant-durations.sh DESTINATION bin)

tools/analysis/data-aggregator/function-occurrences.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+if [ "$1" = -t ]; then
+	FORMAT=-t
+	shift
+else
+	FORMAT=-B
+fi
+
+if [ ! $# -eq 3 ]; then
+	echo "usage: $0 [ -t ] DATABASE VARIANT BENCHMARK" >&2
+	echo "  -t      Display output in table format (tab-separated CSV otherwise)" >&2
+	exit 1
+fi
+
+DATABASE=$1
+VARIANT=$2
+BENCHMARK=$3
+MYSQL="mysql $FORMAT $DATABASE"
+
+$MYSQL << EOT
+SELECT s.name, s.address, r.resulttype, SUM(t.time2-t.time1+1) AS occurrences
+FROM variant v
+JOIN symbol s
+  ON s.variant_id = v.id
+JOIN trace t
+  ON t.variant_id = s.variant_id AND t.instr2_absolute BETWEEN s.address AND s.address + s.size - 1
+JOIN fspgroup g
+  ON g.variant_id = t.variant_id AND g.data_address = t.data_address AND g.instr2 = t.instr2
+JOIN result_GenericExperimentMessage r
+  ON r.pilot_id = g.pilot_id
+WHERE v.variant="$VARIANT"
+  AND v.benchmark="$BENCHMARK"
+GROUP BY s.variant_id, s.address, r.resulttype
+ORDER BY s.address, r.resulttype
+;
+EOT

tools/analysis/data-aggregator/variant-durations.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+set -e
+
+if [ "$1" = -t ]; then
+	FORMAT=-t
+	shift
+else
+	FORMAT=-B
+fi
+
+if [ $# -ne 3 -a $# -ne 1 ]; then
+	echo "usage: $0 [ -t ] DATABASE [ VARIANT BENCHMARK ]" >&2
+	echo "  -t      Display output in table format (tab-separated CSV otherwise)" >&2
+	exit 1
+fi
+
+DATABASE=$1
+VARIANT=$2
+BENCHMARK=$3
+MYSQL="mysql $FORMAT $DATABASE"
+
+if [ -z "$VARIANT" ]; then
+$MYSQL << EOT
+	SET sql_mode = 'NO_UNSIGNED_SUBTRACTION';
+	SELECT v.benchmark, v.variant,
+	MAX(t.time2)-MIN(t.time1)+1 AS duration,
+	MAX(t.instr2)-MIN(t.instr1)+1 AS dyn_instr
+	FROM trace t
+	JOIN variant v ON t.variant_id = v.id
+	GROUP BY v.id
+	ORDER BY v.benchmark, v.variant;
+EOT
+else
+$MYSQL << EOT
+	SET sql_mode = 'NO_UNSIGNED_SUBTRACTION';
+	SELECT
+	MAX(t.time2)-MIN(t.time1)+1 AS duration,
+	MAX(t.instr2)-MIN(t.instr1)+1 AS dyn_instr
+	FROM trace t
+	JOIN variant v ON t.variant_id = v.id
+	WHERE v.variant = "$VARIANT"
+	  AND v.benchmark = "$BENCHMARK"
+EOT
+fi