Revert 169327 - Fix histogram printing for Telemetry tests.

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 android_commands
 import json
 import math
 
@@ skipping 43 matching lines @@
     try:
       value = '[%s]' % ','.join([str(v) for v in values])
       avg = sum([float(v) for v in values]) / len(values)
       sqdiffs = [(float(v) - avg) ** 2 for v in values]
       variance = sum(sqdiffs) / (len(values) - 1)
       sd = math.sqrt(variance)
     except ValueError:
       value = ", ".join(values)
   else:
     value = values[0]
-    avg = values[0]
   return value, avg, sd
 
 
 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.
     units: A description of the units of measure, e.g. "bytes".
-    result_type: Accepts values of RESULT_TYPES.
+    result_type: A  tri-state that accepts values of ['unimportant', 'default',
+        'informational']. 'unimportant' prints RESULT, 'default' prints *RESULT
+        and 'informational' prints nothing.
     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)
-    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:
-    assert(result_type in ['histogram', 'unimportant-histogram'])
-    assert isinstance(values, list)
-    assert len(values)
-    # Print out each histogram separately. We can't print the units, otherwise
-    # the histogram json output can't be parsed easily.
-    output = ''
-    ix = 1
-    for value in values:
-      name = '%s.%s_%d' % (_EscapePerfResult(measurement), trace_name, ix)
-      output += '%s%s%s : %s = %s' % (
-          '\n' if ix > 1 else '',
-          RESULT_TYPES[result_type],
-          name,
-          name,
-          value)
-      ix += 1
-    measurement = '%s.%s' % (measurement, trace_name)
-    means_and_sds = [GeomMeanAndStdDevFromHistogram(value) for value in values]
-    _, avg, sd = _MeanAndStdDevFromList([mean for (mean, _) in means_and_sds ])
+    value = values[0]
+    # We can't print the units, otherwise parsing the histogram json output
+    # can't be parsed easily.
+    units = ''
+    avg, sd = GeomMeanAndStdDevFromHistogram(value)
 
+  trace_name = _EscapePerfResult(trace)
+  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)
   if avg:
     output += '\nAvg %s: %f%s' % (measurement, avg, units)
   if sd:
     output += '\nSd  %s: %f%s' % (measurement, sd, units)
   if print_to_stdout:
     print output
   return output
 
 
 class PerfTestSetup(object):
@@ skipping 28 matching lines @@
   def TearDown(self):
     """Tears down performance tests."""
     if self._original_scaling_governor:
       self._SetScalingGovernorInternal(self._original_scaling_governor)
     self._original_scaling_governor = None
 
   def _SetScalingGovernorInternal(self, value):
     for cpu in range(self._num_cpus):
       self._adb.RunShellCommand(
           ('echo %s > ' + PerfTestSetup._SCALING_GOVERNOR) % (value, cpu))