diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2022-05-30 23:58:40 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2022-05-31 00:05:15 +0000 |
| commit | 73b7b181e691ebbe8a0e411fd60f5003b51dc75d (patch) | |
| tree | ab0ab6b79c8dc374789d1693520dd1d438ad2c25 /lib/libpmc | |
| parent | c1e813d1230915e19a236ec687cadc1051841e56 (diff) | |
Diffstat (limited to 'lib/libpmc')
| -rw-r--r-- | lib/libpmc/libpmc_pmu_util.c | 3 | ||||
| -rw-r--r-- | lib/libpmc/pmu-events/jevents.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 0f9fc0391589..765196ecc8ac 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -528,8 +528,7 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, strcasestr(event_name, "uncore") != NULL) { pm->pm_class = PMC_CLASS_UCP; pm->pm_caps |= PMC_CAP_QUALIFIER; - } else if ((ped->ped_umask == -1) || - (ped->ped_event == 0x0 && ped->ped_umask == 0x3)) { + } else if (ped->ped_event == 0x0) { pm->pm_class = PMC_CLASS_IAF; } else { pm->pm_class = PMC_CLASS_IAP; diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index 5a296031451e..ff7d3b226932 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -480,12 +480,14 @@ static struct fixed { const char *name; const char *event; } fixed[] = { +#if 0 { "inst_retired.any", "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.thread", "event=0x3c,period=2000003" }, { "cpu_clk_unhalted.core", "event=0x3c,period=2000003" }, { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1,period=2000003" }, +#endif { NULL, NULL}, }; |