data-aggregator: specifically limit to fspmethod 'basic'

In their current implementation, the data-aggregator scripts do not work
correctly on sampling results.

Change-Id: I1035970b352f513d725bd1a40ac9262368ffbcc0

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

@@ -39,6 +39,7 @@ JOIN fspgroup g
 	ON g.variant_id = t.variant_id
 	AND g.data_address = t.data_address
 	AND g.instr2 = t.instr2
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER

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

@@ -12,6 +12,7 @@ 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
+ AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 JOIN result_GenericExperimentMessage r
   ON r.pilot_id = g.pilot_id
 WHERE $FILTER

tools/analysis/data-aggregator/resulttype-occurrences-onwrite.sh

@@ -23,6 +23,7 @@ SELECT v.benchmark, v.variant, r.resulttype, SUM(t.width) AS occurrences
 FROM result_GenericExperimentMessage r
 INNER JOIN fspgroup g
 	ON g.pilot_id = r.pilot_id
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 INNER JOIN trace t
 	ON g.instr2 = t.instr2
 	AND g.data_address = t.data_address

tools/analysis/data-aggregator/resulttype-occurrences-onwrite_coverage.sh

@@ -26,6 +26,7 @@ SELECT v.benchmark, v.variant, r.resulttype,
 	FROM result_GenericExperimentMessage r
 	INNER JOIN fspgroup g
 		ON g.pilot_id = r.pilot_id
+		AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 	INNER JOIN trace t
 		ON g.instr2 = t.instr2
 		AND g.data_address = t.data_address
@@ -40,6 +41,7 @@ SELECT v.benchmark, v.variant, r.resulttype,
 FROM result_GenericExperimentMessage r
 INNER JOIN fspgroup g
 	ON g.pilot_id = r.pilot_id
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 INNER JOIN trace t
 	ON g.instr2 = t.instr2
 	AND g.data_address = t.data_address

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

@@ -8,6 +8,7 @@ SELECT v.benchmark, v.variant, r.resulttype, SUM((t.time2-t.time1+1) * t.width)
 FROM result_GenericExperimentMessage r
 INNER JOIN fspgroup g
 	ON g.pilot_id = r.pilot_id
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 INNER JOIN trace t
 	ON g.instr2 = t.instr2
 	AND g.data_address = t.data_address

tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh

@@ -11,6 +11,7 @@ SELECT v.benchmark, v.variant, r.resulttype,
 	FROM result_GenericExperimentMessage r
 	INNER JOIN fspgroup g
 		ON g.pilot_id = r.pilot_id
+		AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 	INNER JOIN trace t
 		ON g.instr2 = t.instr2
 		AND g.data_address = t.data_address
@@ -20,6 +21,7 @@ SELECT v.benchmark, v.variant, r.resulttype,
 FROM result_GenericExperimentMessage r
 INNER JOIN fspgroup g
 	ON g.pilot_id = r.pilot_id
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 INNER JOIN trace t
 	ON g.instr2 = t.instr2
 	AND g.data_address = t.data_address

tools/analysis/data-aggregator/symbol-occurrences-onwrite.sh

@@ -29,6 +29,7 @@ JOIN fspgroup g
 	ON t.variant_id = g.variant_id
 	AND t.data_address = g.data_address
 	AND t.instr2 = g.instr2
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER

tools/analysis/data-aggregator/symbol-occurrences-onwrite_coverage.sh

@@ -20,6 +20,7 @@ SELECT v.benchmark, v.variant, s.name, s.size, r.resulttype,
 		ON t.variant_id = g.variant_id
 		AND t.data_address = g.data_address
 		AND t.instr2 = g.instr2
+		AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 	JOIN result_GenericExperimentMessage r
 		ON r.pilot_id = g.pilot_id
 	WHERE t.variant_id = v.id -- refers to parent query
@@ -39,6 +40,7 @@ JOIN fspgroup g
 	ON t.variant_id = g.variant_id
 	AND t.data_address = g.data_address
 	AND t.instr2 = g.instr2
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER

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

@@ -8,6 +8,7 @@ FROM variant v
 INNER JOIN symbol s ON v.id = s.variant_id
 INNER JOIN trace t ON t.variant_id = v.id AND t.data_address BETWEEN s.address AND s.address + s.size - 1
 INNER JOIN fspgroup g ON t.variant_id = g.variant_id AND t.data_address = g.data_address AND t.instr2 = g.instr2
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 INNER JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype

tools/analysis/data-aggregator/symbol-occurrences_coverage.sh

@@ -10,6 +10,7 @@ SELECT v.benchmark, v.variant, s.name, s.size, r.resulttype,
 		FROM symbol s
 		INNER JOIN trace t ON t.variant_id = s.variant_id AND t.data_address BETWEEN s.address AND s.address + s.size - 1
 		INNER JOIN fspgroup g ON t.variant_id = g.variant_id AND t.data_address = g.data_address AND t.instr2 = g.instr2
+			AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 		INNER JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 		WHERE t.variant_id = v.id -- refers to parent query
 	   ) AS coverage
@@ -17,6 +18,7 @@ FROM variant v
 INNER JOIN symbol s ON v.id = s.variant_id
 INNER JOIN trace t ON t.variant_id = v.id AND t.data_address BETWEEN s.address AND s.address + s.size - 1
 INNER JOIN fspgroup g ON t.variant_id = g.variant_id AND t.data_address = g.data_address AND t.instr2 = g.instr2
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 INNER JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id
 WHERE $FILTER
 GROUP BY v.id, s.name, r.resulttype

tools/analysis/data-aggregator/translation-unit-occurrences-onwrite.sh

@@ -31,6 +31,7 @@ JOIN fspgroup g
 	ON g.variant_id = t.variant_id
 	AND g.data_address = t.data_address
 	AND g.instr2 = t.instr2
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER

tools/analysis/data-aggregator/translation-unit-occurrences.sh

@@ -17,6 +17,7 @@ JOIN fspgroup g
 	ON g.variant_id = t.variant_id
 	AND g.data_address = t.data_address
 	AND g.instr2 = t.instr2
+	AND g.fspmethod_id = (SELECT id FROM fspmethod WHERE method = 'basic')
 JOIN result_GenericExperimentMessage r
 	ON r.pilot_id = g.pilot_id
 WHERE $FILTER