From nobody Tue Apr 7 03:49:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D45CECAAD3 for ; Wed, 31 Aug 2022 17:51:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231828AbiHaRvF (ORCPT ); Wed, 31 Aug 2022 13:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232082AbiHaRue (ORCPT ); Wed, 31 Aug 2022 13:50:34 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDFA042AE0 for ; Wed, 31 Aug 2022 10:50:30 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-33dc888dc62so209003307b3.4 for ; Wed, 31 Aug 2022 10:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc; bh=nu2rpCUw/Ti/dsFRgrjgAXHPygpYA9VZ4stH1ncWyqY=; b=qP+XCu4ase/9c9Vdh6qQW21bl4ykqRfFAznLlnf/fQWuzXLX9aV150UDl6sUPsAcq1 wteT6EZPHtrwfOIH/81KNHa0PXocRhAeiOqhZMHnbaJlO2+VWAv1HKtkYxSd8vJogWBu IKmMIXuBy2bEBmh8tJ1qUsXbtO7CR4p++aLpMcQQrUFjKVlSOKYM0KRlPXv435Nd3nSH ouq93GobZzFXg4UQ60n3g/pAGa+iktRA7F9O/XZjxIcLCZUZ6+KE2OQB/JjekU5wPfHL XdzpLpxWfL7rDyIjmoA2Kb1R7vogltvao4zmR/gZubhYX0kU65WXAXBpNxH6puThLtWe GSbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc; bh=nu2rpCUw/Ti/dsFRgrjgAXHPygpYA9VZ4stH1ncWyqY=; b=InKDT1YoNU4RI2w0mxBLKShssMzOdZF2Z/3o/Y6x6c7KW+jLmsZ+WPaPgCWNHHtOp3 3cq+QSlgI7UqfMJybabizlSCsqmSrX+V6LzYqgnogtSIfpJr6tdYsxqA0IuuyypwkduY t9dLBUQYN7X5NG7wKuWYEwtqLjowGi7CyK/fJEaE809UOiUusx7Mmj0DztnZbJ6gqvnG uEM4BjZAiGBiRJ+rNQkMEr2Wu4vx0HStJbNpz2hVNdrrrUm6gNrxsuYZJ4slkQtLObqU y6lBiqZxOL1LtWODOZs+kGLCzt0503+kSa3GXR7RQCcyi/v9F87u6FCMbNBxWqDP3zul PccQ== X-Gm-Message-State: ACgBeo0XFPGJz+9RnxjnQPG91tIByY7oUWJZsQi35XGu5GvY8vV65x+R puB3MYH9lNXKTlGhEs1eaUzTlTdINP68 X-Google-Smtp-Source: AA6agR58twdysv4D5X/IvKiN2yva0WHToCUgkPBVmhXgHoTyK3G2VSAImupbZ8N8Wod3WNC2fPMlR4uHImZK X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c8e4:a3e5:9d09:d3d4]) (user=irogers job=sendgmr) by 2002:a5b:a4e:0:b0:695:81dc:5343 with SMTP id z14-20020a5b0a4e000000b0069581dc5343mr16265290ybq.402.1661968229793; Wed, 31 Aug 2022 10:50:29 -0700 (PDT) Date: Wed, 31 Aug 2022 10:49:25 -0700 In-Reply-To: <20220831174926.579643-1-irogers@google.com> Message-Id: <20220831174926.579643-7-irogers@google.com> Mime-Version: 1.0 References: <20220831174926.579643-1-irogers@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Subject: [PATCH v2 6/7] perf metrics: Wire up core_wide From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andi Kleen , Kan Liang , Thomas Richter , James Clark , Miaoqian Lin , John Garry , Zhengjun Xing , Florian Fischer , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, perry.taylor@intel.com, caleb.biggers@intel.com, kshipra.bopardikar@intel.com, ahmad.yasin@intel.com Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Pass state necessary for core_wide into the expression parser. Add system_wide and user_requested_cpu_list to perf_stat_config to make it available at display time. evlist isn't used as the evlist__create_maps, that computes user_requested_cpus, needs the list of events which is generated by the metric. Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 14 ++++ tools/perf/util/expr.c | 13 +++- tools/perf/util/expr.h | 4 +- tools/perf/util/expr.l | 6 +- tools/perf/util/metricgroup.c | 125 ++++++++++++++++++++++++---------- tools/perf/util/metricgroup.h | 2 + tools/perf/util/stat-shadow.c | 11 ++- tools/perf/util/stat.h | 2 + 8 files changed, 134 insertions(+), 43 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index a59c23f4ffd2..35185ee1243e 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1805,6 +1805,8 @@ static int add_default_attributes(void) return metricgroup__parse_groups(evsel_list, "transaction", stat_config.metric_no_group, stat_config.metric_no_merge, + stat_config.user_requested_cpu_list, + stat_config.system_wide, &stat_config.metric_events); } =20 @@ -2440,6 +2442,15 @@ int cmd_stat(int argc, const char **argv) if ((stat_config.aggr_mode =3D=3D AGGR_THREAD) && (target.system_wide)) target.per_thread =3D true; =20 + stat_config.system_wide =3D target.system_wide; + if (target.cpu_list) { + stat_config.user_requested_cpu_list =3D strdup(target.cpu_list); + if (!stat_config.user_requested_cpu_list) { + status =3D -ENOMEM; + goto out; + } + } + /* * Metric parsing needs to be delayed as metrics may optimize events * knowing the target is system-wide. @@ -2448,6 +2459,8 @@ int cmd_stat(int argc, const char **argv) metricgroup__parse_groups(evsel_list, metrics, stat_config.metric_no_group, stat_config.metric_no_merge, + stat_config.user_requested_cpu_list, + stat_config.system_wide, &stat_config.metric_events); zfree(&metrics); } @@ -2638,6 +2651,7 @@ int cmd_stat(int argc, const char **argv) iostat_release(evsel_list); =20 zfree(&stat_config.walltime_run); + zfree(&stat_config.user_requested_cpu_list); =20 if (smi_cost && smi_reset) sysfs__write_int(FREEZE_ON_SMI_PATH, 0); diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 8aa7dafa18b3..c6827900f8d3 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -310,7 +310,9 @@ struct expr_parse_ctx *expr__ctx_new(void) free(ctx); return NULL; } + ctx->sctx.user_requested_cpu_list =3D NULL; ctx->sctx.runtime =3D 0; + ctx->sctx.system_wide =3D false; =20 return ctx; } @@ -332,6 +334,10 @@ void expr__ctx_free(struct expr_parse_ctx *ctx) struct hashmap_entry *cur; size_t bkt; =20 + if (!ctx) + return; + + free(ctx->sctx.user_requested_cpu_list); hashmap__for_each_entry(ctx->ids, cur, bkt) { free((char *)cur->key); free(cur->value); @@ -407,7 +413,7 @@ double arch_get_tsc_freq(void) } #endif =20 -double expr__get_literal(const char *literal) +double expr__get_literal(const char *literal, const struct expr_scanner_ct= x *ctx) { static struct cpu_topology *topology; double result =3D NAN; @@ -439,6 +445,11 @@ double expr__get_literal(const char *literal) result =3D smt_on(topology) ? 1.0 : 0.0; goto out; } + if (!strcmp("#core_wide", literal)) { + result =3D core_wide(ctx->system_wide, ctx->user_requested_cpu_list, top= ology) + ? 1.0 : 0.0; + goto out; + } if (!strcmp("#num_packages", literal)) { result =3D topology->package_cpus_lists; goto out; diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index 07af3d438eb2..d6c1668dc1a0 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -11,7 +11,9 @@ struct metric_ref; =20 struct expr_scanner_ctx { + char *user_requested_cpu_list; int runtime; + bool system_wide; }; =20 struct expr_parse_ctx { @@ -55,6 +57,6 @@ int expr__find_ids(const char *expr, const char *one, =20 double expr_id_data__value(const struct expr_id_data *data); double expr_id_data__source_count(const struct expr_id_data *data); -double expr__get_literal(const char *literal); +double expr__get_literal(const char *literal, const struct expr_scanner_ct= x *ctx); =20 #endif diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l index 4dc8edbfd9ce..0168a9637330 100644 --- a/tools/perf/util/expr.l +++ b/tools/perf/util/expr.l @@ -79,11 +79,11 @@ static int str(yyscan_t scanner, int token, int runtime) return token; } =20 -static int literal(yyscan_t scanner) +static int literal(yyscan_t scanner, const struct expr_scanner_ctx *sctx) { YYSTYPE *yylval =3D expr_get_lval(scanner); =20 - yylval->num =3D expr__get_literal(expr_get_text(scanner)); + yylval->num =3D expr__get_literal(expr_get_text(scanner), sctx); if (isnan(yylval->num)) return EXPR_ERROR; =20 @@ -108,7 +108,7 @@ min { return MIN; } if { return IF; } else { return ELSE; } source_count { return SOURCE_COUNT; } -{literal} { return literal(yyscanner); } +{literal} { return literal(yyscanner, sctx); } {number} { return value(yyscanner); } {symbol} { return str(yyscanner, ID, sctx->runtime); } "|" { return '|'; } diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 9151346a16ab..b18da1a62a55 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "util.h" @@ -189,10 +190,24 @@ static bool metricgroup__has_constraint(const struct = pmu_event *pe) return false; } =20 +static void metric__free(struct metric *m) +{ + if (!m) + return; + + free(m->metric_refs); + expr__ctx_free(m->pctx); + free((char *)m->modifier); + evlist__delete(m->evlist); + free(m); +} + static struct metric *metric__new(const struct pmu_event *pe, const char *modifier, bool metric_no_group, - int runtime) + int runtime, + const char *user_requested_cpu_list, + bool system_wide) { struct metric *m; =20 @@ -201,35 +216,34 @@ static struct metric *metric__new(const struct pmu_ev= ent *pe, return NULL; =20 m->pctx =3D expr__ctx_new(); - if (!m->pctx) { - free(m); - return NULL; - } + if (!m->pctx) + goto out_err; =20 m->metric_name =3D pe->metric_name; - m->modifier =3D modifier ? strdup(modifier) : NULL; - if (modifier && !m->modifier) { - expr__ctx_free(m->pctx); - free(m); - return NULL; + m->modifier =3D NULL; + if (modifier) { + m->modifier =3D strdup(modifier); + if (!m->modifier) + goto out_err; } m->metric_expr =3D pe->metric_expr; m->metric_unit =3D pe->unit; + m->pctx->sctx.user_requested_cpu_list =3D NULL; + if (user_requested_cpu_list) { + m->pctx->sctx.user_requested_cpu_list =3D strdup(user_requested_cpu_list= ); + if (!m->pctx->sctx.user_requested_cpu_list) + goto out_err; + } m->pctx->sctx.runtime =3D runtime; + m->pctx->sctx.system_wide =3D system_wide; m->has_constraint =3D metric_no_group || metricgroup__has_constraint(pe); m->metric_refs =3D NULL; m->evlist =3D NULL; =20 return m; -} - -static void metric__free(struct metric *m) -{ - free(m->metric_refs); - expr__ctx_free(m->pctx); - free((char *)m->modifier); - evlist__delete(m->evlist); - free(m); +out_err: + metric__free(m); + return NULL; } =20 static bool contains_metric_id(struct evsel **metric_events, int num_event= s, @@ -874,6 +888,8 @@ struct metricgroup_add_iter_data { int *ret; bool *has_match; bool metric_no_group; + const char *user_requested_cpu_list; + bool system_wide; struct metric *root_metric; const struct visited_metric *visited; const struct pmu_events_table *table; @@ -887,6 +903,8 @@ static int add_metric(struct list_head *metric_list, const struct pmu_event *pe, const char *modifier, bool metric_no_group, + const char *user_requested_cpu_list, + bool system_wide, struct metric *root_metric, const struct visited_metric *visited, const struct pmu_events_table *table); @@ -899,6 +917,8 @@ static int add_metric(struct list_head *metric_list, * @metric_no_group: Should events written to events be grouped "{}" or * global. Grouping is the default but due to multiplexi= ng the * user may override. + * @user_requested_cpu_list: Command line specified CPUs to record on. + * @system_wide: Are events for all processes recorded. * @root_metric: Metrics may reference other metrics to form a tree. In th= is * case the root_metric holds all the IDs and a list of refe= renced * metrics. When adding a root this argument is NULL. @@ -910,6 +930,8 @@ static int add_metric(struct list_head *metric_list, static int resolve_metric(struct list_head *metric_list, const char *modifier, bool metric_no_group, + const char *user_requested_cpu_list, + bool system_wide, struct metric *root_metric, const struct visited_metric *visited, const struct pmu_events_table *table) @@ -956,7 +978,8 @@ static int resolve_metric(struct list_head *metric_list, */ for (i =3D 0; i < pending_cnt; i++) { ret =3D add_metric(metric_list, &pending[i].pe, modifier, metric_no_grou= p, - root_metric, visited, table); + user_requested_cpu_list, system_wide, root_metric, visited, + table); if (ret) break; } @@ -974,6 +997,8 @@ static int resolve_metric(struct list_head *metric_list, * global. Grouping is the default but due to multiplexi= ng the * user may override. * @runtime: A special argument for the parser only known at runtime. + * @user_requested_cpu_list: Command line specified CPUs to record on. + * @system_wide: Are events for all processes recorded. * @root_metric: Metrics may reference other metrics to form a tree. In th= is * case the root_metric holds all the IDs and a list of refe= renced * metrics. When adding a root this argument is NULL. @@ -987,6 +1012,8 @@ static int __add_metric(struct list_head *metric_list, const char *modifier, bool metric_no_group, int runtime, + const char *user_requested_cpu_list, + bool system_wide, struct metric *root_metric, const struct visited_metric *visited, const struct pmu_events_table *table) @@ -1011,7 +1038,8 @@ static int __add_metric(struct list_head *metric_list, * This metric is the root of a tree and may reference other * metrics that are added recursively. */ - root_metric =3D metric__new(pe, modifier, metric_no_group, runtime); + root_metric =3D metric__new(pe, modifier, metric_no_group, runtime, + user_requested_cpu_list, system_wide); if (!root_metric) return -ENOMEM; =20 @@ -1060,8 +1088,9 @@ static int __add_metric(struct list_head *metric_list, ret =3D -EINVAL; } else { /* Resolve referenced metrics. */ - ret =3D resolve_metric(metric_list, modifier, metric_no_group, root_metr= ic, - &visited_node, table); + ret =3D resolve_metric(metric_list, modifier, metric_no_group, + user_requested_cpu_list, system_wide, + root_metric, &visited_node, table); } =20 if (ret) { @@ -1109,6 +1138,8 @@ static int add_metric(struct list_head *metric_list, const struct pmu_event *pe, const char *modifier, bool metric_no_group, + const char *user_requested_cpu_list, + bool system_wide, struct metric *root_metric, const struct visited_metric *visited, const struct pmu_events_table *table) @@ -1119,7 +1150,8 @@ static int add_metric(struct list_head *metric_list, =20 if (!strstr(pe->metric_expr, "?")) { ret =3D __add_metric(metric_list, pe, modifier, metric_no_group, 0, - root_metric, visited, table); + user_requested_cpu_list, system_wide, root_metric, + visited, table); } else { int j, count; =20 @@ -1132,7 +1164,8 @@ static int add_metric(struct list_head *metric_list, =20 for (j =3D 0; j < count && !ret; j++) ret =3D __add_metric(metric_list, pe, modifier, metric_no_group, j, - root_metric, visited, table); + user_requested_cpu_list, system_wide, + root_metric, visited, table); } =20 return ret; @@ -1149,6 +1182,7 @@ static int metricgroup__add_metric_sys_event_iter(con= st struct pmu_event *pe, return 0; =20 ret =3D add_metric(d->metric_list, pe, d->modifier, d->metric_no_group, + d->user_requested_cpu_list, d->system_wide, d->root_metric, d->visited, d->table); if (ret) goto out; @@ -1191,7 +1225,9 @@ struct metricgroup__add_metric_data { struct list_head *list; const char *metric_name; const char *modifier; + const char *user_requested_cpu_list; bool metric_no_group; + bool system_wide; bool has_match; }; =20 @@ -1208,8 +1244,8 @@ static int metricgroup__add_metric_callback(const str= uct pmu_event *pe, =20 data->has_match =3D true; ret =3D add_metric(data->list, pe, data->modifier, data->metric_no_group, - /*root_metric=3D*/NULL, - /*visited_metrics=3D*/NULL, table); + data->user_requested_cpu_list, data->system_wide, + /*root_metric=3D*/NULL, /*visited_metrics=3D*/NULL, table); } return ret; } @@ -1223,12 +1259,16 @@ static int metricgroup__add_metric_callback(const s= truct pmu_event *pe, * @metric_no_group: Should events written to events be grouped "{}" or * global. Grouping is the default but due to multiplexi= ng the * user may override. + * @user_requested_cpu_list: Command line specified CPUs to record on. + * @system_wide: Are events for all processes recorded. * @metric_list: The list that the metric or metric group are added to. * @table: The table that is searched for metrics, most commonly the table= for the * architecture perf is running upon. */ static int metricgroup__add_metric(const char *metric_name, const char *mo= difier, bool metric_no_group, + const char *user_requested_cpu_list, + bool system_wide, struct list_head *metric_list, const struct pmu_events_table *table) { @@ -1242,6 +1282,8 @@ static int metricgroup__add_metric(const char *metric= _name, const char *modifier .metric_name =3D metric_name, .modifier =3D modifier, .metric_no_group =3D metric_no_group, + .user_requested_cpu_list =3D user_requested_cpu_list, + .system_wide =3D system_wide, .has_match =3D false, }; /* @@ -1263,6 +1305,8 @@ static int metricgroup__add_metric(const char *metric= _name, const char *modifier .metric_name =3D metric_name, .modifier =3D modifier, .metric_no_group =3D metric_no_group, + .user_requested_cpu_list =3D user_requested_cpu_list, + .system_wide =3D system_wide, .has_match =3D &has_match, .ret =3D &ret, .table =3D table, @@ -1293,12 +1337,15 @@ static int metricgroup__add_metric(const char *metr= ic_name, const char *modifier * @metric_no_group: Should events written to events be grouped "{}" or * global. Grouping is the default but due to multiplexi= ng the * user may override. + * @user_requested_cpu_list: Command line specified CPUs to record on. + * @system_wide: Are events for all processes recorded. * @metric_list: The list that metrics are added to. * @table: The table that is searched for metrics, most commonly the table= for the * architecture perf is running upon. */ static int metricgroup__add_metric_list(const char *list, bool metric_no_g= roup, - struct list_head *metric_list, + const char *user_requested_cpu_list, + bool system_wide, struct list_head *metric_list, const struct pmu_events_table *table) { char *list_itr, *list_copy, *metric_name, *modifier; @@ -1315,8 +1362,8 @@ static int metricgroup__add_metric_list(const char *l= ist, bool metric_no_group, *modifier++ =3D '\0'; =20 ret =3D metricgroup__add_metric(metric_name, modifier, - metric_no_group, metric_list, - table); + metric_no_group, user_requested_cpu_list, + system_wide, metric_list, table); if (ret =3D=3D -EINVAL) pr_err("Cannot find metric or group `%s'\n", metric_name); =20 @@ -1505,6 +1552,8 @@ static int parse_ids(bool metric_no_merge, struct per= f_pmu *fake_pmu, static int parse_groups(struct evlist *perf_evlist, const char *str, bool metric_no_group, bool metric_no_merge, + const char *user_requested_cpu_list, + bool system_wide, struct perf_pmu *fake_pmu, struct rblist *metric_events_list, const struct pmu_events_table *table) @@ -1518,7 +1567,8 @@ static int parse_groups(struct evlist *perf_evlist, c= onst char *str, if (metric_events_list->nr_entries =3D=3D 0) metricgroup__rblist_init(metric_events_list); ret =3D metricgroup__add_metric_list(str, metric_no_group, - &metric_list, table); + user_requested_cpu_list, + system_wide, &metric_list, table); if (ret) goto out; =20 @@ -1650,6 +1700,8 @@ int metricgroup__parse_groups(struct evlist *perf_evl= ist, const char *str, bool metric_no_group, bool metric_no_merge, + const char *user_requested_cpu_list, + bool system_wide, struct rblist *metric_events) { const struct pmu_events_table *table =3D pmu_events_table__find(); @@ -1657,8 +1709,9 @@ int metricgroup__parse_groups(struct evlist *perf_evl= ist, if (!table) return -EINVAL; =20 - return parse_groups(perf_evlist, str, metric_no_group, - metric_no_merge, NULL, metric_events, table); + return parse_groups(perf_evlist, str, metric_no_group, metric_no_merge, + user_requested_cpu_list, system_wide, + /*fake_pmu=3D*/NULL, metric_events, table); } =20 int metricgroup__parse_groups_test(struct evlist *evlist, @@ -1668,8 +1721,10 @@ int metricgroup__parse_groups_test(struct evlist *ev= list, bool metric_no_merge, struct rblist *metric_events) { - return parse_groups(evlist, str, metric_no_group, - metric_no_merge, &perf_pmu__fake, metric_events, table); + return parse_groups(evlist, str, metric_no_group, metric_no_merge, + /*user_requested_cpu_list=3D*/NULL, + /*system_wide=3D*/false, + &perf_pmu__fake, metric_events, table); } =20 static int metricgroup__has_metric_callback(const struct pmu_event *pe, diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index af9ceadaec0f..732d3a0d3334 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -68,6 +68,8 @@ int metricgroup__parse_groups(struct evlist *perf_evlist, const char *str, bool metric_no_group, bool metric_no_merge, + const char *user_requested_cpu_list, + bool system_wide, struct rblist *metric_events); int metricgroup__parse_groups_test(struct evlist *evlist, const struct pmu_events_table *table, diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 815af948abb9..9e1eddeff21b 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -911,7 +911,10 @@ static void generic_metric(struct perf_stat_config *co= nfig, if (!pctx) return; =20 + if (config->user_requested_cpu_list) + pctx->sctx.user_requested_cpu_list =3D strdup(config->user_requested_cpu= _list); pctx->sctx.runtime =3D runtime; + pctx->sctx.system_wide =3D config->system_wide; i =3D prepare_metric(metric_events, metric_refs, pctx, cpu_map_idx, st); if (i < 0) { expr__ctx_free(pctx); @@ -1304,7 +1307,8 @@ void perf_stat__print_shadow_stats(struct perf_stat_c= onfig *config, core_bound * 100.); } else if (evsel->metric_expr) { generic_metric(config, evsel->metric_expr, evsel->metric_events, NULL, - evsel->name, evsel->metric_name, NULL, 1, cpu_map_idx, out, st); + evsel->name, evsel->metric_name, NULL, 1, + cpu_map_idx, out, st); } else if (runtime_stat_n(st, STAT_NSECS, cpu_map_idx, &rsd) !=3D 0) { char unit =3D ' '; char unit_buf[10] =3D "/sec"; @@ -1329,8 +1333,9 @@ void perf_stat__print_shadow_stats(struct perf_stat_c= onfig *config, if (num++ > 0) out->new_line(config, ctxp); generic_metric(config, mexp->metric_expr, mexp->metric_events, - mexp->metric_refs, evsel->name, mexp->metric_name, - mexp->metric_unit, mexp->runtime, cpu_map_idx, out, st); + mexp->metric_refs, evsel->name, mexp->metric_name, + mexp->metric_unit, mexp->runtime, + cpu_map_idx, out, st); } } if (num =3D=3D 0) diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index 668250022f8c..72713b344b79 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -141,6 +141,8 @@ struct perf_stat_config { bool stop_read_counter; bool quiet; bool iostat_run; + char *user_requested_cpu_list; + bool system_wide; FILE *output; unsigned int interval; unsigned int timeout; --=20 2.37.2.672.g94769d06f0-goog