From: Jiri Olsa <jolsa@redhat.com>
To: Andi Kleen <andi@firstfloor.org>
Cc: acme@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org,
mingo@kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: Re: [PATCH 05/11] perf, tools: Support event aliases for non cpu// pmus
Date: Wed, 18 Jan 2017 13:10:13 +0100 [thread overview]
Message-ID: <20170118121013.GB11946@krava> (raw)
In-Reply-To: <20170103150833.6694-6-andi@firstfloor.org>
On Tue, Jan 03, 2017 at 07:08:27AM -0800, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>
> 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: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
> ---
> tools/perf/util/parse-events.c | 46 ++++++++++++++++++++++++------------------
> tools/perf/util/parse-events.y | 32 ++++++++++++++++++++++-------
> 2 files changed, 51 insertions(+), 27 deletions(-)
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 3c876b8ba4de..6dbcba7f0969 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -1504,35 +1504,41 @@ 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)) {
> + 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;
> }
> - list_for_each_entry(alias, &pmu->aliases, list) {
> - if (strchr(alias->name, '-'))
> - len++;
> - len++;
> - }
> 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;
> - list_for_each_entry(alias, &pmu->aliases, list) {
> - struct perf_pmu_event_symbol *p = perf_pmu_events_list + len;
> - char *tmp = strchr(alias->name, '-');
> -
> - if (tmp != NULL) {
> - SET_SYMBOL(strndup(alias->name, tmp - alias->name),
> - PMU_EVENT_SYMBOL_PREFIX);
> - p++;
> - SET_SYMBOL(strdup(++tmp), PMU_EVENT_SYMBOL_SUFFIX);
> - len += 2;
> - } else {
> - SET_SYMBOL(strdup(alias->name), PMU_EVENT_SYMBOL);
> - len++;
> + 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, '-');
> +
> + if (tmp != NULL) {
> + SET_SYMBOL(strndup(alias->name, tmp - alias->name),
> + PMU_EVENT_SYMBOL_PREFIX);
> + p++;
> + SET_SYMBOL(strdup(++tmp), PMU_EVENT_SYMBOL_SUFFIX);
> + len += 2;
> + } else {
> + SET_SYMBOL(strdup(alias->name), PMU_EVENT_SYMBOL);
> + len++;
> + }
> }
> }
> qsort(perf_pmu_events_list, len,
> diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
> index 879115f93edc..f3b5ec901600 100644
> --- a/tools/perf/util/parse-events.y
> +++ b/tools/perf/util/parse-events.y
> @@ -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;
>
> - 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);
> -
> + /* Add it for all PMUs that support the alias */
> ALLOC_LIST(list);
> - ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));
> - parse_events_terms__delete(head);
> + 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);
> +
> + if (!parse_events_add_pmu(data, list,
> + pmu->name, head)) {
> + ok++;
> + }
> +
> + parse_events_terms__delete(head);
> + }
> + }
> + }
> + if (!ok)
> + YYABORT;
> $$ = list;
> }
> |
> --
> 2.9.3
>
next prev parent reply other threads:[~2017-01-18 12:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-03 15:08 Support Intel uncore event lists v4 Andi Kleen
2017-01-03 15:08 ` [PATCH 01/11] perf, tools: Factor out scale conversion code Andi Kleen
2017-01-08 18:57 ` Jiri Olsa
2017-01-08 18:57 ` Jiri Olsa
2017-01-12 13:31 ` Arnaldo Carvalho de Melo
2017-01-12 18:07 ` Arnaldo Carvalho de Melo
2017-01-18 9:19 ` [tip:perf/core] perf pmu: " tip-bot for Andi Kleen
2017-01-03 15:08 ` [PATCH 02/11] perf, tools: Parse eventcode as number in jevents Andi Kleen
2017-01-08 18:57 ` Jiri Olsa
2017-01-10 1:10 ` Andi Kleen
2017-01-18 11:56 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 03/11] perf, tools: Add support for parsing uncore json files Andi Kleen
2017-01-08 18:58 ` Jiri Olsa
2017-01-12 13:32 ` Arnaldo Carvalho de Melo
2017-01-08 19:00 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 04/11] perf, tools: Support per pmu json aliases Andi Kleen
2017-01-18 11:58 ` Jiri Olsa
2017-01-19 0:17 ` Andi Kleen
2017-01-19 10:42 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 05/11] perf, tools: Support event aliases for non cpu// pmus Andi Kleen
2017-01-18 12:10 ` Jiri Olsa [this message]
2017-01-03 15:08 ` [PATCH 06/11] perf, tools: Add debug support for outputing alias string Andi Kleen
2017-01-18 12:16 ` Jiri Olsa
2017-01-18 15:45 ` Andi Kleen
2017-01-18 16:18 ` Jiri Olsa
2017-01-18 12:16 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 07/11] perf, tools: Collapse identically named events in perf stat Andi Kleen
2017-01-18 12:44 ` Jiri Olsa
2017-01-18 16:31 ` Andi Kleen
2017-01-18 16:56 ` Jiri Olsa
2017-01-18 17:28 ` Andi Kleen
2017-01-03 15:08 ` [PATCH 08/11] perf, tools: Expand PMU events by prefix match Andi Kleen
2017-01-03 15:08 ` [PATCH 09/11] perf, tools: Add a simple expression parser for JSON Andi Kleen
2017-01-03 15:08 ` [PATCH 10/11] perf, tools: Support MetricExpr header in JSON event list Andi Kleen
2017-01-03 15:08 ` [PATCH 11/11] perf, tools, stat: Output JSON MetricExpr metric Andi Kleen
2017-01-10 1:33 Support Intel uncore event lists v4 Andi Kleen
2017-01-10 1:33 ` [PATCH 05/11] perf, tools: Support event aliases for non cpu// pmus Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170118121013.GB11946@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).