Messages in this thread | | | Date | Wed, 28 Feb 2018 08:50:00 -0500 | From | Agustin Vega-Frias <> | Subject | Re: [RFC 3/3] perf pmu: Restore auto-merging of PMU events created by prefix match |
| |
On 2018-02-28 07:45, Arnaldo Carvalho de Melo wrote: > Em Wed, Feb 28, 2018 at 10:40:38AM +0100, Jiri Olsa escreveu: >> On Tue, Feb 27, 2018 at 05:34:08PM -0500, Agustin Vega-Frias wrote: >> > This was disabled when auto-merging of non-alias events was disabled in >> > commit 63ce844 (perf stat: Only auto-merge events that are PMU aliases). >> >> this changes the output, right? please provide before/after output > > Yes, please show how it was and how it became, also please update the > documentation, as pointed out by Andi.
Thanks all for the feedback, I'll make the updates requested and submit a follow up.
Agustín
> > - Arnaldo > >> thanks, >> jirka >> >> > >> > Signed-off-by: Agustin Vega-Frias <agustinv@codeaurora.org> >> > --- >> > tools/perf/util/parse-events.c | 13 +++---------- >> > tools/perf/util/parse-events.h | 2 +- >> > tools/perf/util/parse-events.y | 4 ++-- >> > 3 files changed, 6 insertions(+), 13 deletions(-) >> > >> > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c >> > index bafc91e..4e80ca3 100644 >> > --- a/tools/perf/util/parse-events.c >> > +++ b/tools/perf/util/parse-events.c >> > @@ -1217,7 +1217,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state, >> > get_config_name(head_config), &config_terms); >> > } >> > >> > -static int __parse_events_add_pmu(struct parse_events_state *parse_state, >> > +int parse_events_add_pmu(struct parse_events_state *parse_state, >> > struct list_head *list, char *name, >> > struct list_head *head_config, bool auto_merge_stats) >> > { >> > @@ -1287,13 +1287,6 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state, >> > return evsel ? 0 : -ENOMEM; >> > } >> > >> > -int parse_events_add_pmu(struct parse_events_state *parse_state, >> > - struct list_head *list, char *name, >> > - struct list_head *head_config) >> > -{ >> > - return __parse_events_add_pmu(parse_state, list, name, head_config, false); >> > -} >> > - >> > int parse_events_multi_pmu_add(struct parse_events_state *parse_state, >> > char *str, struct list_head **listp) >> > { >> > @@ -1323,8 +1316,8 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, >> > return -1; >> > list_add_tail(&term->list, head); >> > >> > - if (!__parse_events_add_pmu(parse_state, list, >> > - pmu->name, head, true)) { >> > + if (!parse_events_add_pmu(parse_state, list, >> > + pmu->name, head, true)) { >> > pr_debug("%s -> %s/%s/\n", str, >> > pmu->name, alias->str); >> > ok++; >> > diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h >> > index 88108cd..5015cfd 100644 >> > --- a/tools/perf/util/parse-events.h >> > +++ b/tools/perf/util/parse-events.h >> > @@ -167,7 +167,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx, >> > void *ptr, char *type, u64 len); >> > int parse_events_add_pmu(struct parse_events_state *parse_state, >> > struct list_head *list, char *name, >> > - struct list_head *head_config); >> > + struct list_head *head_config, bool auto_merge_stats); >> > >> > int parse_events_multi_pmu_add(struct parse_events_state *parse_state, >> > char *str, >> > diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y >> > index c528469..b51278f 100644 >> > --- a/tools/perf/util/parse-events.y >> > +++ b/tools/perf/util/parse-events.y >> > @@ -232,7 +232,7 @@ PE_NAME opt_event_config >> > YYABORT; >> > >> > ALLOC_LIST(list); >> > - if (parse_events_add_pmu(_parse_state, list, $1, $2)) { >> > + if (parse_events_add_pmu(_parse_state, list, $1, $2, false)) { >> > struct perf_pmu *pmu = NULL; >> > int ok = 0; >> > >> > @@ -245,7 +245,7 @@ PE_NAME opt_event_config >> > if (!strncmp($1, name, strlen($1)) || !fnmatch($1, name, 0)) { >> > if (parse_events_copy_term_list(orig_terms, &terms)) >> > YYABORT; >> > - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms)) >> > + if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true)) >> > ok++; >> > parse_events_terms__delete(terms); >> > } >> > -- >> > 2.7.4 >> >
-- Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
| |