Commit 0e0ae874 authored by Jin Yao's avatar Jin Yao Committed by Arnaldo Carvalho de Melo
Browse files

perf list: Display hybrid PMU events with cpu type 



Add a new option '--cputype' to 'perf list' to display core-only PMU
events or atom-only PMU events.

Each hybrid PMU event has been assigned with a PMU name, this patch
compares the PMU name before listing the result.

For example:

  perf list --cputype atom
  ...
  cache:
    core_reject_l2q.any
         [Counts the number of request that were not accepted into the L2Q because the L2Q is FULL. Unit: cpu_atom]
  ...

The "Unit: cpu_atom" is displayed in the brief description section
to indicate this is an atom event.

Signed-off-by: default avatarJin Yao <yao.jin@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210903025239.22754-1-yao.jin@linux.intel.com


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

tools/perf/Documentation/perf-list.txt

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ any extra expressions computed by perf stat. 
--deprecated::

Print deprecated events. By default the deprecated events are hidden.



--cputype::

Print events applying cpu with this type for hybrid platform

(e.g. --cputype core or --cputype atom)



[[EVENT_MODIFIERS]]

EVENT MODIFIERS

---------------

tools/perf/builtin-list.c

+30 −12
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "util/parse-events.h"

#include "util/pmu.h"

#include "util/pmu-hybrid.h"

#include "util/debug.h"

#include "util/metricgroup.h"

#include <subcmd/pager.h>
@@ -20,13 +21,15 @@ 


static bool desc_flag = true;

static bool details_flag;

static const char *hybrid_type;



int cmd_list(int argc, const char **argv)

{

	int i;

	int i, ret = 0;

	bool raw_dump = false;

	bool long_desc_flag = false;

	bool deprecated = false;

	char *pmu_name = NULL;

	struct option list_options[] = {

		OPT_BOOLEAN(0, "raw-dump", &raw_dump, "Dump raw events"),

		OPT_BOOLEAN('d', "desc", &desc_flag,
@@ -37,6 +40,9 @@ int cmd_list(int argc, const char **argv) 
			    "Print information on the perf event names and expressions used internally by events."),

		OPT_BOOLEAN(0, "deprecated", &deprecated,

			    "Print deprecated events."),

		OPT_STRING(0, "cputype", &hybrid_type, "hybrid cpu type",

			   "Print events applying cpu with this type for hybrid platform "

			   "(e.g. core or atom)"),

		OPT_INCR(0, "debug", &verbose,

			     "Enable debugging output"),

		OPT_END()
@@ -56,10 +62,16 @@ int cmd_list(int argc, const char **argv) 
	if (!raw_dump && pager_in_use())

		printf("\nList of pre-defined events (to be used in -e):\n\n");



	if (hybrid_type) {

		pmu_name = perf_pmu__hybrid_type_to_pmu(hybrid_type);

		if (!pmu_name)

			pr_warning("WARNING: hybrid cputype is not supported!\n");

	}



	if (argc == 0) {

		print_events(NULL, raw_dump, !desc_flag, long_desc_flag,

				details_flag, deprecated);

		return 0;

				details_flag, deprecated, pmu_name);

		goto out;

	}



	for (i = 0; i < argc; ++i) {
@@ -82,25 +94,27 @@ int cmd_list(int argc, const char **argv) 
		else if (strcmp(argv[i], "pmu") == 0)

			print_pmu_events(NULL, raw_dump, !desc_flag,

						long_desc_flag, details_flag,

						deprecated);

						deprecated, pmu_name);

		else if (strcmp(argv[i], "sdt") == 0)

			print_sdt_events(NULL, NULL, raw_dump);

		else if (strcmp(argv[i], "metric") == 0 || strcmp(argv[i], "metrics") == 0)

			metricgroup__print(true, false, NULL, raw_dump, details_flag);

			metricgroup__print(true, false, NULL, raw_dump, details_flag, pmu_name);

		else if (strcmp(argv[i], "metricgroup") == 0 || strcmp(argv[i], "metricgroups") == 0)

			metricgroup__print(false, true, NULL, raw_dump, details_flag);

			metricgroup__print(false, true, NULL, raw_dump, details_flag, pmu_name);

		else if ((sep = strchr(argv[i], ':')) != NULL) {

			int sep_idx;



			sep_idx = sep - argv[i];

			s = strdup(argv[i]);

			if (s == NULL)

				return -1;

			if (s == NULL) {

				ret = -1;

				goto out;

			}



			s[sep_idx] = '\0';

			print_tracepoint_events(s, s + sep_idx + 1, raw_dump);

			print_sdt_events(s, s + sep_idx + 1, raw_dump);

			metricgroup__print(true, true, s, raw_dump, details_flag);

			metricgroup__print(true, true, s, raw_dump, details_flag, pmu_name);

			free(s);

		} else {

			if (asprintf(&s, "*%s*", argv[i]) < 0) {
@@ -116,12 +130,16 @@ int cmd_list(int argc, const char **argv) 
			print_pmu_events(s, raw_dump, !desc_flag,

						long_desc_flag,

						details_flag,

						deprecated);

						deprecated,

						pmu_name);

			print_tracepoint_events(NULL, s, raw_dump);

			print_sdt_events(NULL, s, raw_dump);

			metricgroup__print(true, true, s, raw_dump, details_flag);

			metricgroup__print(true, true, s, raw_dump, details_flag, pmu_name);

			free(s);

		}

	}

	return 0;



out:

	free(pmu_name);

	return ret;

}

tools/perf/util/metricgroup.c

+6 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "evsel.h"

#include "strbuf.h"

#include "pmu.h"

#include "pmu-hybrid.h"

#include "expr.h"

#include "rblist.h"

#include <string.h>
@@ -535,7 +536,7 @@ static int metricgroup__print_sys_event_iter(const struct pmu_event *pe, void *d 
}



void metricgroup__print(bool metrics, bool metricgroups, char *filter,

			bool raw, bool details)

			bool raw, bool details, const char *pmu_name)

{

	const struct pmu_events_map *map = pmu_events_map__find();

	const struct pmu_event *pe;
@@ -561,6 +562,10 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter, 
			break;

		if (!pe->metric_expr)

			continue;

		if (pmu_name && perf_pmu__is_hybrid(pe->pmu) &&

		    strcmp(pmu_name, pe->pmu)) {

			continue;

		}

		if (metricgroup__print_pmu_event(pe, metricgroups, filter,

						 raw, details, &groups,

						 metriclist) < 0)

tools/perf/util/metricgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int metricgroup__parse_groups_test(struct evlist *evlist, 
				   struct rblist *metric_events);



void metricgroup__print(bool metrics, bool groups, char *filter,

			bool raw, bool details);

			bool raw, bool details, const char *pmu_name);

bool metricgroup__has_metric(const char *metric);

int arch_get_runtimeparam(const struct pmu_event *pe __maybe_unused);

void metricgroup__rblist_exit(struct rblist *metric_events);

tools/perf/util/parse-events.c

+5 −3
Original line number Diff line number Diff line
@@ -3089,7 +3089,8 @@ void print_symbol_events(const char *event_glob, unsigned type, 
 * Print the help text for the event symbols:

 */

void print_events(const char *event_glob, bool name_only, bool quiet_flag,

			bool long_desc, bool details_flag, bool deprecated)

			bool long_desc, bool details_flag, bool deprecated,

			const char *pmu_name)

{

	print_symbol_events(event_glob, PERF_TYPE_HARDWARE,

			    event_symbols_hw, PERF_COUNT_HW_MAX, name_only);
@@ -3101,7 +3102,7 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag, 
	print_hwcache_events(event_glob, name_only);



	print_pmu_events(event_glob, name_only, quiet_flag, long_desc,

			details_flag, deprecated);

			details_flag, deprecated, pmu_name);



	if (event_glob != NULL)

		return;
@@ -3127,7 +3128,8 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag, 


	print_sdt_events(NULL, NULL, name_only);



	metricgroup__print(true, true, NULL, name_only, details_flag);

	metricgroup__print(true, true, NULL, name_only, details_flag,

			   pmu_name);



	print_libpfm_events(name_only, long_desc);

}