Commit 80ee8c58 authored Apr 24, 2018 by Kan Liang Committed by Arnaldo Carvalho de Melo Apr 24, 2018

perf stat: Fix duplicate PMU name for interval print



PMU name is printed repeatedly for interval print, for example:

  perf stat --no-merge -e 'unc_m_clockticks' -a -I 1000
  #           time             counts unit events
     1.001053069        243,702,144      unc_m_clockticks [uncore_imc_4]
     1.001053069        244,268,304      unc_m_clockticks [uncore_imc_2]
     1.001053069        244,427,386      unc_m_clockticks [uncore_imc_0]
     1.001053069        244,583,760      unc_m_clockticks [uncore_imc_5]
     1.001053069        244,738,971      unc_m_clockticks [uncore_imc_3]
     1.001053069        244,880,309      unc_m_clockticks [uncore_imc_1]
     2.002024821        240,818,200      unc_m_clockticks [uncore_imc_4] [uncore_imc_4]
     2.002024821        240,767,812      unc_m_clockticks [uncore_imc_2] [uncore_imc_2]
     2.002024821        240,764,215      unc_m_clockticks [uncore_imc_0] [uncore_imc_0]
     2.002024821        240,759,504      unc_m_clockticks [uncore_imc_5] [uncore_imc_5]
     2.002024821        240,755,992      unc_m_clockticks [uncore_imc_3] [uncore_imc_3]
     2.002024821        240,750,403      unc_m_clockticks [uncore_imc_1] [uncore_imc_1]

For each print, the PMU name is unconditionally appended to the
counter->name.

Need to check the counter->name first. If the PMU name is already
appended, do nothing.

Committer notes:

Add and use perf_evsel->uniquified_name bool instead of doing the more
expensive strstr(event->name, pmu->name).

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Agustin Vega-Frias <agustinv@codeaurora.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
Cc: Will Deacon <will.deacon@arm.com>
Fixes: 8c5421c0 ("perf pmu: Display pmu name when printing unmerged events in stat")
Link: http://lkml.kernel.org/r/1524594014-79243-5-git-send-email-kan.liang@linux.intel.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 121f325f

tools/perf/builtin-stat.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1284,7 +1284,8 @@ static void uniquify_event_name(struct perf_evsel *counter)
		char *new_name;
		char *config;

		if (!counter->pmu_name \|\| !strncmp(counter->name, counter->pmu_name,
		if (counter->uniquified_name \|\|
		!counter->pmu_name \|\| !strncmp(counter->name, counter->pmu_name,
		strlen(counter->pmu_name)))
		return;

		@@ -1302,6 +1303,8 @@ static void uniquify_event_name(struct perf_evsel *counter)
		counter->name = new_name;
		}
		}

		counter->uniquified_name = true;
		}

		static void collect_all_aliases(struct perf_evsel *counter,

tools/perf/util/evsel.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ struct perf_evsel {
		unsigned int sample_size;
		int id_pos;
		int is_pos;
		bool uniquified_name;
		bool snapshot;
		bool supported;
		bool needs_swap;

Admin message