Re: [RFC PATCH v3 3/6] perf stat: Add retire latency values into the expr_parse_ctx to prepare for final metric calculation

[Namhyung Kim]

On Fri, Mar 1, 2024 at 4:11 PM <weilin.wang@xxxxxxxxx> wrote:
>
> From: Weilin Wang <weilin.wang@xxxxxxxxx>
>
> Retire latency values of events are used in metric formulas. This update adds
> code to process data from perf record for required retire latency values.
>
> Signed-off-by: Weilin Wang <weilin.wang@xxxxxxxxx>
> ---
>  tools/perf/builtin-stat.c     |  1 +
>  tools/perf/util/metricgroup.h |  1 +
>  tools/perf/util/stat-shadow.c | 18 ++++++++++++++++++
>  3 files changed, 20 insertions(+)
>
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index 3890a579349e..3e5865572266 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -792,6 +792,7 @@ static int process_sample_event(struct perf_tool *tool,
>                 if (!strcmp(evname, t->name)) {
>                         t->count += 1;
>                         t->sum += sample->retire_lat;
> +                       t->val = t->count > 0 ? t->sum/t->count : 0;

You already increase the count, then it cannot be 0, right?


>                         break;
>                 }
>         }
> diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
> index 1fa12cc3294e..08af0f447550 100644
> --- a/tools/perf/util/metricgroup.h
> +++ b/tools/perf/util/metricgroup.h
> @@ -77,6 +77,7 @@ struct tpebs_retire_lat {
>         const char *tpebs_name;
>         size_t count;
>         int sum;
> +       double val;
>  };
>
>  struct metric_event *metricgroup__lookup(struct rblist *metric_events,
> diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
> index 3466aa952442..c63ba52004fc 100644
> --- a/tools/perf/util/stat-shadow.c
> +++ b/tools/perf/util/stat-shadow.c
> @@ -355,6 +355,19 @@ static void print_nsecs(struct perf_stat_config *config,
>                 print_metric(config, ctxp, NULL, NULL, "CPUs utilized", 0);
>  }
>
> +static int prepare_retire_lat(struct expr_parse_ctx *pctx,
> +                            struct list_head *retire_lats)
> +{
> +       int ret = 0;
> +       struct tpebs_retire_lat *t;

A newline please.

Thanks,
Namhyung


> +       list_for_each_entry(t, retire_lats, nd) {
> +               ret = expr__add_id_val(pctx, strdup(t->tpebs_name), t->val);
> +               if (ret < 0)
> +                       return ret;
> +       }
> +       return ret;
> +}
> +
>  static int prepare_metric(const struct metric_expr *mexp,
>                           const struct evsel *evsel,
>                           struct expr_parse_ctx *pctx,
> @@ -486,6 +499,11 @@ static void generic_metric(struct perf_stat_config *config,
>                 pctx->sctx.user_requested_cpu_list = strdup(config->user_requested_cpu_list);
>         pctx->sctx.runtime = runtime;
>         pctx->sctx.system_wide = config->system_wide;
> +       i = prepare_retire_lat(pctx, &config->tpebs_results);
> +       if (i < 0) {
> +               expr__ctx_free(pctx);
> +               return;
> +       }
>         i = prepare_metric(mexp, evsel, pctx, aggr_idx);
>         if (i < 0) {
>                 expr__ctx_free(pctx);
> --
> 2.43.0
>