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 04/11] perf, tools: Support per pmu json aliases
Date: Wed, 18 Jan 2017 12:58:55 +0100 [thread overview]
Message-ID: <20170118115855.GA11946@krava> (raw)
In-Reply-To: <20170103150833.6694-5-andi@firstfloor.org>
On Tue, Jan 03, 2017 at 07:08:26AM -0800, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>
> Add support for registering json aliases per PMU. Any alias
> with an unit matching the prefix is registered to the PMU.
> Uncore has multiple instances of most units, so all
> these aliases get registered for each individual PMU
> (this is important later to run the event on every instance
> of the PMU).
>
> To avoid printing the events multiple times in perf list
> filter out duplicated events during printing.
>
> v2: Rely on uncore_ prefix already in unit
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> ---
> tools/perf/util/pmu.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 8bffe99d8e3f..4bfc98953aba 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -587,14 +587,13 @@ static struct perf_pmu *pmu_lookup(const char *name)
> if (pmu_format(name, &format))
> return NULL;
>
> - if (pmu_aliases(name, &aliases))
> + if (pmu_type(name, &type))
> return NULL;
>
> - pmu_add_cpu_aliases(&aliases, name);
> -
> - if (pmu_type(name, &type))
> + if (pmu_aliases(name, &aliases))
> return NULL;
>
> + pmu_add_cpu_aliases(&aliases, name);
AFAICS you switched the calls.. how does it matter?
jirka
> pmu = zalloc(sizeof(*pmu));
> if (!pmu)
> return NULL;
> @@ -1192,6 +1191,9 @@ void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag,
> len = j;
> qsort(aliases, len, sizeof(struct sevent), cmp_sevent);
> for (j = 0; j < len; j++) {
> + /* Skip duplicates */
> + if (j > 0 && !strcmp(aliases[j].name, aliases[j - 1].name))
> + continue;
> if (name_only) {
> printf("%s ", aliases[j].name);
> continue;
> --
> 2.9.3
>
next prev parent reply other threads:[~2017-01-18 12:15 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 [this message]
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
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 04/11] perf, tools: Support per pmu json aliases 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=20170118115855.GA11946@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).