From ecee5663bf900ab97d2bb7ec41ade838f167e1cd Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 8 Jun 2009 01:05:28 +0100
Subject: [PATCH] [perf] Fixup compare-backends to work with just a single
 test.

---
 perf/cairo-perf-compare-backends.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/perf/cairo-perf-compare-backends.c b/perf/cairo-perf-compare-backends.c
index 821284938..1f737eb3e 100644
--- a/perf/cairo-perf-compare-backends.c
+++ b/perf/cairo-perf-compare-backends.c
@@ -41,7 +41,6 @@ typedef struct _cairo_perf_report_options {
     double min_change;
     int use_utf;
     int print_change_bars;
-    int use_ms;
 } cairo_perf_report_options_t;
 
 typedef struct _cairo_perf_diff_files_args {
@@ -132,8 +131,7 @@ test_diff_print (test_diff_t			*diff,
 
     for (i = 0; i < diff->num_tests; i++) {
 	test_time = diff->tests[i]->stats.min_ticks;
-	if (options->use_ms)
-	    test_time /= diff->tests[i]->stats.ticks_per_ms;
+	test_time /= diff->tests[i]->stats.ticks_per_ms;
 	change = diff->max / test_time;
 	printf ("%8s-%s-%s\t%6.2f: %5.2fx ",
 		diff->tests[i]->backend,
@@ -230,8 +228,7 @@ cairo_perf_reports_compare (cairo_perf_report_t		*reports,
 	    {
 		test_time = tests[i]->stats.min_ticks;
 		if (test_time > 0) {
-		    if (options->use_ms)
-			test_time /= tests[i]->stats.ticks_per_ms;
+		    test_time /= tests[i]->stats.ticks_per_ms;
 		    if (diff->num_tests == 0) {
 			diff->min = test_time;
 			diff->max = test_time;
@@ -251,7 +248,7 @@ cairo_perf_reports_compare (cairo_perf_report_t		*reports,
 	diff++;
 	num_diffs++;
     }
-    if (num_diffs < 2)
+    if (num_diffs == 0)
 	goto DONE;
 
     qsort (diffs, num_diffs, sizeof (test_diff_t), test_diff_cmp);
@@ -274,9 +271,9 @@ cairo_perf_reports_compare (cairo_perf_report_t		*reports,
 	test_diff_print (diff, max_change, options);
     }
 
- DONE:
     for (i = 0; i < num_diffs; i++)
 	free (diffs[i].tests);
+ DONE:
     free (diffs);
     free (tests);
 }
@@ -325,9 +322,6 @@ parse_args(int				  argc,
 	else if (strcmp (argv[i], "--no-bars") == 0) {
 	    args->options.print_change_bars = 0;
 	}
-	else if (strcmp (argv[i], "--use-ms") == 0) {
-	    args->options.use_ms = 1;
-	}
 	else if (strcmp (argv[i], "--min-change") == 0) {
 	    char *end = NULL;
 	    i++;
@@ -377,7 +371,8 @@ main (int argc, const char *argv[])
     for (i = 0; i < args.num_filenames; i++) {
 	cairo_perf_report_load (&reports[i], args.filenames[i],
 		                test_report_cmp_name);
-	printf ("loaded: %s\n", args.filenames[i]);
+	printf ("loaded: %s, %d tests\n",
+		args.filenames[i], reports[i].tests_count);
     }
 
     cairo_perf_reports_compare (reports, args.num_filenames, &args.options);