On hybrid platform, user may want to enable events on one pmu.
Following syntax are supported:
cpu_core/<event>/
cpu_atom/<event>/
But the syntax doesn't work for cache event.
Before:
# perf stat -e cpu_core/LLC-loads/ -a -- sleep 1
event syntax error: 'cpu_core/LLC-loads/'
\___ unknown term 'LLC-loads' for pmu 'cpu_core'
Cache events are a bit complex. We can't create aliases for them.
We use another solution. For example, if we use "cpu_core/LLC-loads/",
in parse_events_add_pmu(), term->config is "LLC-loads".
Then we create a new parser to scan "LLC-loads". The
parse_events_add_cache() would be called during parsing.
The parse_state->hybrid_pmu_name is used to identify the pmu
where the event should be enabled on.
After:
# perf stat -e cpu_core/LLC-loads/ -a -- sleep 1
Performance counter stats for 'system wide':
24,593 cpu_core/LLC-loads/
1.003911601 seconds time elapsed
Signed-off-by: Jin Yao <[email protected]>
---
v5:
- Check the head_config list has only one term and if yes then
do the second parsing. We drop the 'parsed' param and make
parse_events__with_hybrid_pmu return 0 when we find some event.
Move 'evsel->use_config_name = true;' to the patch
'[PATCH v5 07/26] perf stat: Uniquify hybrid event name'.
v4:
- New in v4.
tools/perf/util/parse-events.c | 63 ++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 26f96a30964f..6ee48ee3cdc6 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -38,6 +38,7 @@
#include "util/event.h"
#include "util/pfm.h"
#include "util/parse-events-hybrid.h"
+#include "util/pmu-hybrid.h"
#include "perf.h"
#define MAX_NAME_LEN 100
@@ -48,6 +49,9 @@ extern int parse_events_debug;
int parse_events_parse(void *parse_state, void *scanner);
static int get_config_terms(struct list_head *head_config,
struct list_head *head_terms __maybe_unused);
+static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state,
+ const char *str, char *pmu_name,
+ struct list_head *list);
static struct perf_pmu_event_symbol *perf_pmu_events_list;
/*
@@ -1474,6 +1478,33 @@ static bool config_term_percore(struct list_head *config_terms)
return false;
}
+static int parse_events__inside_hybrid_pmu(struct parse_events_state *parse_state,
+ struct list_head *list, char *name,
+ struct list_head *head_config)
+{
+ struct parse_events_term *term;
+ int ret = -1;
+
+ if (parse_state->fake_pmu || !head_config || list_empty(head_config) ||
+ !perf_pmu__is_hybrid(name)) {
+ return -1;
+ }
+
+ /*
+ * More than one term in list.
+ */
+ if (head_config->next && head_config->next->next != head_config)
+ return -1;
+
+ term = list_first_entry(head_config, struct parse_events_term, list);
+ if (term && term->config && strcmp(term->config, "event")) {
+ ret = parse_events__with_hybrid_pmu(parse_state, term->config,
+ name, list);
+ }
+
+ return ret;
+}
+
int parse_events_add_pmu(struct parse_events_state *parse_state,
struct list_head *list, char *name,
struct list_head *head_config,
@@ -1567,6 +1598,11 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
if (pmu->default_config && get_config_chgs(pmu, head_config, &config_terms))
return -ENOMEM;
+ if (!parse_events__inside_hybrid_pmu(parse_state, list, name,
+ head_config)) {
+ return 0;
+ }
+
if (!parse_state->fake_pmu && perf_pmu__config(pmu, &attr, head_config, parse_state->error)) {
struct evsel_config_term *pos, *tmp;
@@ -2183,6 +2219,33 @@ int parse_events_terms(struct list_head *terms, const char *str)
return ret;
}
+static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state,
+ const char *str, char *pmu_name,
+ struct list_head *list)
+{
+ struct parse_events_state ps = {
+ .list = LIST_HEAD_INIT(ps.list),
+ .stoken = PE_START_EVENTS,
+ .hybrid_pmu_name = pmu_name,
+ .idx = parse_state->idx,
+ };
+ int ret;
+
+ ret = parse_events__scanner(str, &ps);
+ perf_pmu__parse_cleanup();
+
+ if (!ret) {
+ if (!list_empty(&ps.list)) {
+ list_splice(&ps.list, list);
+ parse_state->idx = ps.idx;
+ return 0;
+ } else
+ return -1;
+ }
+
+ return ret;
+}
+
int __parse_events(struct evlist *evlist, const char *str,
struct parse_events_error *err, struct perf_pmu *fake_pmu)
{
--
2.17.1
On Fri, Apr 23, 2021 at 01:35:27PM +0800, Jin Yao wrote:
SNIP
> +static int parse_events__inside_hybrid_pmu(struct parse_events_state *parse_state,
> + struct list_head *list, char *name,
> + struct list_head *head_config)
> +{
> + struct parse_events_term *term;
> + int ret = -1;
> +
> + if (parse_state->fake_pmu || !head_config || list_empty(head_config) ||
> + !perf_pmu__is_hybrid(name)) {
> + return -1;
> + }
> +
> + /*
> + * More than one term in list.
> + */
> + if (head_config->next && head_config->next->next != head_config)
> + return -1;
> +
> + term = list_first_entry(head_config, struct parse_events_term, list);
> + if (term && term->config && strcmp(term->config, "event")) {
so 'event' is set only for HW events, I don't see it being for other
types.. also should the check be !strcmp ?
also please add some tests for cache events with pmu syntax
jirka
> + ret = parse_events__with_hybrid_pmu(parse_state, term->config,
> + name, list);
> + }
> +
> + return ret;
> +}
> +
> int parse_events_add_pmu(struct parse_events_state *parse_state,
> struct list_head *list, char *name,
> struct list_head *head_config,
> @@ -1567,6 +1598,11 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
> if (pmu->default_config && get_config_chgs(pmu, head_config, &config_terms))
> return -ENOMEM;
>
> + if (!parse_events__inside_hybrid_pmu(parse_state, list, name,
> + head_config)) {
> + return 0;
> + }
> +
> if (!parse_state->fake_pmu && perf_pmu__config(pmu, &attr, head_config, parse_state->error)) {
> struct evsel_config_term *pos, *tmp;
>
> @@ -2183,6 +2219,33 @@ int parse_events_terms(struct list_head *terms, const char *str)
> return ret;
> }
>
> +static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state,
> + const char *str, char *pmu_name,
> + struct list_head *list)
> +{
> + struct parse_events_state ps = {
> + .list = LIST_HEAD_INIT(ps.list),
> + .stoken = PE_START_EVENTS,
> + .hybrid_pmu_name = pmu_name,
> + .idx = parse_state->idx,
> + };
> + int ret;
> +
> + ret = parse_events__scanner(str, &ps);
> + perf_pmu__parse_cleanup();
> +
> + if (!ret) {
> + if (!list_empty(&ps.list)) {
> + list_splice(&ps.list, list);
> + parse_state->idx = ps.idx;
> + return 0;
> + } else
> + return -1;
> + }
> +
> + return ret;
> +}
> +
> int __parse_events(struct evlist *evlist, const char *str,
> struct parse_events_error *err, struct perf_pmu *fake_pmu)
> {
> --
> 2.17.1
>
Hi Jiri,
On 4/26/2021 12:17 AM, Jiri Olsa wrote:
> On Fri, Apr 23, 2021 at 01:35:27PM +0800, Jin Yao wrote:
>
> SNIP
>
>> +static int parse_events__inside_hybrid_pmu(struct parse_events_state *parse_state,
>> + struct list_head *list, char *name,
>> + struct list_head *head_config)
>> +{
>> + struct parse_events_term *term;
>> + int ret = -1;
>> +
>> + if (parse_state->fake_pmu || !head_config || list_empty(head_config) ||
>> + !perf_pmu__is_hybrid(name)) {
>> + return -1;
>> + }
>> +
>> + /*
>> + * More than one term in list.
>> + */
>> + if (head_config->next && head_config->next->next != head_config)
>> + return -1;
>> +
>> + term = list_first_entry(head_config, struct parse_events_term, list);
>> + if (term && term->config && strcmp(term->config, "event")) {
>
> so 'event' is set only for HW events, I don't see it being for other
> types.. also should the check be !strcmp ?
>
For some HW events, such as branch-instructions, branch-misses and other HW events which are defined
under /sys/devices/cpu_core/events, the term->config is "event". For these events, we don't need to
do the second parsing. So I just use 'strcmp(term->config, "event")' to avoid the second parsing.
If we check with !strcmp, the second parsing will be executed but the result after parsing should be
empty.
> also please add some tests for cache events with pmu syntax
>
OK, I will add new test case for that.
Thanks
Jin Yao
> jirka
>
>> + ret = parse_events__with_hybrid_pmu(parse_state, term->config,
>> + name, list);
>> + }
>> +
>> + return ret;
>> +}
>> +
>> int parse_events_add_pmu(struct parse_events_state *parse_state,
>> struct list_head *list, char *name,
>> struct list_head *head_config,
>> @@ -1567,6 +1598,11 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
>> if (pmu->default_config && get_config_chgs(pmu, head_config, &config_terms))
>> return -ENOMEM;
>>
>> + if (!parse_events__inside_hybrid_pmu(parse_state, list, name,
>> + head_config)) {
>> + return 0;
>> + }
>> +
>> if (!parse_state->fake_pmu && perf_pmu__config(pmu, &attr, head_config, parse_state->error)) {
>> struct evsel_config_term *pos, *tmp;
>>
>> @@ -2183,6 +2219,33 @@ int parse_events_terms(struct list_head *terms, const char *str)
>> return ret;
>> }
>>
>> +static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state,
>> + const char *str, char *pmu_name,
>> + struct list_head *list)
>> +{
>> + struct parse_events_state ps = {
>> + .list = LIST_HEAD_INIT(ps.list),
>> + .stoken = PE_START_EVENTS,
>> + .hybrid_pmu_name = pmu_name,
>> + .idx = parse_state->idx,
>> + };
>> + int ret;
>> +
>> + ret = parse_events__scanner(str, &ps);
>> + perf_pmu__parse_cleanup();
>> +
>> + if (!ret) {
>> + if (!list_empty(&ps.list)) {
>> + list_splice(&ps.list, list);
>> + parse_state->idx = ps.idx;
>> + return 0;
>> + } else
>> + return -1;
>> + }
>> +
>> + return ret;
>> +}
>> +
>> int __parse_events(struct evlist *evlist, const char *str,
>> struct parse_events_error *err, struct perf_pmu *fake_pmu)
>> {
>> --
>> 2.17.1
>>
>
On Mon, Apr 26, 2021 at 08:56:28AM +0800, Jin, Yao wrote:
> Hi Jiri,
>
> On 4/26/2021 12:17 AM, Jiri Olsa wrote:
> > On Fri, Apr 23, 2021 at 01:35:27PM +0800, Jin Yao wrote:
> >
> > SNIP
> >
> > > +static int parse_events__inside_hybrid_pmu(struct parse_events_state *parse_state,
> > > + struct list_head *list, char *name,
> > > + struct list_head *head_config)
> > > +{
> > > + struct parse_events_term *term;
> > > + int ret = -1;
> > > +
> > > + if (parse_state->fake_pmu || !head_config || list_empty(head_config) ||
> > > + !perf_pmu__is_hybrid(name)) {
> > > + return -1;
> > > + }
> > > +
> > > + /*
> > > + * More than one term in list.
> > > + */
> > > + if (head_config->next && head_config->next->next != head_config)
> > > + return -1;
> > > +
> > > + term = list_first_entry(head_config, struct parse_events_term, list);
> > > + if (term && term->config && strcmp(term->config, "event")) {
> >
> > so 'event' is set only for HW events, I don't see it being for other
> > types.. also should the check be !strcmp ?
> >
>
> For some HW events, such as branch-instructions, branch-misses and other HW
> events which are defined under /sys/devices/cpu_core/events, the
> term->config is "event". For these events, we don't need to do the second
> parsing. So I just use 'strcmp(term->config, "event")' to avoid the second
> parsing.
ah ok.. I thought it's the other way round
>
> If we check with !strcmp, the second parsing will be executed but the result
> after parsing should be empty.
>
> > also please add some tests for cache events with pmu syntax
> >
>
> OK, I will add new test case for that.
thanks,
jirka