git: eae121b18f5b - stable/13 - libpmc: fix "instructions" alias on Intel

Mitchell Horne mhorne at FreeBSD.org
Thu Jul 29 15:25:21 UTC 2021


The branch stable/13 has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=eae121b18f5b2599e56c5101c40c9f71856246e7

commit eae121b18f5b2599e56c5101c40c9f71856246e7
Author:     Mitchell Horne <mhorne at FreeBSD.org>
AuthorDate: 2021-05-31 14:16:16 +0000
Commit:     Mitchell Horne <mhorne at FreeBSD.org>
CommitDate: 2021-07-29 15:01:09 +0000

    libpmc: fix "instructions" alias on Intel
    
    The typo prevents the counter from being allocated.
    
    This fixes e.g. pmcstat -s instructions sleep 5
    
    Reviewed by:    mizhka, gnn, ray, emaste
    MFC after:      5 days
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D30527
    
    (cherry picked from commit bc1a6a9d692a1f827514144b6bce0654a8be4f4d)
---
 lib/libpmc/libpmc_pmu_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c
index d652573a883f..259a2a5faa47 100644
--- a/lib/libpmc/libpmc_pmu_util.c
+++ b/lib/libpmc/libpmc_pmu_util.c
@@ -72,7 +72,7 @@ static struct pmu_alias pmu_intel_alias_table[] = {
 	{"BRANCH-MISSES-RETIRED", "BR_MISP_RETIRED.ALL_BRANCHES"},
 	{"cycles", "tsc-tsc"},
 	{"unhalted-cycles", "CPU_CLK_UNHALTED.THREAD_P_ANY"},
-	{"instructions", "inst-retired.any_p"},
+	{"instructions", "inst_retired.any_p"},
 	{"branch-mispredicts", "br_misp_retired.all_branches"},
 	{"branches", "br_inst_retired.all_branches"},
 	{"interrupts", "hw_interrupts.received"},


More information about the dev-commits-src-all mailing list