powerstats: fix GPU and TPU energy consumer issue
1. S2S_VDD_G3D is only one monitored rail for GPU. 2. TPU rail has been renamed to S7M_VDD_TPU. 3. TPU frequencies have been changed. Bug: 339320507 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I5e965e9d58a1ae08706fb46c6a4fc9549a889352 Signed-off-by: Darren Hsu <darrenhsu@google.com>
This commit is contained in:
parent
f8784de7c9
commit
a4c83326a4
1 changed files with 8 additions and 5 deletions
|
@ -365,7 +365,7 @@ void addGPU(std::shared_ptr<PowerStats> p) {
|
||||||
{"890000", 4333}};
|
{"890000", 4333}};
|
||||||
|
|
||||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
|
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
|
||||||
EnergyConsumerType::OTHER, "GPU", {"S2S_VDD_G3D", "S8S_VDD_G3D_L2"},
|
EnergyConsumerType::OTHER, "GPU", {"S2S_VDD_G3D"},
|
||||||
{{UID_TIME_IN_STATE, path + "/uid_time_in_state"}},
|
{{UID_TIME_IN_STATE, path + "/uid_time_in_state"}},
|
||||||
stateCoeffs));
|
stateCoeffs));
|
||||||
|
|
||||||
|
@ -638,12 +638,15 @@ void addTPU(std::shared_ptr<PowerStats> p) {
|
||||||
stateCoeffs = {
|
stateCoeffs = {
|
||||||
// TODO (b/197721618): Measuring the TPU power numbers
|
// TODO (b/197721618): Measuring the TPU power numbers
|
||||||
{"226000", 10},
|
{"226000", 10},
|
||||||
{"627000", 20},
|
{"455000", 20},
|
||||||
{"845000", 30},
|
{"627000", 30},
|
||||||
{"1066000", 40}};
|
{"712000", 40},
|
||||||
|
{"845000", 50},
|
||||||
|
{"967000", 60}, // Do not change to 1066000
|
||||||
|
{"1119000", 70}};
|
||||||
|
|
||||||
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
|
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
|
||||||
EnergyConsumerType::OTHER, "TPU", {"S10M_VDD_TPU"},
|
EnergyConsumerType::OTHER, "TPU", {"S7M_VDD_TPU"},
|
||||||
{{UID_TIME_IN_STATE, "/sys/class/edgetpu/edgetpu-soc/device/tpu_usage"}},
|
{{UID_TIME_IN_STATE, "/sys/class/edgetpu/edgetpu-soc/device/tpu_usage"}},
|
||||||
stateCoeffs));
|
stateCoeffs));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue