d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpmc: Disable hardcoding of Intel fixed counters.

Browse Source 
Intel json's now have pretty reasonable fixed counters representation
via event=0 and umask.  Hardcoded values create more confusion than fix.

MFC after:	1 month
This commit is contained in:
Alexander Motin 2022-05-30 19:58:40 -04:00
parent c1e813d123
commit 73b7b181e6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libpmc/libpmc_pmu_util.c
View File

@ -528,8 +528,7 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm,
strcasestr(event_name, "uncore") != NULL) { strcasestr(event_name, "uncore") != NULL) {
pm->pm_class = PMC_CLASS_UCP; pm->pm_class = PMC_CLASS_UCP;
pm->pm_caps |= PMC_CAP_QUALIFIER; pm->pm_caps |= PMC_CAP_QUALIFIER;
} else if ((ped->ped_umask == -1) || } else if (ped->ped_event == 0x0) {
(ped->ped_event == 0x0 && ped->ped_umask == 0x3)) {
pm->pm_class = PMC_CLASS_IAF; pm->pm_class = PMC_CLASS_IAF;
} else { } else {
pm->pm_class = PMC_CLASS_IAP; pm->pm_class = PMC_CLASS_IAP;

2
lib/libpmc/pmu-events/jevents.c
View File

@ -480,12 +480,14 @@ static struct fixed {
const char *name; const char *name;
const char *event; const char *event;
} fixed[] = { } fixed[] = {
#if 0
{ "inst_retired.any", "event=0xc0,period=2000003" }, { "inst_retired.any", "event=0xc0,period=2000003" },
{ "inst_retired.any_p", "event=0xc0,period=2000003" }, { "inst_retired.any_p", "event=0xc0,period=2000003" },
{ "cpu_clk_unhalted.ref", "event=0x0,umask=0x03,period=2000003" }, { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03,period=2000003" },
{ "cpu_clk_unhalted.thread", "event=0x3c,period=2000003" }, { "cpu_clk_unhalted.thread", "event=0x3c,period=2000003" },
{ "cpu_clk_unhalted.core", "event=0x3c,period=2000003" }, { "cpu_clk_unhalted.core", "event=0x3c,period=2000003" },
{ "cpu_clk_unhalted.thread_any", "event=0x3c,any=1,period=2000003" }, { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1,period=2000003" },
#endif
{ NULL, NULL}, { NULL, NULL},
}; };