From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: John Garry <john.garry@huawei.com>
Cc: mark.rutland@arm.com, brueckner@linux.ibm.com,
ak@linux.intel.com, mathieu.poirier@linaro.org,
peterz@infradead.org, ben@decadent.org.uk, tmricht@linux.ibm.com,
will.deacon@arm.com, linux-kernel@vger.kernel.org,
linuxarm@huawei.com, zhangshaokun@hisilicon.com,
alexander.shishkin@linux.intel.com, mingo@redhat.com,
namhyung@kernel.org, jolsa@redhat.com,
linux-arm-kernel@lists.infradead.org, kan.liang@linux.intel.com
Subject: Re: [PATCH v3 1/4] perf pmu: Support more complex PMU event aliasing
Date: Tue, 2 Jul 2019 16:07:24 -0300 [thread overview]
Message-ID: <20190702190724.GM15462@kernel.org> (raw)
In-Reply-To: <1561732552-143038-2-git-send-email-john.garry@huawei.com>
Em Fri, Jun 28, 2019 at 10:35:49PM +0800, John Garry escreveu:
> The jevent "Unit" field is used for uncore PMU alias definition.
>
> The form uncore_pmu_example_X is supported, where "X" is a wildcard,
> to support multiple instances of the same PMU in a system.
>
> Unfortunately this format not suitable for all uncore PMUs; take the Hisi
> DDRC uncore PMU for example, where the name is in the form
> hisi_scclX_ddrcY.
>
> For for current jevent parsing, we would be required to hardcode an uncore
> alias translation for each possible value of X. This is not scalable.
>
> Instead, add support for "Unit" field in the form "hisi_sccl,ddrc", where
> we can match by hisi_scclX and ddrcY. Tokens in Unit field
> are delimited by ','.
>
> Signed-off-by: John Garry <john.garry@huawei.com>
> ---
> tools/perf/util/pmu.c | 46 ++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 7e7299fee550..cfc916819c59 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -700,6 +700,46 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu)
> return map;
> }
>
> +static bool pmu_uncore_alias_match(const char *pmu_name, const char *name)
> +{
> + char *tmp, *tok, *str;
> + bool res;
> +
> + str = strdup(pmu_name);
> + if (!str)
> + return false;
> +
> + /*
> + * uncore alias may be from different PMU with common prefix
> + */
> + tok = strtok_r(str, ",", &tmp);
In some places, e.g. gcc version 4.1.2:
CC /tmp/build/perf/util/pmu.o
cc1: warnings being treated as errors
util/pmu.c: In function ‘pmu_lookup’:
util/pmu.c:706: warning: ‘tmp’ may be used uninitialized in this function
mv: cannot stat `/tmp/build/perf/util/.pmu.o.tmp': No such file or directory
This silences it, adding.
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 913633ae0bf8..55f4de6442e3 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -703,7 +703,7 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu)
static bool pmu_uncore_alias_match(const char *pmu_name, const char *name)
{
- char *tmp, *tok, *str;
+ char *tmp = NULL, *tok, *str;
bool res;
str = strdup(pmu_name);
> + if (strncmp(pmu_name, tok, strlen(tok))) {
> + res = false;
> + goto out;
> + }
> +
> + /*
> + * Match more complex aliases where the alias name is a comma-delimited
> + * list of tokens, orderly contained in the matching PMU name.
> + *
> + * Example: For alias "socket,pmuname" and PMU "socketX_pmunameY", we
> + * match "socket" in "socketX_pmunameY" and then "pmuname" in
> + * "pmunameY".
> + */
> + for (; tok; name += strlen(tok), tok = strtok_r(NULL, ",", &tmp)) {
> + name = strstr(name, tok);
> + if (!name) {
> + res = false;
> + goto out;
> + }
> + }
> +
> + res = true;
> +out:
> + free(str);
> + return res;
> +}
> +
> /*
> * From the pmu_events_map, find the table of PMU events that corresponds
> * to the current running CPU. Then, add all PMU events from that table
> @@ -730,12 +770,8 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
> break;
> }
>
> - /*
> - * uncore alias may be from different PMU
> - * with common prefix
> - */
> if (pmu_is_uncore(name) &&
> - !strncmp(pname, name, strlen(pname)))
> + pmu_uncore_alias_match(pname, name))
> goto new_alias;
>
> if (strcmp(pname, name))
> --
> 2.17.1
--
- Arnaldo
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-02 19:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 14:35 [PATCH v3 0/4] Perf uncore PMU event alias support for Hisi hip08 ARM64 platform John Garry
2019-06-28 14:35 ` [PATCH v3 1/4] perf pmu: Support more complex PMU event aliasing John Garry
2019-06-28 15:33 ` Andi Kleen
2019-06-28 17:05 ` John Garry
2019-07-02 19:07 ` Arnaldo Carvalho de Melo [this message]
2019-07-11 2:23 ` John Garry
2019-06-28 14:35 ` [PATCH v3 2/4] perf jevents: Add support for Hisi hip08 DDRC PMU aliasing John Garry
2019-06-28 14:35 ` [PATCH v3 3/4] perf jevents: Add support for Hisi hip08 HHA " John Garry
2019-06-28 14:35 ` [PATCH v3 4/4] perf jevents: Add support for Hisi hip08 L3C " John Garry
2019-06-28 14:54 ` [PATCH v3 0/4] Perf uncore PMU event alias support for Hisi hip08 ARM64 platform Jiri Olsa
2019-07-02 15:53 ` Arnaldo Carvalho de Melo
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=20190702190724.GM15462@kernel.org \
--to=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=ben@decadent.org.uk \
--cc=brueckner@linux.ibm.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tmricht@linux.ibm.com \
--cc=will.deacon@arm.com \
--cc=zhangshaokun@hisilicon.com \
/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).