Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerstats: update CLx-DVFS state residency

Browse source 
Bug: 254026553
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: Idd69fba97968d49434ab8fe2422593f8af54fc83
Signed-off-by: Darren Hsu <darrenhsu@google.com>
This commit is contained in:
Darren Hsu 2022-10-17 21:47:25 +08:00
parent a2d00c609c
commit c2b947484a
1 changed files with 18 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

94
powerstats/ZumaCommonDataProviders.cpp
View file

@ -179,72 +179,6 @@ void addDvfsStats(std::shared_ptr<PowerStats> p) {
std::make_pair("421MHz", "421000"), std::make_pair("421MHz", "421000"),
}}); }});
cfgs.push_back({"CL0", {
std::make_pair("2253MHz", "2253000"),
std::make_pair("2147MHz", "2147000"),
std::make_pair("2098MHz", "2098000"),
std::make_pair("2024MHz", "2024000"),
std::make_pair("1950MHz", "1950000"),
std::make_pair("1844MHz", "1844000"),
std::make_pair("1704MHz", "1704000"),
std::make_pair("1548MHz", "1548000"),
std::make_pair("1475MHz", "1475000"),
std::make_pair("1328MHz", "1328000"),
std::make_pair("1197MHz", "1197000"),
std::make_pair("1098MHz", "1098000"),
std::make_pair("975MHz", "975000"),
std::make_pair("820MHz", "820000"),
std::make_pair("615MHz", "615000"),
std::make_pair("324MHz", "324000"),
std::make_pair("0MHz", "0"),
}});
cfgs.push_back({"CL1", {
std::make_pair("2600MHz", "2600000"),
std::make_pair("2550MHz", "2550000"),
std::make_pair("2450MHz", "2450000"),
std::make_pair("2352MHz", "2352000"),
std::make_pair("2245MHz", "2245000"),
std::make_pair("2130MHz", "2130000"),
std::make_pair("1999MHz", "1999000"),
std::make_pair("1836MHz", "1836000"),
std::make_pair("1622MHz", "1622000"),
std::make_pair("1549MHz", "1549000"),
std::make_pair("1418MHz", "1418000"),
std::make_pair("1328MHz", "1328000"),
std::make_pair("1221MHz", "1221000"),
std::make_pair("1082MHz", "1082000"),
std::make_pair("910MHz", "910000"),
std::make_pair("721MHz", "721000"),
std::make_pair("697MHz", "697000"),
std::make_pair("578MHz", "578000"),
std::make_pair("402MHz", "402000"),
std::make_pair("0MHz", "0"),
}});
cfgs.push_back({"CL2", {
std::make_pair("3310MHz", "3310000"),
std::make_pair("3178MHz", "3178000"),
std::make_pair("3015MHz", "3015000"),
std::make_pair("2914MHz", "2914000"),
std::make_pair("2802MHz", "2802000"),
std::make_pair("2687MHz", "2687000"),
std::make_pair("2556MHz", "2556000"),
std::make_pair("2409MHz", "2409000"),
std::make_pair("2294MHz", "2294000"),
std::make_pair("2147MHz", "2147000"),
std::make_pair("2049MHz", "2049000"),
std::make_pair("1901MHz", "1901000"),
std::make_pair("1852MHz", "1852000"),
std::make_pair("1745MHz", "1745000"),
std::make_pair("1557MHz", "1557000"),
std::make_pair("1328MHz", "1328000"),
std::make_pair("1164MHz", "1164000"),
std::make_pair("893MHz", "893000"),
std::make_pair("500MHz", "500000"),
std::make_pair("0MHz", "0"),
}});
cfgs.push_back({"TPU", { cfgs.push_back({"TPU", {
std::make_pair("1066MHz", "1066000"), std::make_pair("1066MHz", "1066000"),
std::make_pair("845MHz", "845000"), std::make_pair("845MHz", "845000"),
@ -588,6 +522,18 @@ void addPowerDomains(std::shared_ptr<PowerStats> p) {
} }
void addDevfreq(std::shared_ptr<PowerStats> p) { void addDevfreq(std::shared_ptr<PowerStats> p) {
p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
"CL0",
"/sys/devices/system/cpu/cpufreq/policy0/stats"));
p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
"CL1",
"/sys/devices/system/cpu/cpufreq/policy4/stats"));
p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
"CL2",
"/sys/devices/system/cpu/cpufreq/policy8/stats"));
p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>( p->addStateResidencyDataProvider(std::make_unique<DevfreqStateResidencyDataProvider>(
"INT", "INT",
"/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int")); "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int"));
@ -653,24 +599,20 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
void addZumaCommonDataProviders(std::shared_ptr<PowerStats> p) { void addZumaCommonDataProviders(std::shared_ptr<PowerStats> p) {
setEnergyMeter(p); setEnergyMeter(p);
addPixelStateResidencyDataProvider(p);
addAoC(p); addAoC(p);
addDvfsStats(p); addPixelStateResidencyDataProvider(p);
addSoC(p);
addCPUclusters(p); addCPUclusters(p);
addGPU(p); addSoC(p);
addMobileRadio(p);
addGNSS(p); addGNSS(p);
addMobileRadio(p);
addPCIe(p); addPCIe(p);
addWifi(p); addWifi(p);
addTPU(p);
addUfs(p); addUfs(p);
addPowerDomains(p); addPowerDomains(p);
addDevfreq(p); addDevfreq(p);
addTPU(p); addGPU(p);
addDvfsStats(p);
// TODO (b/181070764) (b/182941084):
// Remove this when Wifi/BT energy consumption models are available or revert before ship
addPlaceholderEnergyConsumers(p);
} }
void addNFC(std::shared_ptr<PowerStats> p, const std::string& path) { void addNFC(std::shared_ptr<PowerStats> p, const std::string& path) {