From: Jin Yao <yao.jin@linux.intel.com>
To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org,
mingo@redhat.com, alexander.shishkin@linux.intel.com
Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com,
kan.liang@intel.com, yao.jin@intel.com,
Jin Yao <yao.jin@linux.intel.com>
Subject: [PATCH v6 04/26] perf pmu: Save pmu name
Date: Tue, 27 Apr 2021 15:01:17 +0800 [thread overview]
Message-ID: <20210427070139.25256-5-yao.jin@linux.intel.com> (raw)
In-Reply-To: <20210427070139.25256-1-yao.jin@linux.intel.com>
On hybrid platform, one event is available on one pmu
(such as, available on cpu_core or on cpu_atom).
This patch saves the pmu name to the pmu field of struct perf_pmu_alias.
Then next we can know the pmu which the event can be enabled on.
Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
v4 - v6:
- No change.
v3:
- Change pmu to pmu_name in struct perf_pmu_alias.
tools/perf/util/pmu.c | 10 +++++++++-
tools/perf/util/pmu.h | 1 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 8214def7b0f0..44225838eb03 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -283,6 +283,7 @@ void perf_pmu_free_alias(struct perf_pmu_alias *newalias)
zfree(&newalias->str);
zfree(&newalias->metric_expr);
zfree(&newalias->metric_name);
+ zfree(&newalias->pmu_name);
parse_events_terms__purge(&newalias->terms);
free(newalias);
}
@@ -297,6 +298,10 @@ static bool perf_pmu_merge_alias(struct perf_pmu_alias *newalias,
list_for_each_entry(a, alist, list) {
if (!strcasecmp(newalias->name, a->name)) {
+ if (newalias->pmu_name && a->pmu_name &&
+ !strcasecmp(newalias->pmu_name, a->pmu_name)) {
+ continue;
+ }
perf_pmu_update_alias(a, newalias);
perf_pmu_free_alias(newalias);
return true;
@@ -314,7 +319,8 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
int num;
char newval[256];
char *long_desc = NULL, *topic = NULL, *unit = NULL, *perpkg = NULL,
- *metric_expr = NULL, *metric_name = NULL, *deprecated = NULL;
+ *metric_expr = NULL, *metric_name = NULL, *deprecated = NULL,
+ *pmu_name = NULL;
if (pe) {
long_desc = (char *)pe->long_desc;
@@ -324,6 +330,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
metric_expr = (char *)pe->metric_expr;
metric_name = (char *)pe->metric_name;
deprecated = (char *)pe->deprecated;
+ pmu_name = (char *)pe->pmu;
}
alias = malloc(sizeof(*alias));
@@ -389,6 +396,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
}
alias->per_pkg = perpkg && sscanf(perpkg, "%d", &num) == 1 && num == 1;
alias->str = strdup(newval);
+ alias->pmu_name = pmu_name ? strdup(pmu_name) : NULL;
if (deprecated)
alias->deprecated = true;
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 1f1749ba830f..4f100768c264 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -72,6 +72,7 @@ struct perf_pmu_alias {
bool deprecated;
char *metric_expr;
char *metric_name;
+ char *pmu_name;
};
struct perf_pmu *perf_pmu__find(const char *name);
--
2.17.1
next prev parent reply other threads:[~2021-04-27 7:04 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-27 7:01 [PATCH v6 00/26] perf tool: AlderLake hybrid support series 1 Jin Yao
2021-04-27 7:01 ` [PATCH v6 01/26] tools headers uapi: Update tools's copy of linux/perf_event.h Jin Yao
2021-04-27 19:24 ` Arnaldo Carvalho de Melo
2021-04-28 1:18 ` Jin, Yao
2021-04-27 7:01 ` [PATCH v6 02/26] perf jevents: Support unit value "cpu_core" and "cpu_atom" Jin Yao
2021-04-27 7:01 ` [PATCH v6 03/26] perf pmu: Simplify arguments of __perf_pmu__new_alias Jin Yao
2021-04-27 7:01 ` Jin Yao [this message]
2021-04-27 7:01 ` [PATCH v6 05/26] perf pmu: Save detected hybrid pmus to a global pmu list Jin Yao
2021-04-27 7:01 ` [PATCH v6 06/26] perf pmu: Add hybrid helper functions Jin Yao
2021-04-27 7:01 ` [PATCH v6 07/26] perf stat: Uniquify hybrid event name Jin Yao
2021-04-27 7:01 ` [PATCH v6 08/26] perf parse-events: Create two hybrid hardware events Jin Yao
2021-04-27 7:01 ` [PATCH v6 09/26] perf parse-events: Create two hybrid cache events Jin Yao
2021-04-27 7:01 ` [PATCH v6 10/26] perf parse-events: Create two hybrid raw events Jin Yao
2021-04-27 7:01 ` [PATCH v6 11/26] perf parse-events: Compare with hybrid pmu name Jin Yao
2021-04-27 7:01 ` [PATCH v6 12/26] perf parse-events: Support event inside hybrid pmu Jin Yao
2021-04-27 7:01 ` [PATCH v6 13/26] perf record: Create two hybrid 'cycles' events by default Jin Yao
2021-04-27 7:01 ` [PATCH v6 14/26] perf stat: Add default hybrid events Jin Yao
2021-04-27 7:01 ` [PATCH v6 15/26] perf stat: Filter out unmatched aggregation for hybrid event Jin Yao
2021-04-27 7:01 ` [PATCH v6 16/26] perf stat: Warn group events from different hybrid PMU Jin Yao
2021-04-27 7:01 ` [PATCH v6 17/26] perf record: Uniquify hybrid event name Jin Yao
2021-04-27 7:01 ` [PATCH v6 18/26] perf tests: Add hybrid cases for 'Parse event definition strings' test Jin Yao
2021-04-27 7:01 ` [PATCH v6 19/26] perf tests: Add hybrid cases for 'Roundtrip evsel->name' test Jin Yao
2021-04-27 7:01 ` [PATCH v6 20/26] perf tests: Skip 'Setup struct perf_event_attr' test for hybrid Jin Yao
2021-04-27 7:01 ` [PATCH v6 21/26] perf tests: Support 'Track with sched_switch' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 22/26] perf tests: Support 'Parse and process metrics' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 23/26] perf tests: Support 'Session topology' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 24/26] perf tests: Support 'Convert perf time to TSC' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 25/26] perf tests: Skip 'perf stat metrics (shadow stat) test' " Jin Yao
2021-04-27 7:01 ` [PATCH v6 26/26] perf Documentation: Document intel-hybrid support Jin Yao
2021-04-27 12:50 ` [PATCH v6 00/26] perf tool: AlderLake hybrid support series 1 Jiri Olsa
2021-04-27 13:14 ` Arnaldo Carvalho de Melo
2021-04-28 1:57 ` Jin, Yao
2021-04-28 7:28 ` Jiri Olsa
2021-04-28 8:01 ` Jin, Yao
2021-04-28 13:44 ` 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=20210427070139.25256-5-yao.jin@linux.intel.com \
--to=yao.jin@linux.intel.com \
--cc=Linux-kernel@vger.kernel.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@intel.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=yao.jin@intel.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).