Allow for lists of lists when summarizing performance results

build/android/pylib/perf_tests_helper.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 import sys
 
 import android_commands
 import json
 import logging
 import math
 
 # Valid values of result type.
 RESULT_TYPES = {'unimportant': 'RESULT ',
                 'default': '*RESULT ',
                 'informational': '',
                 'unimportant-histogram': 'HISTOGRAM ',
                 'histogram': '*HISTOGRAM '}
 
 
 def _EscapePerfResult(s):
   """Escapes |s| for use in a perf result."""
   return re.sub('[\:|=/#&,]', '_', s)
 
 
+def _Flatten(values):
+  """Returns a simple list without sub-lists."""
+  ret = []
+  for entry in values:
+    if isinstance(entry, list):
+      ret.extend(_Flatten(entry))
+    else:
+      ret.append(entry)
+  return ret
+
+
 def GeomMeanAndStdDevFromHistogram(histogram_json):
   histogram = json.loads(histogram_json)
   # Handle empty histograms gracefully.
   if not 'buckets' in histogram:
     return 0.0, 0.0
   count = 0
   sum_of_logs = 0
   for bucket in histogram['buckets']:
     if 'high' in bucket:
       bucket['mean'] = (bucket['low'] + bucket['high']) / 2.0
@@ skipping 39 matching lines @@
 def PrintPerfResult(measurement, trace, values, units, result_type='default',
                     print_to_stdout=True):
   """Prints numerical data to stdout in the format required by perf tests.
 
   The string args may be empty but they must not contain any colons (:) or
   equals signs (=).
 
   Args:
     measurement: A description of the quantity being measured, e.g. "vm_peak".
     trace: A description of the particular data point, e.g. "reference".
-    values: A list of numeric measured values.
+    values: A list of numeric measured values. An N-dimensional list will be
+        flattened and treated as a simple list.
     units: A description of the units of measure, e.g. "bytes".
     result_type: Accepts values of RESULT_TYPES.
     print_to_stdout: If True, prints the output in stdout instead of returning
         the output to caller.
 
     Returns:
       String of the formated perf result.
   """
   assert result_type in RESULT_TYPES, 'result type: %s is invalid' % result_type
 
   trace_name = _EscapePerfResult(trace)
 
   if result_type in ['unimportant', 'default', 'informational']:
     assert isinstance(values, list)
     assert len(values)
     assert '/' not in measurement
-    value, avg, sd = _MeanAndStdDevFromList(values)
+    value, avg, sd = _MeanAndStdDevFromList(_Flatten(values))
     output = '%s%s: %s%s%s %s' % (
         RESULT_TYPES[result_type],
         _EscapePerfResult(measurement),
         trace_name,
         # Do not show equal sign if the trace is empty. Usually it happens when
         # measurement is enough clear to describe the result.
         '= ' if trace_name else '',
         value,
         units)
   else:
@@ skipping 68 matching lines @@
     """Resets the original performance mode of the device."""
     self._SetScalingGovernorInternal(self._original_scaling_governor)
 
   def _SetScalingGovernorInternal(self, value):
     for cpu in range(self._kernel_max + 1):
       scaling_governor_file = PerfControl._SCALING_GOVERNOR_FMT % cpu
       if self._adb.FileExistsOnDevice(scaling_governor_file):
         logging.info('Writing scaling governor mode \'%s\' -> %s' %
                      (value, scaling_governor_file))
         self._adb.SetProtectedFileContents(scaling_governor_file, value)