Chrome remote control multi-page tests: Enable printing out histograms.

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 math
 
 # Valid values of result type.
 RESULT_TYPES = {'unimportant': 'RESULT ',
                 'default': '*RESULT ',
-                'informational': ''}
+                'informational': '',
+                'unimportant-histogram': 'HISTOGRAM ',
+                'histogram': '*HISTOGRAM '}
 
 
 def _EscapePerfResult(s):
   """Escapes |s| for use in a perf result."""
   # Colons (:) and equal signs (=) are not allowed, and we chose an arbitrary
   # limit of 40 chars.
   return re.sub(':|=', '_', s[:40])
 
 
 def PrintPerfResult(measurement, trace, values, units, result_type='default',
@@ skipping 12 matching lines @@
         '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
 
-  assert isinstance(values, list)
-  assert len(values)
-  assert '/' not in measurement
-  avg = None
-  sd = None
-  if len(values) > 1:
-    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)
+  if (result_type == 'unimportant' or result_type == 'default' or
+      result_type == 'informational'):

[tonyg, 2012/10/30 15:52:59]

if result_type in ['unimportant', 'default', 'informational']:

[marja, 2012/10/30 17:19:01]

Done.

+    assert isinstance(values, list)
+    assert len(values)
+    assert '/' not in measurement
+    avg = None
+    sd = None
+    if len(values) > 1:
+      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]
   else:
-    value = values[0]
+    value = values
+    avg = None

[tonyg, 2012/10/30 15:52:59]

Is it too much code to go ahead and calculate the average here? It would be
really useful when running the tests manually because the histogram output would
otherwise be impossible to parse manually.

[marja, 2012/10/30 17:19:01]

Duplicated the code from the page cycler log parser here.

+    sd = None
 
   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,
@@ skipping 39 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))