Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/power turbostat: version 2024.07.26

Browse Source 
Release 2024.07.26:

Enable turbostat extensions to add both perf and PMT
(Intel Platform Monitoring Technology) counters from the cmdline.

Demonstrate PMT access with built-in support for Meteor Lake's Die%c6 counter.

This commit:

Clean up white-space nits introduced since version 2024.05.10

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2024-07-26 14:16:28 -04:00
parent 19d076903b
commit 866d2d36b8
1 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tools/power/x86/turbostat/turbostat.c
View File

@ -1057,8 +1057,7 @@ void probe_platform_features(unsigned int family, unsigned int model)
return;
for (i = 0; turbostat_pdata[i].features; i++) {
if (VFM_FAMILY(turbostat_pdata[i].vfm) == family &&
VFM_MODEL(turbostat_pdata[i].vfm) == model) {
if (VFM_FAMILY(turbostat_pdata[i].vfm) == family && VFM_MODEL(turbostat_pdata[i].vfm) == model) {
platform = turbostat_pdata[i].features;
return;
}
@ -1535,14 +1534,14 @@ struct pmt_counter {
unsigned int pmt_counter_get_width(const struct pmt_counter *p)
{
return (p->msb - p->lsb)+1;
return (p->msb - p->lsb) + 1;
}
void pmt_counter_resize_(struct pmt_counter *pcounter, unsigned int new_size)
{
struct pmt_domain_info *new_mem;
new_mem = (struct pmt_domain_info*) reallocarray(pcounter->domains, new_size, sizeof(*pcounter->domains));
new_mem = (struct pmt_domain_info *)reallocarray(pcounter->domains, new_size, sizeof(*pcounter->domains));
if (!new_mem) {
fprintf(stderr, "%s: failed to allocate memory for PMT counters\n", __func__);
exit(1);
@ -1567,7 +1566,7 @@ void pmt_counter_resize(struct pmt_counter *pcounter, unsigned int new_size)
*/
if (new_size < 8)
new_size = 8;
new_size = MAX(new_size, pcounter->num_domains*2);
new_size = MAX(new_size, pcounter->num_domains * 2);
pmt_counter_resize_(pcounter, new_size);
}
@ -2282,7 +2281,7 @@ void print_header(char *delim)
ppmt = sys.pmt_tp;
while (ppmt) {
switch(ppmt->type) {
switch (ppmt->type) {
case PMT_TYPE_RAW:
if (pmt_counter_get_width(ppmt) <= 32)
outp += sprintf(outp, "%s%10.10s", (printed++ ? delim : ""), ppmt->name);
@ -2356,7 +2355,7 @@ void print_header(char *delim)
ppmt = sys.pmt_cp;
while (ppmt) {
switch(ppmt->type) {
switch (ppmt->type) {
case PMT_TYPE_RAW:
if (pmt_counter_get_width(ppmt) <= 32)
outp += sprintf(outp, "%s%10.10s", (printed++ ? delim : ""), ppmt->name);
@ -2487,7 +2486,7 @@ void print_header(char *delim)
ppmt = sys.pmt_pp;
while (ppmt) {
switch(ppmt->type) {
switch (ppmt->type) {
case PMT_TYPE_RAW:
if (pmt_counter_get_width(ppmt) <= 32)
outp += sprintf(outp, "%s%10.10s", (printed++ ? delim : ""), ppmt->name);
@ -2969,7 +2968,8 @@ int format_counters(struct thread_data *t, struct core_data *c, struct pkg_data
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->pc10 / tsc);
if (DO_BIC(BIC_Diec6))
outp += sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->die_c6 / crystal_hz / interval_float);
outp +=
sprintf(outp, "%s%.2f", (printed++ ? delim : ""), 100.0 * p->die_c6 / crystal_hz / interval_float);
if (DO_BIC(BIC_CPU_LPI)) {
if (p->cpu_lpi >= 0)
@ -4049,7 +4049,7 @@ static unsigned int read_perf_config(const char *subsys, const char *event_name)
goto next;
}
next:
next:
pconfig_str = strchr(pconfig_str, ',');
if (pconfig_str) {
*pconfig_str = '\0';
@ -4463,9 +4463,9 @@ unsigned long pmt_gen_value_mask(unsigned int lsb, unsigned int msb)
if (msb == 63)
mask = 0xffffffffffffffff;
else
mask = ((1<<(msb+1))-1);
mask = ((1 << (msb + 1)) - 1);
mask -= (1<<lsb)-1;
mask -= (1 << lsb) - 1;
return mask;
}
@ -8687,7 +8687,7 @@ int parse_telem_info_file(int fd_dir, const char *info_filename, const char *for
return 0;
}
struct pmt_mmio* pmt_mmio_open(unsigned int target_guid)
struct pmt_mmio *pmt_mmio_open(unsigned int target_guid)
{
DIR *dirp;
struct dirent *entry;
@ -8793,7 +8793,7 @@ loop_cleanup_and_break:
return ret;
}
struct pmt_mmio* pmt_mmio_find(unsigned int guid)
struct pmt_mmio *pmt_mmio_find(unsigned int guid)
{
struct pmt_mmio *pmmio = pmt_mmios;
@ -8807,12 +8807,12 @@ struct pmt_mmio* pmt_mmio_find(unsigned int guid)
return NULL;
}
void* pmt_get_counter_pointer(struct pmt_mmio *pmmio, unsigned long counter_offset)
void *pmt_get_counter_pointer(struct pmt_mmio *pmmio, unsigned long counter_offset)
{
char *ret;
/* Get base of mmaped PMT file. */
ret = (char*)pmmio->mmio_base;
ret = (char *)pmmio->mmio_base;
/*
* Apply PMT MMIO offset to obtain beginning of the mmaped telemetry data.
@ -8827,7 +8827,7 @@ void* pmt_get_counter_pointer(struct pmt_mmio *pmmio, unsigned long counter_offs
return ret;
}
struct pmt_mmio* pmt_add_guid(unsigned int guid)
struct pmt_mmio *pmt_add_guid(unsigned int guid)
{
struct pmt_mmio *ret;
@ -8843,7 +8843,7 @@ enum pmt_open_mode {
PMT_OPEN_REQUIRED, /* Open failure is a fatal error. */
};
struct pmt_counter* pmt_find_counter(struct pmt_counter *pcounter, const char *name)
struct pmt_counter *pmt_find_counter(struct pmt_counter *pcounter, const char *name)
{
while (pcounter) {
if (strcmp(pcounter->name, name) == 0)
@ -8855,9 +8855,9 @@ struct pmt_counter* pmt_find_counter(struct pmt_counter *pcounter, const char *n
return pcounter;
}
struct pmt_counter** pmt_get_scope_root(enum counter_scope scope)
struct pmt_counter **pmt_get_scope_root(enum counter_scope scope)
{
switch(scope) {
switch (scope) {
case SCOPE_CPU:
return &sys.pmt_tp;
case SCOPE_CORE:
@ -8873,7 +8873,7 @@ void pmt_counter_add_domain(struct pmt_counter *pcounter, unsigned long *pmmio,
{
/* Make sure the new domain fits. */
if (domain_id >= pcounter->num_domains)
pmt_counter_resize(pcounter, domain_id+1);
pmt_counter_resize(pcounter, domain_id + 1);
assert(pcounter->domains);
assert(domain_id < pcounter->num_domains);
@ -8887,7 +8887,7 @@ int pmt_add_counter(unsigned int guid, const char *name, enum pmt_datatype type,
{
struct pmt_mmio *mmio;
struct pmt_counter *pcounter;
struct pmt_counter ** const pmt_root = pmt_get_scope_root(scope);
struct pmt_counter **const pmt_root = pmt_get_scope_root(scope);
bool new_counter = false;
int conflict = 0;
@ -8927,7 +8927,7 @@ int pmt_add_counter(unsigned int guid, const char *name, enum pmt_datatype type,
}
if (new_counter) {
strncpy(pcounter->name, name, ARRAY_SIZE(pcounter->name)-1);
strncpy(pcounter->name, name, ARRAY_SIZE(pcounter->name) - 1);
pcounter->type = type;
pcounter->scope = scope;
pcounter->lsb = lsb;
@ -9071,7 +9071,7 @@ int get_and_dump_counters(void)
void print_version()
{
fprintf(outf, "turbostat version 2024.05.10 - Len Brown <lenb@kernel.org>\n");
fprintf(outf, "turbostat version 2024.07.26 - Len Brown <lenb@kernel.org>\n");
}
#define COMMAND_LINE_SIZE 2048
@ -9536,8 +9536,7 @@ next:
}
if (strlen(name) >= PMT_COUNTER_NAME_SIZE_BYTES) {
printf("%s: name has to be at most %d characters long\n",
__func__, PMT_COUNTER_NAME_SIZE_BYTES);
printf("%s: name has to be at most %d characters long\n", __func__, PMT_COUNTER_NAME_SIZE_BYTES);
exit(1);
}