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

Merge "powerstats: add CPU core state residency stats"

Browse source
This commit is contained in:
TreeHugger Robot 2023-01-09 09:17:44 +00:00 • committed by Android (Google) Code Review
commit 3661f28491
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
powerstats/ZumaCommonDataProviders.cpp
View file

@ -17,6 +17,7 @@
#include <PowerStatsAidl.h> #include <PowerStatsAidl.h>
#include <ZumaCommonDataProviders.h> #include <ZumaCommonDataProviders.h>
#include <AocStateResidencyDataProvider.h> #include <AocStateResidencyDataProvider.h>
#include <CpupmStateResidencyDataProvider.h>
#include <DevfreqStateResidencyDataProvider.h> #include <DevfreqStateResidencyDataProvider.h>
#include <DvfsStateResidencyDataProvider.h> #include <DvfsStateResidencyDataProvider.h>
#include <UfsStateResidencyDataProvider.h> #include <UfsStateResidencyDataProvider.h>
@ -33,6 +34,7 @@
#include <log/log.h> #include <log/log.h>
using aidl::android::hardware::power::stats::AocStateResidencyDataProvider; using aidl::android::hardware::power::stats::AocStateResidencyDataProvider;
using aidl::android::hardware::power::stats::CpupmStateResidencyDataProvider;
using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider; using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
using aidl::android::hardware::power::stats::DvfsStateResidencyDataProvider; using aidl::android::hardware::power::stats::DvfsStateResidencyDataProvider;
using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider; using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider;
@ -361,15 +363,6 @@ void addCPUclusters(std::shared_ptr<PowerStats> p) {
std::vector<GenericStateResidencyDataProvider::PowerEntityConfig> cfgs; std::vector<GenericStateResidencyDataProvider::PowerEntityConfig> cfgs;
for (std::string name : { for (std::string name : {
"CORE00",
"CORE01",
"CORE02",
"CORE03",
"CORE10",
"CORE11",
"CORE12",
"CORE13",
"CORE21",
"CLUSTER0", "CLUSTER0",
"CLUSTER1", "CLUSTER1",
"CLUSTER2"}) { "CLUSTER2"}) {
@ -380,6 +373,22 @@ void addCPUclusters(std::shared_ptr<PowerStats> p) {
p->addStateResidencyDataProvider(std::make_unique<GenericStateResidencyDataProvider>( p->addStateResidencyDataProvider(std::make_unique<GenericStateResidencyDataProvider>(
"/sys/devices/platform/acpm_stats/core_stats", cfgs)); "/sys/devices/platform/acpm_stats/core_stats", cfgs));
CpupmStateResidencyDataProvider::Config config = {
.entities = {
std::make_pair("CPU0", "cpu0"),
std::make_pair("CPU1", "cpu1"),
std::make_pair("CPU2", "cpu2"),
std::make_pair("CPU3", "cpu3"),
std::make_pair("CPU4", "cpu4"),
std::make_pair("CPU5", "cpu5"),
std::make_pair("CPU6", "cpu6"),
std::make_pair("CPU7", "cpu7")},
.states = {
std::make_pair("DOWN", "[state1]")}};
p->addStateResidencyDataProvider(std::make_unique<CpupmStateResidencyDataProvider>(
"/sys/devices/system/cpu/cpupm/cpupm/time_in_state", config));
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p,
EnergyConsumerType::CPU_CLUSTER, "CPUCL0", {"S4M_VDD_CPUCL0"})); EnergyConsumerType::CPU_CLUSTER, "CPUCL0", {"S4M_VDD_CPUCL0"}));
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer(p,