Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 231bb2aa authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf pmu: Support event aliases for non cpu// pmus 



The code for handling pmu aliases without specifying the PMU hardcoded
only supported the cpu PMU.

This patch extends it to work for all PMUs. We always duplicate the
event for all PMUs that have an matching alias.  This allows to
automatically expand an alias for all instances of a PMU (so for example
you can monitor all cache boxes with a single event)

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20170128020345.19007-5-andi@firstfloor.org


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

tools/perf/util/parse-events.c

+26 −20
Original line number Diff line number Diff line
@@ -1504,22 +1504,27 @@ static void perf_pmu__parse_init(void) 
	struct perf_pmu_alias *alias;

	int len = 0;



	pmu = perf_pmu__find("cpu");

	if ((pmu == NULL) || list_empty(&pmu->aliases)) {

		perf_pmu_events_list_num = -1;

		return;

	}

	pmu = NULL;

	while ((pmu = perf_pmu__scan(pmu)) != NULL) {

		list_for_each_entry(alias, &pmu->aliases, list) {

			if (strchr(alias->name, '-'))

				len++;

			len++;

		}

	}



	if (len == 0) {

		perf_pmu_events_list_num = -1;

		return;

	}

	perf_pmu_events_list = malloc(sizeof(struct perf_pmu_event_symbol) * len);

	if (!perf_pmu_events_list)

		return;

	perf_pmu_events_list_num = len;



	len = 0;

	pmu = NULL;

	while ((pmu = perf_pmu__scan(pmu)) != NULL) {

		list_for_each_entry(alias, &pmu->aliases, list) {

			struct perf_pmu_event_symbol *p = perf_pmu_events_list + len;

			char *tmp = strchr(alias->name, '-');
@@ -1535,6 +1540,7 @@ static void perf_pmu__parse_init(void) 
				len++;

			}

		}

	}

	qsort(perf_pmu_events_list, len,

		sizeof(struct perf_pmu_event_symbol), comp_pmu);

tools/perf/util/parse-events.y

+25 −7
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/list.h>

#include <linux/types.h>

#include "util.h"

#include "pmu.h"

#include "parse-events.h"

#include "parse-events-bison.h"
@@ -236,15 +237,32 @@ PE_KERNEL_PMU_EVENT sep_dc 
	struct list_head *head;

	struct parse_events_term *term;

	struct list_head *list;

	struct perf_pmu *pmu = NULL;

	int ok = 0;



	/* Add it for all PMUs that support the alias */

	ALLOC_LIST(list);

	while ((pmu = perf_pmu__scan(pmu)) != NULL) {

		struct perf_pmu_alias *alias;



		list_for_each_entry(alias, &pmu->aliases, list) {

			if (!strcasecmp(alias->name, $1)) {

				ALLOC_LIST(head);

				ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,

					$1, 1, &@1, NULL));

				list_add_tail(&term->list, head);



	ALLOC_LIST(list);

	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));

				if (!parse_events_add_pmu(data, list,

						  pmu->name, head)) {

					ok++;

				}



				parse_events_terms__delete(head);

			}

		}

	}

	if (!ok)

		YYABORT;

	$$ = list;

}

|