From 45d556e196d31dc635b46391718fe656522a4450 Mon Sep 17 00:00:00 2001
From: Marissa Wall <marissaw@google.com>
Date: Fri, 14 Jul 2017 10:32:22 -0700
Subject: [PATCH] Power Profile: update taimen

Updating all power profiles using the same scripts. Previously,
every power profile was generated using different algorithims.
b/62389228

Test: Run a normal android workload and verify the app blame
  is reasonable

Change-Id: Idff05eb0fa776a3dae7bde2952ec80b031834d54
---
 .../base/core/res/res/xml/power_profile.xml   | 313 ++++++++++--------
 1 file changed, 168 insertions(+), 145 deletions(-)

diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 464e004..1fcf817 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -1,157 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <device name="Android">
-   <!--Item not being relevant anymore:
-       bluetooth.active, bluetooth.on,
-       wifi.on, wifi.active, wifi.scan as they shoud be provided by WifiActivityEnergyInfo
-       dsp.audio, dsp.video
-  -->
-  <item name="cpu.idle">6</item>
+    <!-- All values are in mAh except as noted -->
 
-  <item name="cpu.awake">11</item>
+    <!-- Nothing -->
+    <item name="none">0</item>
 
-  <item name="gps.on">30</item>
+    <!-- This is the battery capacity in mAh -->
+    <item name="battery.capacity">3520</item>
 
-  <item name="radio.active">50</item>
-  <item name="radio.scanning">5</item>
-  <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
-    <value>6</value>      <!-- none -->
-    <value>5</value>      <!-- poor -->
-    <value>4</value>      <!-- moderate -->
-    <value>3</value>      <!-- good -->
-    <value>3</value>      <!-- great -->
-  </array>
+    <!-- Number of cores each CPU cluster contains -->
+    <array name="cpu.clusters.cores">
+        <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
+        <value>4</value> <!-- Cluster 1 has 4 cores (cpu4, cpu5, cpu5, cpu7) -->
+    </array>
 
-  <item name="wifi.controller.voltage">0</item>
+    <!-- Power consumption when CPU is suspended -->
+    <item name="cpu.idle">6.957</item>
+    <!-- Additional power consumption when CPU is in a kernel idle loop -->
+    <item name="cpu.awake">2.855</item>
 
-  <array name="cpu.clusters.cores">
-    <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
-    <value>4</value> <!-- Cluster 1 has 4 cores (cpu4, cpu5, cpu5, cpu7) -->
-  </array>
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpu0/cpufreq/stats/scaling_available_frequencies -->
+    <array name="cpu.speeds.cluster0">
+        <value>300000</value> <!-- 300 MHz CPU speed -->
+        <value>364800</value> <!-- 364 MHz CPU speed -->
+        <value>441600</value> <!-- 441 MHz CPU speed -->
+        <value>518400</value> <!-- 518 MHz CPU speed -->
+        <value>595200</value> <!-- 595 MHz CPU speed -->
+        <value>672000</value> <!-- 672 MHz CPU speed -->
+        <value>748800</value> <!-- 748 MHz CPU speed -->
+        <value>825600</value> <!-- 825 MHz CPU speed -->
+        <value>883200</value> <!-- 883 MHz CPU speed -->
+        <value>960000</value> <!-- 960 MHz CPU speed -->
+        <value>1036800</value> <!-- 1036 MHz CPU speed -->
+        <value>1094400</value> <!-- 1094 MHz CPU speed -->
+        <value>1171200</value> <!-- 1171 MHz CPU speed -->
+        <value>1248000</value> <!-- 1248 MHz CPU speed -->
+        <value>1324800</value> <!-- 1324 MHz CPU speed -->
+        <value>1401600</value> <!-- 1401 MHz CPU speed -->
+        <value>1478400</value> <!-- 1478 MHz CPU speed -->
+        <value>1555200</value> <!-- 1555 MHz CPU speed -->
+        <value>1670400</value> <!-- 1670 MHz CPU speed -->
+        <value>1747200</value> <!-- 1747 MHz CPU speed -->
+        <value>1824000</value> <!-- 1824 MHz CPU speed -->
+        <value>1900800</value> <!-- 1900 MHz CPU speed -->
+    </array>
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpu4/cpufreq/stats/scaling_available_frequencies -->
+    <array name="cpu.speeds.cluster1">
+        <value>300000</value> <!-- 300 MHz CPU speed -->
+        <value>345600</value> <!-- 345 MHz CPU speed -->
+        <value>422400</value> <!-- 422 MHz CPU speed -->
+        <value>499200</value> <!-- 499 MHz CPU speed -->
+        <value>576000</value> <!-- 576 MHz CPU speed -->
+        <value>652800</value> <!-- 652 MHz CPU speed -->
+        <value>729600</value> <!-- 729 MHz CPU speed -->
+        <value>806400</value> <!-- 806 MHz CPU speed -->
+        <value>902400</value> <!-- 902 MHz CPU speed -->
+        <value>979200</value> <!-- 979 MHz CPU speed -->
+        <value>1056000</value> <!-- 1056 MHz CPU speed -->
+        <value>1132800</value> <!-- 1132 MHz CPU speed -->
+        <value>1190400</value> <!-- 1190 MHz CPU speed -->
+        <value>1267200</value> <!-- 1267 MHz CPU speed -->
+        <value>1344000</value> <!-- 1344 MHz CPU speed -->
+        <value>1420800</value> <!-- 1420 MHz CPU speed -->
+        <value>1497600</value> <!-- 1497 MHz CPU speed -->
+        <value>1574400</value> <!-- 1574 MHz CPU speed -->
+        <value>1651200</value> <!-- 1651 MHz CPU speed -->
+        <value>1728000</value> <!-- 1728 MHz CPU speed -->
+        <value>1804800</value> <!-- 1804 MHz CPU speed -->
+        <value>1881600</value> <!-- 1881 MHz CPU speed -->
+        <value>1958400</value> <!-- 1958 MHz CPU speed -->
+        <value>2035200</value> <!-- 2035 MHz CPU speed -->
+        <value>2112000</value> <!-- 2112 MHz CPU speed -->
+        <value>2208000</value> <!-- 2208 MHz CPU speed -->
+        <value>2265600</value> <!-- 2265 MHz CPU speed -->
+        <value>2323200</value> <!-- 2323 MHz CPU speed -->
+        <value>2342400</value> <!-- 2342 MHz CPU speed -->
+        <value>2361600</value> <!-- 2361 MHz CPU speed -->
+        <value>2457600</value> <!-- 2457 MHz CPU speed -->
+    </array>
 
-  <!-- Different CPU speeds as reported in
-       /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
-  <array name="cpu.speeds.cluster0">
-    <value>300000</value>
-    <value>364800</value>
-    <value>441600</value>
-    <value>518400</value>
-    <value>595200</value>
-    <value>672000</value>
-    <value>748800</value>
-    <value>825600</value>
-    <value>883200</value>
-    <value>960000</value>
-    <value>1036800</value>
-    <value>1094400</value>
-    <value>1171200</value>
-    <value>1248000</value>
-    <value>1324800</value>
-    <value>1401600</value>
-    <value>1478400</value>
-    <value>1555200</value>
-    <value>1670400</value>
-    <value>1747200</value>
-    <value>1824000</value>
-    <value>1900800</value>
-  </array>
+    <!-- Additional power used by a CPU from cluster 0 when running at different
+         speeds. Currently this measurement also includes cluster cost. -->
+    <array name="cpu.active.cluster0">
+        <value>92.451</value> <!-- 300 MHz CPU speed -->
+        <value>93.158</value> <!-- 364 MHz CPU speed -->
+        <value>93.997</value> <!-- 441 MHz CPU speed -->
+        <value>94.915</value> <!-- 518 MHz CPU speed -->
+        <value>95.686</value> <!-- 595 MHz CPU speed -->
+        <value>96.295</value> <!-- 672 MHz CPU speed -->
+        <value>97.031</value> <!-- 748 MHz CPU speed -->
+        <value>97.804</value> <!-- 825 MHz CPU speed -->
+        <value>99.095</value> <!-- 883 MHz CPU speed -->
+        <value>100.005</value> <!-- 960 MHz CPU speed -->
+        <value>101.407</value> <!-- 1036 MHz CPU speed -->
+        <value>102.484</value> <!-- 1094 MHz CPU speed -->
+        <value>104.247</value> <!-- 1171 MHz CPU speed -->
+        <value>106.340</value> <!-- 1248 MHz CPU speed -->
+        <value>107.756</value> <!-- 1324 MHz CPU speed -->
+        <value>109.728</value> <!-- 1401 MHz CPU speed -->
+        <value>110.122</value> <!-- 1478 MHz CPU speed -->
+        <value>112.570</value> <!-- 1555 MHz CPU speed -->
+        <value>117.837</value> <!-- 1670 MHz CPU speed -->
+        <value>130.354</value> <!-- 1747 MHz CPU speed -->
+        <value>133.134</value> <!-- 1824 MHz CPU speed -->
+        <value>137.809</value> <!-- 1900 MHz CPU speed -->
+    </array>
+    <!-- Additional power used by a CPU from cluster 1 when running at different
+         speeds. Currently this measurement also includes cluster cost. -->
+    <array name="cpu.active.cluster1">
+        <value>102.305</value> <!-- 300 MHz CPU speed -->
+        <value>103.782</value> <!-- 345 MHz CPU speed -->
+        <value>106.156</value> <!-- 422 MHz CPU speed -->
+        <value>109.347</value> <!-- 499 MHz CPU speed -->
+        <value>111.951</value> <!-- 576 MHz CPU speed -->
+        <value>114.418</value> <!-- 652 MHz CPU speed -->
+        <value>118.203</value> <!-- 729 MHz CPU speed -->
+        <value>119.348</value> <!-- 806 MHz CPU speed -->
+        <value>123.105</value> <!-- 902 MHz CPU speed -->
+        <value>125.068</value> <!-- 979 MHz CPU speed -->
+        <value>127.789</value> <!-- 1056 MHz CPU speed -->
+        <value>130.686</value> <!-- 1132 MHz CPU speed -->
+        <value>135.918</value> <!-- 1190 MHz CPU speed -->
+        <value>138.613</value> <!-- 1267 MHz CPU speed -->
+        <value>142.436</value> <!-- 1344 MHz CPU speed -->
+        <value>148.186</value> <!-- 1420 MHz CPU speed -->
+        <value>154.753</value> <!-- 1497 MHz CPU speed -->
+        <value>160.137</value> <!-- 1574 MHz CPU speed -->
+        <value>164.933</value> <!-- 1651 MHz CPU speed -->
+        <value>172.082</value> <!-- 1728 MHz CPU speed -->
+        <value>181.209</value> <!-- 1804 MHz CPU speed -->
+        <value>201.205</value> <!-- 1881 MHz CPU speed -->
+        <value>205.762</value> <!-- 1958 MHz CPU speed -->
+        <value>229.152</value> <!-- 2035 MHz CPU speed -->
+        <value>244.584</value> <!-- 2112 MHz CPU speed -->
+        <value>296.146</value> <!-- 2208 MHz CPU speed -->
+        <value>314.341</value> <!-- 2265 MHz CPU speed -->
+        <value>334.633</value> <!-- 2323 MHz CPU speed -->
+        <value>344.553</value> <!-- 2342 MHz CPU speed -->
+        <value>351.063</value> <!-- 2361 MHz CPU speed -->
+        <value>347.850</value> <!-- 2457 MHz CPU speed -->
+    </array>
 
-  <array name="cpu.active.cluster0">
-    <value>125.927994</value>
-    <value>125.343994</value>
-    <value>126.192001</value>
-    <value>127.300003</value>
-    <value>128.143005</value>
-    <value>128.007004</value>
-    <value>126.160995</value>
-    <value>127.184006</value>
-    <value>128.455994</value>
-    <value>132.464005</value>
-    <value>133.457001</value>
-    <value>136.403000</value>
-    <value>138.167007</value>
-    <value>139.893005</value>
-    <value>141.796005</value>
-    <value>143.692001</value>
-    <value>146.570999</value>
-    <value>148.878006</value>
-    <value>153.154007</value>
-    <value>157.662994</value>
-    <value>160.550003</value>
-    <value>166.753006</value>
-  </array>
+    <!-- Additional power used when screen is turned on at minimum brightness -->
+    <item name="screen.on">152.118</item>
+    <!-- Additional power used when screen is at maximum brightness, compared to
+         screen at minimum brightness -->
+    <item name="screen.full">532.322</item>
 
-  <!-- Different CPU speeds as reported in
-       /sys/devices/system/cpu/cpu4/cpufreq/stats/time_in_state -->
-  <array name="cpu.speeds.cluster1">
-    <value>300000</value>
-    <value>345600</value>
-    <value>422400</value>
-    <value>499200</value>
-    <value>576000</value>
-    <value>652800</value>
-    <value>729600</value>
-    <value>806400</value>
-    <value>902400</value>
-    <value>979200</value>
-    <value>1056000</value>
-    <value>1132800</value>
-    <value>1190400</value>
-    <value>1267200</value>
-    <value>1344000</value>
-    <value>1420800</value>
-    <value>1497600</value>
-    <value>1574400</value>
-    <value>1651200</value>
-    <value>1728000</value>
-    <value>1804800</value>
-    <value>1881600</value>
-    <value>1958400</value>
-    <value>2035200</value>
-    <value>2112000</value>
-    <value>2208000</value>
-    <value>2265600</value>
-    <value>2323200</value>
-    <value>2342400</value>
-    <value>2361600</value>
-    <value>2457600</value>
-  </array>
+    <!-- Average power used by the camera flash module when on -->
+    <item name="camera.flashlight">275.816</item>
+    <!-- Average power use by the camera subsystem for a typical camera
+         application. Intended as a rough estimate for an application running a
+         preview and capturing approximately 10 full-resolution pictures per
+         minute. -->
+    <item name="camera.avg">831.870</item>
+
+    <!-- Additional power used when audio decoding/encoding via DSP -->
+    <item name="dsp.audio">139.047</item>
+
+    <!-- Additional power used when GPS is acquiring a signal -->
+    <item name="gps.on">30</item>
+
+    <!-- Additional power used when cellular radio is transmitting/receiving -->
+    <item name="radio.active">50</item>
+    <!-- Additional power used when cellular radio is paging the tower -->
+    <item name="radio.scanning">5</item>
+    <!-- Additional power used when the cellular radio is on. Multi-value entry,
+         one per signal strength (no signal, weak, moderate, strong) -->
+    <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
+        <value>6</value>       <!-- none -->
+        <value>5</value>       <!-- poor -->
+        <value>4</value>       <!-- moderate -->
+        <value>3</value>       <!-- good -->
+        <value>3</value>       <!-- great -->
+    </array>
 
-  <array name="cpu.active.cluster1">
-    <value>135.47</value>
-    <value>134.93</value>
-    <value>137.16</value>
-    <value>140.10</value>
-    <value>143.30</value>
-    <value>146.59</value>
-    <value>139.80</value>
-    <value>137.54</value>
-    <value>139.42</value>
-    <value>140.58</value>
-    <value>142.38</value>
-    <value>143.40</value>
-    <value>167.40</value>
-    <value>159.51</value>
-    <value>175.65</value>
-    <value>181.65</value>
-    <value>187.83</value>
-    <value>195.19</value>
-    <value>201.31</value>
-    <value>208.11</value>
-    <value>218.77</value>
-    <value>230.67</value>
-    <value>238.13</value>
-    <value>258.11</value>
-    <value>270.27</value>
-    <value>296.85</value>
-    <value>311.92</value>
-    <value>336.86</value>
-    <value>343.08</value>
-    <value>351.30</value>
-    <value>352.63</value>
-  </array>
-  <item name="screen.on">165.68</item>
-  <item name="screen.full">135</item>
-  <item name="camera.flashlight">240.10</item>
-  <item name="camera.avg">870</item>
-  <item name="battery.capacity">3620</item>
 </device>