[benchmark] Report totals as a sentence

Clean up after removing bogus agregate statistics from last line of the log. It makes more sense to report the total number of executed benchmarks as a sentence that trying to fit into the format of preceding table.

Added test assertion that `run_benchmarks` return csv formatted log, as it is used to write the log into file in `log_results`.

Author: palimondo

benchmark/scripts/Benchmark_Driver

@@ -442,24 +442,17 @@ def run_benchmarks(driver):
         else:
             print(','.join(test_output))
         output.append(test_output)
-    if not output:
-        return
-    formatted_output = '\n'.join([','.join(l) for l in output])
-    totals = ['Totals', str(len(driver.tests))]
-    totals_output = '\n\n' + ','.join(totals)
-    if log:
-        print(line_format.format(*([''] + totals + ([''] * 6))))
-    else:
-        print(totals_output[1:])
-    formatted_output += totals_output
-    return formatted_output
+
+    print('\nTotal performance tests executed: {0}'.format(len(driver.tests)))
+    csv_log = '\n'.join([','.join(l) for l in output]) + '\n'
+    return csv_log
 
 
 def run(args):
     driver = BenchmarkDriver(args)
-    output = run_benchmarks(driver)
-    if args.output_dir:
-        driver.log_results(output)
+    csv_log = run_benchmarks(driver)
+    if args.output_dir and csv_log:
+        driver.log_results(csv_log)
     return 0
 
 

benchmark/scripts/test_Benchmark_Driver.py

@@ -295,28 +295,31 @@ def mock_run(test):
         driver.run_independent_samples = mock_run
 
         with captured_output() as (out, _):
-            formatted_output = run_benchmarks(driver)
+            log = run_benchmarks(driver)
 
+        csv_log = '3,b1,1,123,123,123,0,123,888\n'
+        self.assertEquals(log, csv_log)
         self.assertEquals(
             out.getvalue(),
             '#,TEST,SAMPLES,MIN(μs),MAX(μs),MEAN(μs),SD(μs),MEDIAN(μs),' +
             'MAX_RSS(B)\n' +
-            '3,b1,1,123,123,123,0,123,888\n\nTotals,1\n')
-        self.assertEquals(formatted_output,
-                          '3,b1,1,123,123,123,0,123,888\n' +
-                          '\nTotals,1')
+            csv_log +
+            '\n' +
+            'Total performance tests executed: 1\n')
 
         driver.args.output_dir = 'logs/'
         with captured_output() as (out, _):
-            run_benchmarks(driver)
+            log = run_benchmarks(driver)
+
+        self.assertEquals(log, csv_log)
         self.assertEquals(
             out.getvalue(),
             '  # TEST                      SAMPLES MIN(μs) MAX(μs)' +
             ' MEAN(μs) SD(μs) MEDIAN(μs) MAX_RSS(B)\n' +
             '  3 b1                              1     123     123' +
             '      123      0        123        888\n' +
-            '    Totals                          1                ' +
-            '                                      \n')
+            '\n' +
+            'Total performance tests executed: 1\n')
 
     def test_log_results(self):
         """Create log directory if it doesn't exist and write the log file."""

benchmark/scripts/test_compare_perf_tests.py

@@ -328,7 +328,7 @@ def test_parse_results_csv(self):
         log = """#,TEST,SAMPLES,MIN(us),MAX(us),MEAN(us),SD(us),MEDIAN(us)
 34,BitCount,20,3,4,4,0,4
 
-Totals,269
+Total performance tests executed: 1
 """
         parser = LogParser()
         results = parser.parse_results(log.splitlines())
@@ -347,7 +347,9 @@ def test_parse_results_formatted_text(self):
         log = ("""
   # TEST      SAMPLES MIN(μs) MAX(μs) MEAN(μs) SD(μs) MEDIAN(μs) MAX_RSS(B)
   3 Array2D        20    2060    2188     2099      0       2099   20915200
-    Totals        281""")
+
+Total performance tests executed: 1
+""")
         parser = LogParser()
         results = parser.parse_results(log.splitlines()[1:])  # without 1st \n
         self.assertTrue(isinstance(results[0], PerformanceTestResult))

benchmark/utils/DriverUtils.swift

@@ -443,8 +443,7 @@ func runBenchmarks(_ c: TestConfig) {
     report(index, test, results:runBench(test, c))
   }
 
-  print("")
-  print("Totals\(c.delim)\(testCount)")
+  print("\nTotal performance tests executed: \(testCount)")
 }
 
 public func main() {