Commit e0e14cdf authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf parse-events: Move slots event for the hybrid platform too 



The commit 94dbfd67 ("perf parse-events: Architecture specific
leader override") introduced a feature to reorder the slots event to
fulfill the restriction of the perf metrics topdown group. But the
feature doesn't work on the hybrid machine.

  $ perf stat -e "{cpu_core/instructions/,cpu_core/slots/,cpu_core/topdown-retiring/}" -a sleep 1

   Performance counter stats for 'system wide':

       <not counted>      cpu_core/instructions/
       <not counted>      cpu_core/slots/
     <not supported>      cpu_core/topdown-retiring/

         1.002871801 seconds time elapsed

A hybrid platform has a different PMU name for the core PMUs, while
current perf hard code the PMU name "cpu".

Introduce a new function to check whether the system supports the perf
metrics feature. The result is cached for the future usage.

For X86, the core PMU name always has "cpu" prefix.

With the patch:

  $ perf stat -e "{cpu_core/instructions/,cpu_core/slots/,cpu_core/topdown-retiring/}" -a sleep 1

   Performance counter stats for 'system wide':

          76,337,010      cpu_core/slots/
          10,416,809      cpu_core/instructions/
          11,692,372      cpu_core/topdown-retiring/

         1.002805453 seconds time elapsed

Reviewed-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220518143900.1493980-5-kan.liang@linux.intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e7d1374e

tools/perf/arch/x86/util/evlist.c

+3 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "util/pmu.h"

#include "util/evlist.h"

#include "util/parse-events.h"

#include "topdown.h"



#define TOPDOWN_L1_EVENTS	"{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}"

#define TOPDOWN_L2_EVENTS	"{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}"
@@ -25,12 +26,12 @@ struct evsel *arch_evlist__leader(struct list_head *list) 


	first = list_first_entry(list, struct evsel, core.node);



	if (!pmu_have_event("cpu", "slots"))

	if (!topdown_sys_has_perf_metrics())

		return first;



	/* If there is a slots event and a topdown event then the slots event comes first. */

	__evlist__for_each_entry(list, evsel) {

		if (evsel->pmu_name && !strcmp(evsel->pmu_name, "cpu") && evsel->name) {

		if (evsel->pmu_name && !strncmp(evsel->pmu_name, "cpu", 3) && evsel->name) {

			if (strcasestr(evsel->name, "slots")) {

				slots = evsel;

				if (slots == first)

tools/perf/arch/x86/util/topdown.c

+25 −0
Original line number Diff line number Diff line
@@ -3,6 +3,31 @@ 
#include "api/fs/fs.h"

#include "util/pmu.h"

#include "util/topdown.h"

#include "topdown.h"



/* Check whether there is a PMU which supports the perf metrics. */

bool topdown_sys_has_perf_metrics(void)

{

	static bool has_perf_metrics;

	static bool cached;

	struct perf_pmu *pmu;



	if (cached)

		return has_perf_metrics;



	/*

	 * The perf metrics feature is a core PMU feature.

	 * The PERF_TYPE_RAW type is the type of a core PMU.

	 * The slots event is only available when the core PMU

	 * supports the perf metrics feature.

	 */

	pmu = perf_pmu__find_by_type(PERF_TYPE_RAW);

	if (pmu && pmu_have_event(pmu->name, "slots"))

		has_perf_metrics = true;



	cached = true;

	return has_perf_metrics;

}



/*

 * Check whether we can use a group for top down.

tools/perf/arch/x86/util/topdown.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _TOPDOWN_H

#define _TOPDOWN_H 1



bool topdown_sys_has_perf_metrics(void);



#endif