system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

libpmc: export names of counters for stat mode, make get_by_idx name consistent with others

Browse source
This commit is contained in:
Matt Macy 2018-05-29 04:23:16 +00:00
parent 23c01e5b57
commit 78beed2f81
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=334312
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/libpmc/libpmc_pmu_util.c
View file

@ -131,7 +131,7 @@ pmu_event_get(const char *event_name, int *idx)
}
const char *
pmu_event_get_by_idx(int idx)
pmc_pmu_event_get_by_idx(int idx)
{
const struct pmu_events_map *pme;
const struct pmu_event *pe;
@ -321,6 +321,27 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm)
return (0);
}
/*
* Ultimately rely on AMD calling theirs the same
*/
static const char *stat_mode_cntrs[] = {
"inst_retired.any",
"cpu_clk_unhalted.thread_p_any",
"br_inst_retired.all_branches",
"br_misp_retired.all_branches",
"cpu_clk_unhalted.thread_p_any"
};
int
pmc_pmu_stat_mode(const char ***cntrs)
{
if (pmc_pmu_enabled()) {
*cntrs = stat_mode_cntrs;
return (0);
}
return (EOPNOTSUPP);
}
#else
uint64_t pmc_pmu_sample_rate_get(const char *event_name __unused) { return (DEFAULT_SAMPLE_COUNT); }
void pmc_pmu_print_counters(void) {}
@ -328,6 +349,7 @@ void pmc_pmu_print_counter_desc(const char *e __unused) {}
void pmc_pmu_print_counter_desc_long(const char *e __unused) {}
int pmc_pmu_enabled(void) { return (0); }
int pmc_pmu_pmcallocate(const char *e __unused, struct pmc_op_pmcallocate *p __unused) { return (EOPNOTSUPP); }
const char *pmu_event_get_by_idx(int idx __unused) { return (NULL); }
const char *pmc_pmu_event_get_by_idx(int idx __unused) { return (NULL); }
int pmc_pmu_stat_mode(const char ***a __unused) { return (EOPNOTSUPP); }
#endif

3
lib/libpmc/pmc.h
View file

@ -119,7 +119,8 @@ void pmc_pmu_print_counter_desc(const char *);
void pmc_pmu_print_counter_desc_long(const char *);
uint64_t pmc_pmu_sample_rate_get(const char *);
int pmc_pmu_pmcallocate(const char *, struct pmc_op_pmcallocate *);
const char *pmu_event_get_by_idx(int idx);
const char *pmc_pmu_event_get_by_idx(int idx);
int pmc_pmu_stat_mode(const char ***);
__END_DECLS
#endif

2
lib/libpmc/pmclog.c
View file

@ -368,7 +368,7 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len,
PMCLOG_READ32(le,ev->pl_u.pl_a.pl_event);
PMCLOG_READ32(le,ev->pl_u.pl_a.pl_flags);
PMCLOG_READ32(le,noop);
ev->pl_u.pl_a.pl_evname = pmu_event_get_by_idx(ev->pl_u.pl_a.pl_event);
ev->pl_u.pl_a.pl_evname = pmc_pmu_event_get_by_idx(ev->pl_u.pl_a.pl_event);
if (ev->pl_u.pl_a.pl_evname != NULL)
break;
else if ((ev->pl_u.pl_a.pl_evname =