[Telemetry] CPU stats are added to results and always reported on CrOS.

BUG=

Review URL: https://codereview.chromium.org/499563004

Cr-Commit-Position: refs/heads/master@{#291458}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291458 0039d316-1c4b-4281-b951-d872f2087c98

tools/perf/metrics/power.py

@@ -138,6 +138,24 @@ class PowerMetric(Metric):
           results.current_page, 'board_temperature', 'celsius',
           board_temperature_c, important=False))
 
+    # Add CPU frequency measurements.
+    frequency_hz = whole_package_utilization.get('frequency_percent')
+    if frequency_hz is not None:
+      frequency_sum = 0.0
+      for freq, percent in frequency_hz.iteritems():
+        frequency_sum += freq * (percent / 100.0)
+      results.AddValue(scalar.ScalarValue(
+          results.current_page, 'cpu_average_frequency_hz', 'Hz',
+          frequency_sum, important=False))
+
+    # Add CPU c-state residency measurements.
+    cstate_percent = whole_package_utilization.get('cstate_residency_percent')
+    if cstate_percent is not None:
+      for state, percent in cstate_percent.iteritems():
+        results.AddValue(scalar.ScalarValue(
+            results.current_page, 'cpu_cstate_%s_residency_percent' % state,
+            '%', percent, important=False))
+
     self._results = None
 
 def _SubtractCpuStats(cpu_stats, start_cpu_stats):

tools/telemetry/telemetry/core/platform/power_monitor/cros_power_monitor.py

@@ -35,22 +35,25 @@ class CrosPowerMonitor(sysfs_power_monitor.SysfsPowerMonitor):
 
   @decorators.Cache
   def CanMonitorPower(self):
-    return self._IsOnBatteryPower()
+    return super(CrosPowerMonitor, self).CanMonitorPower()
 
   def StartMonitoringPower(self, browser):
     super(CrosPowerMonitor, self).StartMonitoringPower(browser)
-    self._initial_power = self._cri.RunCmdOnDevice(['power_supply_info'])[0]
-    self._start_time = int(self._cri.RunCmdOnDevice(['date', '+%s'])[0])
+    if self._IsOnBatteryPower():
+      self._initial_power = self._cri.RunCmdOnDevice(['power_supply_info'])[0]
+      self._start_time = int(self._cri.RunCmdOnDevice(['date', '+%s'])[0])
 
   def StopMonitoringPower(self):
     cpu_stats = super(CrosPowerMonitor, self).StopMonitoringPower()
-    final_power = self._cri.RunCmdOnDevice(['power_supply_info'])[0]
-    self._end_time = int(self._cri.RunCmdOnDevice(['date', '+%s'])[0])
-    # The length of the test is used to measure energy consumption.
-    length_h = (self._end_time - self._start_time) / 3600.0
-    power_stats = CrosPowerMonitor.ParsePower(
-        self._initial_power, final_power, length_h)
-    return super(CrosPowerMonitor, self).CombineResults(cpu_stats, power_stats)
+    power_stats = {}
+    if self._IsOnBatteryPower():
+      final_power = self._cri.RunCmdOnDevice(['power_supply_info'])[0]
+      self._end_time = int(self._cri.RunCmdOnDevice(['date', '+%s'])[0])
+      # The length of the test is used to measure energy consumption.
+      length_h = (self._end_time - self._start_time) / 3600.0
+      power_stats = CrosPowerMonitor.ParsePower(self._initial_power,
+                                                final_power, length_h)
+    return CrosPowerMonitor.CombineResults(cpu_stats, power_stats)
 
   @staticmethod
   def IsOnBatteryPower(status, board):