Fix handling of aggregate times in TimerData::getResult

bench/TimerData.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "TimerData.h"
 
@@ skipping 54 matching lines @@
     double truncCpuMin = std::numeric_limits<double>::max();
     double gpuMin = std::numeric_limits<double>::max();
 
     double wallSum = 0;
     double truncWallSum = 0;
     double cpuSum = 0;
     double truncCpuSum = 0;
     double gpuSum = 0;
 
     for (int i = 0; i < numTimings; ++i) {
         if (kPerIter_Result == result) {

[robertphillips, 2013/12/17 16:20:54]

This is modeled on what is done for kMin_Result below.

-            wallStr.appendf(doubleFormat, fWallTimes[i]);
-            truncWallStr.appendf(doubleFormat, fTruncatedWallTimes[i]);
-            cpuStr.appendf(doubleFormat, fCpuTimes[i]);
-            truncCpuStr.appendf(doubleFormat, fTruncatedCpuTimes[i]);
-            gpuStr.appendf(doubleFormat, fGpuTimes[i]);
+            wallStr.appendf(doubleFormat, fWallTimes[i] / itersPerTiming);
+            truncWallStr.appendf(doubleFormat, fTruncatedWallTimes[i] / itersPerTiming);
+            cpuStr.appendf(doubleFormat, fCpuTimes[i] / itersPerTiming);
+            truncCpuStr.appendf(doubleFormat, fTruncatedCpuTimes[i] / itersPerTiming);
+            gpuStr.appendf(doubleFormat, fGpuTimes[i] / itersPerTiming);
 
             if (i != numTimings - 1) {
                 static const char kSep[] = ", ";
                 wallStr.append(kSep);
                 truncWallStr.append(kSep);
                 cpuStr.append(kSep);
                 truncCpuStr.append(kSep);
                 gpuStr.append(kSep);
             }
         } else if (kMin_Result == result) {
@@ skipping 42 matching lines @@
         str += cpuStr;
     }
     if (timerFlags & kTruncatedCpu_Flag) {
         str += truncCpuStr;
     }
     if ((timerFlags & kGpu_Flag) && gpuSum > 0) {
         str += gpuStr;
     }
     return str;
 }