Skip to content
Snippets Groups Projects
Commit 53a6f56c authored by samou's avatar samou Committed by Sam Ou
Browse files

power_profile: Correct CPU topology and update power number 


Bug: 219870109
Signed-off-by: default avatarsamou <samou@google.com>
Change-Id: I45b40c4f2f1942d7246d5dbc5fdb237a6ecc571c
parent 2f6ddb4e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+ 53
− 58
View file @ 53a6f56c
......@@ -25,16 +25,15 @@
<value>2</value> <!-- Cluster 2 has 2 cores (cpu6, cpu7) -->
</array>
<!-- TODO(b/219870109): cpu numbers need to update using DVT.-->
<item name="cpu.suspend">10</item>
<item name="cpu.idle">28.6</item>
<item name="cpu.active">12.37</item>
<item name="cpu.cluster_power.cluster0">0.24</item>
<item name="cpu.cluster_power.cluster1">3.23</item>
<item name="cpu.cluster_power.cluster2">5.94</item>
<item name="cpu.suspend">13.3</item>
<item name="cpu.idle">35.6</item>
<item name="cpu.active">8.2</item>
<item name="cpu.cluster_power.cluster0">0</item>
<item name="cpu.cluster_power.cluster1">1.16</item>
<item name="cpu.cluster_power.cluster2">1.53</item>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies -->
<array name="cpu.core_speeds.cluster0">
<value>300000</value> <!-- 300 MHz CPU speed -->
<value>574000</value> <!-- 574 MHz CPU speed -->
......@@ -47,12 +46,10 @@
<value>1598000</value> <!-- 1598 MHz CPU speed -->
<value>1704000</value> <!-- 1704 MHz CPU speed -->
<value>1803000</value> <!-- 1803 MHz CPU speed -->
<value>1950000</value> <!-- 1950 MHz CPU speed -->
<value>2024000</value> <!-- 2024 MHz CPU speed -->
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpufreq/ploicy4/scaling_available_frequencies -->
/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies -->
<array name="cpu.core_speeds.cluster1">
<value>400000</value> <!-- 400 MHz CPU speed -->
<value>553000</value> <!-- 553 MHz CPU speed -->
......@@ -72,7 +69,7 @@
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpufreq/ploicy6/scaling_available_frequencies -->
/sys/devices/system/cpu/cpufreq/policy6/scaling_available_frequencies -->
<array name="cpu.core_speeds.cluster2">
<value>500000</value> <!-- 500 MHz CPU speed -->
<value>851000</value> <!-- 851 MHz CPU speed -->
......@@ -97,62 +94,60 @@
<!-- Additional power used by a CPU core from cluster 0 when running at
different speeds, excluding cluster and active cost -->
<array name="cpu.core_power.cluster0">
<value>1.89</value> <!-- 300 MHz CPU speed -->
<value>6.15</value> <!-- 574 MHz CPU speed -->
<value>9.34</value> <!-- 738 MHz CPU speed -->
<value>14.22</value> <!-- 930 MHz CPU speed -->
<value>18.94</value> <!-- 1098 MHz CPU speed -->
<value>21.98</value> <!-- 1197 MHz CPU speed -->
<value>26.83</value> <!-- 1328 MHz CPU speed -->
<value>30.17</value> <!-- 1401 MHz CPU speed -->
<value>41.55</value> <!-- 1598 MHz CPU speed -->
<value>48.36</value> <!-- 1704 MHz CPU speed -->
<value>58.45</value> <!-- 1803 MHz CPU speed -->
<value>73</value> <!-- 1950 MHz CPU speed -->
<value>80</value> <!-- 2024 MHz CPU speed -->
<value>4.71</value> <!-- 300 MHz CPU speed -->
<value>10.24</value> <!-- 574 MHz CPU speed -->
<value>13.43</value> <!-- 738 MHz CPU speed -->
<value>17.54</value> <!-- 930 MHz CPU speed -->
<value>20.79</value> <!-- 1098 MHz CPU speed -->
<value>22.82</value> <!-- 1197 MHz CPU speed -->
<value>25.55</value> <!-- 1328 MHz CPU speed -->
<value>27.03</value> <!-- 1401 MHz CPU speed -->
<value>38.2</value> <!-- 1598 MHz CPU speed -->
<value>46.69</value> <!-- 1704 MHz CPU speed -->
<value>60.01</value> <!-- 1803 MHz CPU speed -->
</array>
<!-- Additional power used by a CPU core from cluster 1 when running at
different speeds, excluding cluster and active cost -->
<array name="cpu.core_power.cluster1">
<value>3.71</value> <!-- 400 MHz CPU speed -->
<value>6.16</value> <!-- 553 MHz CPU speed -->
<value>8</value> <!-- 696 MHz CPU speed -->
<value>10.94</value> <!-- 799 MHz CPU speed -->
<value>12.73</value> <!-- 910 MHz CPU speed -->
<value>14.4</value> <!-- 1024 MHz CPU speed -->
<value>21.39</value> <!-- 1197 MHz CPU speed -->
<value>24.1</value> <!-- 1328 MHz CPU speed -->
<value>30.42</value> <!-- 1491 MHz CPU speed -->
<value>42.49</value> <!-- 1663 MHz CPU speed -->
<value>49.37</value> <!-- 1836 MHz CPU speed -->
<value>58.09</value> <!-- 1999 MHz CPU speed -->
<value>67.54</value> <!-- 2130 MHz CPU speed -->
<value>79.04</value> <!-- 2253 MHz CPU speed -->
<value>87</value> <!-- 2348 MHz CPU speed -->
<value>8.03</value> <!-- 400 MHz CPU speed -->
<value>9.37</value> <!-- 553 MHz CPU speed -->
<value>11.14</value> <!-- 696 MHz CPU speed -->
<value>12.65</value> <!-- 799 MHz CPU speed -->
<value>14.5</value> <!-- 910 MHz CPU speed -->
<value>16.33</value> <!-- 1024 MHz CPU speed -->
<value>19.81</value> <!-- 1197 MHz CPU speed -->
<value>22.79</value> <!-- 1328 MHz CPU speed -->
<value>27.68</value> <!-- 1491 MHz CPU speed -->
<value>33.78</value> <!-- 1663 MHz CPU speed -->
<value>40.65</value> <!-- 1836 MHz CPU speed -->
<value>49.57</value> <!-- 1999 MHz CPU speed -->
<value>59.19</value> <!-- 2130 MHz CPU speed -->
<value>70.22</value> <!-- 2253 MHz CPU speed -->
<value>81</value> <!-- 2348 MHz CPU speed -->
</array>
<!-- Additional power used by a CPU core from cluster 2 when running at
different speeds, excluding cluster and active cost -->
<array name="cpu.core_power.cluster2">
<value>8.36</value> <!-- 500 MHz CPU speed -->
<value>16.33</value> <!-- 851 MHz CPU speed -->
<value>19.44</value> <!-- 984 MHz CPU speed -->
<value>36.71</value> <!-- 1106 MHz CPU speed -->
<value>41.42</value> <!-- 1277 MHz CPU speed -->
<value>48.24</value> <!-- 1426 MHz CPU speed -->
<value>54.77</value> <!-- 1582 MHz CPU speed -->
<value>65.32</value> <!-- 1745 MHz CPU speed -->
<value>69.58</value> <!-- 1826 MHz CPU speed -->
<value>128.49</value> <!-- 2048 MHz CPU speed -->
<value>142.15</value> <!-- 2188 MHz CPU speed -->
<value>149.74</value> <!-- 2252 MHz CPU speed -->
<value>164.78</value> <!-- 2401 MHz CPU speed -->
<value>188.68</value> <!-- 2507 MHz CPU speed -->
<value>193.15</value> <!-- 2630 MHz CPU speed -->
<value>227.98</value> <!-- 2704 MHz CPU speed -->
<value>254.25</value> <!-- 2802 MHz CPU speed -->
<value>267</value> <!-- 2850 MHz CPU speed -->
<value>13.16</value> <!-- 500 MHz CPU speed -->
<value>19.29</value> <!-- 851 MHz CPU speed -->
<value>22.53</value> <!-- 984 MHz CPU speed -->
<value>26.11</value> <!-- 1106 MHz CPU speed -->
<value>31.73</value> <!-- 1277 MHz CPU speed -->
<value>38.12</value> <!-- 1426 MHz CPU speed -->
<value>45.44</value> <!-- 1582 MHz CPU speed -->
<value>53.15</value> <!-- 1745 MHz CPU speed -->
<value>57.1</value> <!-- 1826 MHz CPU speed -->
<value>71.92</value> <!-- 2048 MHz CPU speed -->
<value>83.89</value> <!-- 2188 MHz CPU speed -->
<value>90.36</value> <!-- 2252 MHz CPU speed -->
<value>108.58</value> <!-- 2401 MHz CPU speed -->
<value>129.22</value> <!-- 2507 MHz CPU speed -->
<value>147.88</value> <!-- 2630 MHz CPU speed -->
<value>164.96</value> <!-- 2704 MHz CPU speed -->
<value>188.15</value> <!-- 2802 MHz CPU speed -->
<value>202.77</value> <!-- 2850 MHz CPU speed -->
</array>
<!-- Additional power used when screen is ambient mode -->
......
panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+ 54
− 59
View file @ 53a6f56c
......@@ -17,7 +17,7 @@
*/
-->
<device name="Android">
<item name="battery.capacity">4315</item>
<item name="battery.capacity">4356</item>
<!-- Number of cores each CPU cluster contains -->
<array name="cpu.clusters.cores">
<value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
......@@ -25,16 +25,15 @@
<value>2</value> <!-- Cluster 2 has 2 cores (cpu6, cpu7) -->
</array>
<!-- TODO(b/219870109): cpu numbers need to update using DVT.-->
<item name="cpu.suspend">10</item>
<item name="cpu.idle">28.6</item>
<item name="cpu.active">12.37</item>
<item name="cpu.cluster_power.cluster0">0.24</item>
<item name="cpu.cluster_power.cluster1">3.23</item>
<item name="cpu.cluster_power.cluster2">5.94</item>
<item name="cpu.suspend">13.3</item>
<item name="cpu.idle">35.6</item>
<item name="cpu.active">8.2</item>
<item name="cpu.cluster_power.cluster0">0</item>
<item name="cpu.cluster_power.cluster1">1.16</item>
<item name="cpu.cluster_power.cluster2">1.53</item>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
/sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies -->
<array name="cpu.core_speeds.cluster0">
<value>300000</value> <!-- 300 MHz CPU speed -->
<value>574000</value> <!-- 574 MHz CPU speed -->
......@@ -47,12 +46,10 @@
<value>1598000</value> <!-- 1598 MHz CPU speed -->
<value>1704000</value> <!-- 1704 MHz CPU speed -->
<value>1803000</value> <!-- 1803 MHz CPU speed -->
<value>1950000</value> <!-- 1950 MHz CPU speed -->
<value>2024000</value> <!-- 2024 MHz CPU speed -->
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpufreq/ploicy4/scaling_available_frequencies -->
/sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies -->
<array name="cpu.core_speeds.cluster1">
<value>400000</value> <!-- 400 MHz CPU speed -->
<value>553000</value> <!-- 553 MHz CPU speed -->
......@@ -72,7 +69,7 @@
</array>
<!-- Different CPU speeds as reported in
/sys/devices/system/cpu/cpufreq/ploicy6/scaling_available_frequencies -->
/sys/devices/system/cpu/cpufreq/policy6/scaling_available_frequencies -->
<array name="cpu.core_speeds.cluster2">
<value>500000</value> <!-- 500 MHz CPU speed -->
<value>851000</value> <!-- 851 MHz CPU speed -->
......@@ -97,62 +94,60 @@
<!-- Additional power used by a CPU core from cluster 0 when running at
different speeds, excluding cluster and active cost -->
<array name="cpu.core_power.cluster0">
<value>1.89</value> <!-- 300 MHz CPU speed -->
<value>6.15</value> <!-- 574 MHz CPU speed -->
<value>9.34</value> <!-- 738 MHz CPU speed -->
<value>14.22</value> <!-- 930 MHz CPU speed -->
<value>18.94</value> <!-- 1098 MHz CPU speed -->
<value>21.98</value> <!-- 1197 MHz CPU speed -->
<value>26.83</value> <!-- 1328 MHz CPU speed -->
<value>30.17</value> <!-- 1401 MHz CPU speed -->
<value>41.55</value> <!-- 1598 MHz CPU speed -->
<value>48.36</value> <!-- 1704 MHz CPU speed -->
<value>58.45</value> <!-- 1803 MHz CPU speed -->
<value>73</value> <!-- 1950 MHz CPU speed -->
<value>80</value> <!-- 2024 MHz CPU speed -->
<value>4.71</value> <!-- 300 MHz CPU speed -->
<value>10.24</value> <!-- 574 MHz CPU speed -->
<value>13.43</value> <!-- 738 MHz CPU speed -->
<value>17.54</value> <!-- 930 MHz CPU speed -->
<value>20.79</value> <!-- 1098 MHz CPU speed -->
<value>22.82</value> <!-- 1197 MHz CPU speed -->
<value>25.55</value> <!-- 1328 MHz CPU speed -->
<value>27.03</value> <!-- 1401 MHz CPU speed -->
<value>38.2</value> <!-- 1598 MHz CPU speed -->
<value>46.69</value> <!-- 1704 MHz CPU speed -->
<value>60.01</value> <!-- 1803 MHz CPU speed -->
</array>
<!-- Additional power used by a CPU core from cluster 1 when running at
different speeds, excluding cluster and active cost -->
<array name="cpu.core_power.cluster1">
<value>3.71</value> <!-- 400 MHz CPU speed -->
<value>6.16</value> <!-- 553 MHz CPU speed -->
<value>8</value> <!-- 696 MHz CPU speed -->
<value>10.94</value> <!-- 799 MHz CPU speed -->
<value>12.73</value> <!-- 910 MHz CPU speed -->
<value>14.4</value> <!-- 1024 MHz CPU speed -->
<value>21.39</value> <!-- 1197 MHz CPU speed -->
<value>24.1</value> <!-- 1328 MHz CPU speed -->
<value>30.42</value> <!-- 1491 MHz CPU speed -->
<value>42.49</value> <!-- 1663 MHz CPU speed -->
<value>49.37</value> <!-- 1836 MHz CPU speed -->
<value>58.09</value> <!-- 1999 MHz CPU speed -->
<value>67.54</value> <!-- 2130 MHz CPU speed -->
<value>79.04</value> <!-- 2253 MHz CPU speed -->
<value>87</value> <!-- 2348 MHz CPU speed -->
<value>8.03</value> <!-- 400 MHz CPU speed -->
<value>9.37</value> <!-- 553 MHz CPU speed -->
<value>11.14</value> <!-- 696 MHz CPU speed -->
<value>12.65</value> <!-- 799 MHz CPU speed -->
<value>14.5</value> <!-- 910 MHz CPU speed -->
<value>16.33</value> <!-- 1024 MHz CPU speed -->
<value>19.81</value> <!-- 1197 MHz CPU speed -->
<value>22.79</value> <!-- 1328 MHz CPU speed -->
<value>27.68</value> <!-- 1491 MHz CPU speed -->
<value>33.78</value> <!-- 1663 MHz CPU speed -->
<value>40.65</value> <!-- 1836 MHz CPU speed -->
<value>49.57</value> <!-- 1999 MHz CPU speed -->
<value>59.19</value> <!-- 2130 MHz CPU speed -->
<value>70.22</value> <!-- 2253 MHz CPU speed -->
<value>81</value> <!-- 2348 MHz CPU speed -->
</array>
<!-- Additional power used by a CPU core from cluster 2 when running at
different speeds, excluding cluster and active cost -->
<array name="cpu.core_power.cluster2">
<value>8.36</value> <!-- 500 MHz CPU speed -->
<value>16.33</value> <!-- 851 MHz CPU speed -->
<value>19.44</value> <!-- 984 MHz CPU speed -->
<value>36.71</value> <!-- 1106 MHz CPU speed -->
<value>41.42</value> <!-- 1277 MHz CPU speed -->
<value>48.24</value> <!-- 1426 MHz CPU speed -->
<value>54.77</value> <!-- 1582 MHz CPU speed -->
<value>65.32</value> <!-- 1745 MHz CPU speed -->
<value>69.58</value> <!-- 1826 MHz CPU speed -->
<value>128.49</value> <!-- 2048 MHz CPU speed -->
<value>142.15</value> <!-- 2188 MHz CPU speed -->
<value>149.74</value> <!-- 2252 MHz CPU speed -->
<value>164.78</value> <!-- 2401 MHz CPU speed -->
<value>188.68</value> <!-- 2507 MHz CPU speed -->
<value>193.15</value> <!-- 2630 MHz CPU speed -->
<value>227.98</value> <!-- 2704 MHz CPU speed -->
<value>254.25</value> <!-- 2802 MHz CPU speed -->
<value>267</value> <!-- 2850 MHz CPU speed -->
<value>13.16</value> <!-- 500 MHz CPU speed -->
<value>19.29</value> <!-- 851 MHz CPU speed -->
<value>22.53</value> <!-- 984 MHz CPU speed -->
<value>26.11</value> <!-- 1106 MHz CPU speed -->
<value>31.73</value> <!-- 1277 MHz CPU speed -->
<value>38.12</value> <!-- 1426 MHz CPU speed -->
<value>45.44</value> <!-- 1582 MHz CPU speed -->
<value>53.15</value> <!-- 1745 MHz CPU speed -->
<value>57.1</value> <!-- 1826 MHz CPU speed -->
<value>71.92</value> <!-- 2048 MHz CPU speed -->
<value>83.89</value> <!-- 2188 MHz CPU speed -->
<value>90.36</value> <!-- 2252 MHz CPU speed -->
<value>108.58</value> <!-- 2401 MHz CPU speed -->
<value>129.22</value> <!-- 2507 MHz CPU speed -->
<value>147.88</value> <!-- 2630 MHz CPU speed -->
<value>164.96</value> <!-- 2704 MHz CPU speed -->
<value>188.15</value> <!-- 2802 MHz CPU speed -->
<value>202.77</value> <!-- 2850 MHz CPU speed -->
</array>
<!-- Additional power used when screen is ambient mode -->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment