Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200712132634.138901-1-jolsa@kernel.org> <20200712132634.138901-7-jolsa@kernel.org>
In-Reply-To: <20200712132634.138901-7-jolsa@kernel.org>
From:   Ian Rogers <irogers@google.com>
Date:   Tue, 14 Jul 2020 14:09:28 -0700
Message-ID: <CAP-5=fWeRpc-G8fJgOpox3nvP9jzrC8ijkPKaAdBUGby1VkASg@mail.gmail.com>
Subject: Re: [PATCH 06/18] perf metric: Add find_metric function
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>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, Jul 12, 2020 at 6:27 AM Jiri Olsa <jolsa@kernel.org> wrote:
>
> Decouple lookup metric logic into find_metric function,
> so it can 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 | 89 +++++++++++++++++++----------------
>  1 file changed, 48 insertions(+), 41 deletions(-)
>
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index df0356ec120d..72552608ff7d 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -614,57 +614,64 @@ static int __metricgroup__add_metric(struct list_head *group_list,
>         return 0;
>  }
>
> -static int metricgroup__add_metric(const char *metric, bool metric_no_group,
> -                                  struct strbuf *events,
> -                                  struct list_head *group_list,
> -                                  struct pmu_events_map *map)
> +static struct pmu_event *find_metric(const char *metric, struct pmu_events_map *map)
>  {
>         struct pmu_event *pe;
> -       struct egroup *eg;
> -       int i, ret;
> -       bool has_match = false;
> +       int i;
>
>         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;
> +               /* End of pmu events. */
> +               if (!pe->name && !pe->metric_group && !pe->metric_name)
>                         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;
> -
> -                               count = arch_get_runtimeparam();
> -
> -                               /* This loop is added to create multiple
> -                                * events depend on count value and add
> -                                * those events to group_list.
> -                                */
> +                   match_metric(pe->metric_name, metric))
> +                       return pe;
> +       }
>
> -                               for (j = 0; j < count; j++) {
> -                                       ret = __metricgroup__add_metric(
> -                                               group_list, pe,
> -                                               metric_no_group, j);
> -                                       if (ret)
> -                                               return ret;
> -                               }
> -                       }
> +       return NULL;
> +}
> +
> +static int metricgroup__add_metric(const char *metric, bool metric_no_group,
> +                                  struct strbuf *events,
> +                                  struct list_head *group_list,
> +                                  struct pmu_events_map *map)
> +{
> +       struct pmu_event *pe;
> +       struct egroup *eg;
> +       int ret;
> +
> +       pe = find_metric(metric, map);
> +       if (!pe)
> +               return -EINVAL;
> +
> +       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;
> +
> +               count = arch_get_runtimeparam();
> +
> +               /* 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;
>                 }
>         }
>         list_for_each_entry(eg, group_list, nd) {
> --
> 2.25.4
>