From: Ian Rogers <irogers@google.com>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Michael Petlan <mpetlan@redhat.com>,
Andi Kleen <ak@linux.intel.com>, Kajol Jain <kjain@linux.ibm.com>,
John Garry <john.garry@huawei.com>,
"Paul A. Clarke" <pc@us.ibm.com>,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 05/19] perf metric: Add macros for iterating map events
Date: Sun, 19 Jul 2020 14:46:12 -0700 [thread overview]
Message-ID: <CAP-5=fWYOjCSruJ1=c6896zjJe-e-EMKJTrOUcoeo0fED3tk2A@mail.gmail.com> (raw)
In-Reply-To: <20200719181320.785305-6-jolsa@kernel.org>
On Sun, Jul 19, 2020 at 11:13 AM Jiri Olsa <jolsa@kernel.org> wrote:
>
> Adding following macros to iterate events and metric:
> map_for_each_event(__pe, __idx, __map)
> - iterates over all pmu_events_map events
> map_for_each_metric(__pe, __idx, __map, __metric)
> - iterates over all metrics that match __metric argument
>
> and use it in metricgroup__add_metric function. Macros
> will be be used from other places in following changes.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Thanks!
Ian
> ---
> tools/perf/util/metricgroup.c | 77 ++++++++++++++++++-----------------
> 1 file changed, 40 insertions(+), 37 deletions(-)
>
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index df0356ec120d..b37008fc253c 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -614,6 +614,17 @@ static int __metricgroup__add_metric(struct list_head *group_list,
> return 0;
> }
>
> +#define map_for_each_event(__pe, __idx, __map) \
> + for (__idx = 0, __pe = &__map->table[__idx]; \
> + __pe->name || __pe->metric_group || __pe->metric_name; \
> + __pe = &__map->table[++__idx])
> +
> +#define map_for_each_metric(__pe, __idx, __map, __metric) \
> + map_for_each_event(__pe, __idx, __map) \
> + if (__pe->metric_expr && \
> + (match_metric(__pe->metric_group, __metric) || \
> + match_metric(__pe->metric_name, __metric)))
> +
> static int metricgroup__add_metric(const char *metric, bool metric_no_group,
> struct strbuf *events,
> struct list_head *group_list,
> @@ -624,49 +635,41 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group,
> int i, ret;
> bool has_match = false;
>
> - for (i = 0; ; i++) {
> - pe = &map->table[i];
> -
> - if (!pe->name && !pe->metric_group && !pe->metric_name) {
> - /* End of pmu events. */
> - if (!has_match)
> - return -EINVAL;
> - break;
> - }
> - if (!pe->metric_expr)
> - continue;
> - if (match_metric(pe->metric_group, metric) ||
> - match_metric(pe->metric_name, metric)) {
> - has_match = true;
> - pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
> -
> - if (!strstr(pe->metric_expr, "?")) {
> - ret = __metricgroup__add_metric(group_list,
> - pe,
> - metric_no_group,
> - 1);
> - if (ret)
> - return ret;
> - } else {
> - int j, count;
> + map_for_each_metric(pe, i, map, metric) {
> + pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
> + has_match = true;
> +
> + if (!strstr(pe->metric_expr, "?")) {
> + ret = __metricgroup__add_metric(group_list,
> + pe,
> + metric_no_group,
> + 1);
> + if (ret)
> + return ret;
> + } else {
> + int j, count;
>
> - count = arch_get_runtimeparam();
> + count = arch_get_runtimeparam();
>
> - /* This loop is added to create multiple
> - * events depend on count value and add
> - * those events to group_list.
> - */
> + /* This loop is added to create multiple
> + * events depend on count value and add
> + * those events to group_list.
> + */
>
> - for (j = 0; j < count; j++) {
> - ret = __metricgroup__add_metric(
> - group_list, pe,
> - metric_no_group, j);
> - if (ret)
> - return ret;
> - }
> + for (j = 0; j < count; j++) {
> + ret = __metricgroup__add_metric(
> + group_list, pe,
> + metric_no_group, j);
> + if (ret)
> + return ret;
> }
> }
> }
> +
> + /* End of pmu events. */
> + if (!has_match)
> + return -EINVAL;
> +
> list_for_each_entry(eg, group_list, nd) {
> if (events->len > 0)
> strbuf_addf(events, ",");
> --
> 2.25.4
>
next prev parent reply other threads:[~2020-07-19 21:46 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-19 18:13 [PATCHv3 00/19] perf metric: Add support to reuse metric Jiri Olsa
2020-07-19 18:13 ` [PATCH 01/19] perf metric: Fix memory leak in expr__add_id function Jiri Olsa
2020-07-19 21:41 ` Ian Rogers
2020-07-28 12:26 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 02/19] perf metric: Add " Jiri Olsa
2020-07-26 9:16 ` kajoljain
2020-07-28 12:27 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 03/19] perf metric: Change expr__get_id to return struct expr_id_data Jiri Olsa
2020-07-26 9:17 ` kajoljain
2020-07-28 12:28 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 04/19] perf metric: Add expr__del_id function Jiri Olsa
2020-07-26 9:17 ` kajoljain
2020-07-28 12:28 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 05/19] perf metric: Add macros for iterating map events Jiri Olsa
2020-07-19 21:46 ` Ian Rogers [this message]
2020-07-28 12:29 ` Arnaldo Carvalho de Melo
2020-07-26 9:17 ` kajoljain
2020-07-19 18:13 ` [PATCH 06/19] perf metric: Add add_metric function Jiri Olsa
2020-07-26 9:17 ` kajoljain
2020-07-28 12:30 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 07/19] perf metric: Rename __metricgroup__add_metric to __add_metric Jiri Olsa
2020-07-26 9:18 ` kajoljain
2020-07-28 12:30 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 08/19] perf metric: Collect referenced metrics in struct metric_ref_node Jiri Olsa
2020-07-19 22:18 ` Ian Rogers
2020-07-26 9:18 ` kajoljain
2020-07-28 12:31 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 09/19] perf metric: Collect referenced metrics in struct metric_expr Jiri Olsa
2020-07-26 9:18 ` kajoljain
2020-07-28 12:32 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 10/19] perf metric: Add referenced metrics to hash data Jiri Olsa
2020-07-19 22:32 ` Ian Rogers
2020-07-26 9:18 ` kajoljain
2020-07-28 12:32 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 11/19] perf metric: Compute referenced metrics Jiri Olsa
2020-07-26 9:19 ` kajoljain
2020-07-28 12:33 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 12/19] perf metric: Add events for the current list Jiri Olsa
2020-07-19 22:34 ` Ian Rogers
2020-07-26 9:19 ` kajoljain
2020-07-28 12:33 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 13/19] perf metric: Add cache_miss_cycles to metric parse test Jiri Olsa
2020-07-26 9:19 ` kajoljain
2020-07-28 12:34 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 14/19] perf metric: Add DCache_L2 " Jiri Olsa
2020-07-26 9:19 ` kajoljain
2020-07-28 12:34 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 15/19] perf metric: Add recursion check when processing nested metrics Jiri Olsa
2020-07-19 22:40 ` Ian Rogers
2020-07-26 9:20 ` kajoljain
2020-07-28 12:35 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 16/19] perf metric: Make compute_single function more precise Jiri Olsa
2020-07-28 12:36 ` Arnaldo Carvalho de Melo
2020-07-28 17:26 ` Ian Rogers
2020-07-28 20:17 ` kajoljain
2020-07-29 11:08 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 17/19] perf metric: Add metric group test Jiri Olsa
2020-07-19 22:41 ` Ian Rogers
2020-07-26 9:20 ` kajoljain
2020-07-28 12:37 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 18/19] perf metric: Rename struct egroup to metric Jiri Olsa
2020-07-26 9:20 ` kajoljain
2020-07-19 18:13 ` [PATCH 19/19] perf metric: Rename group_list to metric_list Jiri Olsa
2020-07-19 22:42 ` Ian Rogers
2020-07-26 9:21 ` kajoljain
2020-07-28 12:38 ` Arnaldo Carvalho de Melo
2020-07-20 6:44 ` [PATCHv3 00/19] perf metric: Add support to reuse metric kajoljain
2020-07-20 7:22 ` Jiri Olsa
2020-07-20 8:09 ` kajoljain
2020-07-20 8:19 ` Jiri Olsa
2020-07-20 9:02 ` kajoljain
2020-07-20 19:16 ` Jiri Olsa
2020-07-24 5:52 ` kajoljain
2020-07-25 11:51 ` Jiri Olsa
2020-07-26 9:14 ` kajoljain
2020-07-28 12:39 ` Arnaldo Carvalho de Melo
2020-07-28 12:54 ` Jiri Olsa
2020-07-28 13:01 ` Jiri Olsa
2020-07-28 13:34 ` [PATCHv3 20/19] perf metric: Fix runtime metric for powerpc Jiri Olsa
2020-07-28 15:22 ` [PATCHv3 00/19] perf metric: Add support to reuse metric Arnaldo Carvalho de Melo
2020-07-21 14:48 ` Paul A. Clarke
2020-07-22 18:11 ` Jiri Olsa
2020-07-23 15:59 ` Paul A. Clarke
2020-07-25 11:52 ` Jiri Olsa
2020-07-28 12:42 ` Arnaldo Carvalho de Melo
2020-07-23 17:14 ` Paul A. Clarke
2020-07-23 17:40 ` Andi Kleen
2020-07-29 9:18 [PATCHv4 " Jiri Olsa
2020-07-29 9:18 ` [PATCH 05/19] perf metric: Add macros for iterating map events Jiri Olsa
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='CAP-5=fWYOjCSruJ1=c6896zjJe-e-EMKJTrOUcoeo0fED3tk2A@mail.gmail.com' \
--to=irogers@google.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@kernel.org \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=pc@us.ibm.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).