diff options
author | Ian Rogers <irogers@google.com> | 2021-10-15 10:21:16 -0700 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-20 10:33:02 -0300 |
commit | fa831fbb430853ad8c1abb18001dc87bed3cf52b (patch) | |
tree | d11b1fba9afb1bf42f6079479d280ddfe50820db /tools/perf/util | |
parent | perf pmu: Make pmu_event tables const. (diff) | |
download | linux-dev-fa831fbb430853ad8c1abb18001dc87bed3cf52b.tar.xz linux-dev-fa831fbb430853ad8c1abb18001dc87bed3cf52b.zip |
perf metric: Move runtime value to the expr context
The runtime value is needed when recursively parsing metrics, currently
a value of 1 is passed which is incorrect.
Rather than add more arguments to the bison parser, add runtime to the
context.
Fix call sites not to pass a value. The runtime value is defaulted to 0,
which is arbitrary. In some places this replaces a value of 1, which was
also arbitrary.
This shouldn't affect anything other than PPC.
The use of 0 or 1 shouldn't matter as a proper runtime value would be
needed in a case that it did matter.
Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrew Kilroy <andrew.kilroy@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Denys Zagorui <dzagorui@cisco.com>
Cc: Fabian Hemmer <copy@copy.sh>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>
Cc: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kees Kook <keescook@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nicholas Fraser <nfraser@codeweavers.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: ShihCheng Tu <mrtoastcheng@gmail.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Wan Jiabing <wanjiabing@vivo.com>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20211015172132.1162559-6-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/expr.c | 15 | ||||
-rw-r--r-- | tools/perf/util/expr.h | 5 | ||||
-rw-r--r-- | tools/perf/util/metricgroup.c | 7 | ||||
-rw-r--r-- | tools/perf/util/stat-shadow.c | 7 |
4 files changed, 18 insertions, 16 deletions
diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index db2445677c8c..62fb39fd4d9d 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -246,7 +246,7 @@ int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id, data->ref.metric_name); pr_debug("processing metric: %s ENTRY\n", id); data->kind = EXPR_ID_DATA__REF_VALUE; - if (expr__parse(&data->ref.val, ctx, data->ref.metric_expr, 1)) { + if (expr__parse(&data->ref.val, ctx, data->ref.metric_expr)) { pr_debug("%s failed to count\n", id); return -1; } @@ -284,6 +284,7 @@ struct expr_parse_ctx *expr__ctx_new(void) ctx->ids = hashmap__new(key_hash, key_equal, NULL); ctx->parent = NULL; + ctx->runtime = 0; return ctx; } @@ -314,10 +315,10 @@ void expr__ctx_free(struct expr_parse_ctx *ctx) static int __expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr, - bool compute_ids, int runtime) + bool compute_ids) { struct expr_scanner_ctx scanner_ctx = { - .runtime = runtime, + .runtime = ctx->runtime, }; YY_BUFFER_STATE buffer; void *scanner; @@ -345,15 +346,15 @@ __expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr, } int expr__parse(double *final_val, struct expr_parse_ctx *ctx, - const char *expr, int runtime) + const char *expr) { - return __expr__parse(final_val, ctx, expr, /*compute_ids=*/false, runtime) ? -1 : 0; + return __expr__parse(final_val, ctx, expr, /*compute_ids=*/false) ? -1 : 0; } int expr__find_ids(const char *expr, const char *one, - struct expr_parse_ctx *ctx, int runtime) + struct expr_parse_ctx *ctx) { - int ret = __expr__parse(NULL, ctx, expr, /*compute_ids=*/true, runtime); + int ret = __expr__parse(NULL, ctx, expr, /*compute_ids=*/true); if (one) expr__del_id(ctx, one); diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index b20513f0ae59..124475a4f245 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -21,6 +21,7 @@ struct expr_id { struct expr_parse_ctx { struct hashmap *ids; struct expr_id *parent; + int runtime; }; struct expr_id_data; @@ -52,10 +53,10 @@ int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id, struct expr_id_data **datap); int expr__parse(double *final_val, struct expr_parse_ctx *ctx, - const char *expr, int runtime); + const char *expr); int expr__find_ids(const char *expr, const char *one, - struct expr_parse_ctx *ids, int runtime); + struct expr_parse_ctx *ids); double expr_id_data__value(const struct expr_id_data *data); struct expr_id *expr_id_data__parent(struct expr_id_data *data); diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index b60ccbbf0829..139f4a793f92 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -124,7 +124,6 @@ struct metric { const char *metric_unit; struct list_head metric_refs; int metric_refs_cnt; - int runtime; bool has_constraint; }; @@ -391,7 +390,7 @@ static int metricgroup__setup_events(struct list_head *groups, expr->metric_name = m->metric_name; expr->metric_unit = m->metric_unit; expr->metric_events = metric_events; - expr->runtime = m->runtime; + expr->runtime = m->pctx->runtime; list_add(&expr->nd, &me->head); } @@ -812,7 +811,7 @@ static int __add_metric(struct list_head *metric_list, m->metric_name = pe->metric_name; m->metric_expr = pe->metric_expr; m->metric_unit = pe->unit; - m->runtime = runtime; + m->pctx->runtime = runtime; m->has_constraint = metric_no_group || metricgroup__has_constraint(pe); INIT_LIST_HEAD(&m->metric_refs); m->metric_refs_cnt = 0; @@ -862,7 +861,7 @@ static int __add_metric(struct list_head *metric_list, * For both the parent and referenced metrics, we parse * all the metric's IDs and add it to the parent context. */ - if (expr__find_ids(pe->metric_expr, NULL, m->pctx, runtime) < 0) { + if (expr__find_ids(pe->metric_expr, NULL, m->pctx) < 0) { if (m->metric_refs_cnt == 0) { expr__ctx_free(m->pctx); free(m); diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 9bc841e09a0c..20f1b9d0f272 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -394,7 +394,7 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list) if (!metric_events) { if (expr__find_ids(counter->metric_expr, counter->name, - ctx, 1) < 0) + ctx) < 0) continue; metric_events = calloc(sizeof(struct evsel *), @@ -894,13 +894,14 @@ static void generic_metric(struct perf_stat_config *config, if (!pctx) return; + pctx->runtime = runtime; i = prepare_metric(metric_events, metric_refs, pctx, cpu, st); if (i < 0) { expr__ctx_free(pctx); return; } if (!metric_events[i]) { - if (expr__parse(&ratio, pctx, metric_expr, runtime) == 0) { + if (expr__parse(&ratio, pctx, metric_expr) == 0) { char *unit; char metric_bf[64]; @@ -951,7 +952,7 @@ double test_generic_metric(struct metric_expr *mexp, int cpu, struct runtime_sta if (prepare_metric(mexp->metric_events, mexp->metric_refs, pctx, cpu, st) < 0) goto out; - if (expr__parse(&ratio, pctx, mexp->metric_expr, 1)) + if (expr__parse(&ratio, pctx, mexp->metric_expr)) ratio = 0.0; out: |