Commit 7e06a5e3 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf metric: Rename expr__find_other. 



A later change will remove the notion of other, rename the function to
expr__find_ids as this is what it populates.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarJohn Garry <john.garry@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sandeep Dasgupta <sdasgup@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20210923074616.674826-8-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c924e0cc

tools/perf/tests/expr.c

+13 −13
Original line number Diff line number Diff line
@@ -64,25 +64,25 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) 
	TEST_ASSERT_VAL("missing operand", ret == -1);



	expr__ctx_clear(ctx);

	TEST_ASSERT_VAL("find other",

			expr__find_other("FOO + BAR + BAZ + BOZO", "FOO",

	TEST_ASSERT_VAL("find ids",

			expr__find_ids("FOO + BAR + BAZ + BOZO", "FOO",

					ctx, 1) == 0);

	TEST_ASSERT_VAL("find other", hashmap__size(ctx->ids) == 3);

	TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "BAR",

	TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 3);

	TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BAR",

						    (void **)&val_ptr));

	TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "BAZ",

	TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BAZ",

						    (void **)&val_ptr));

	TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "BOZO",

	TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "BOZO",

						    (void **)&val_ptr));



	expr__ctx_clear(ctx);

	TEST_ASSERT_VAL("find other",

			expr__find_other("EVENT1\\,param\\=?@ + EVENT2\\,param\\=?@",

	TEST_ASSERT_VAL("find ids",

			expr__find_ids("EVENT1\\,param\\=?@ + EVENT2\\,param\\=?@",

					NULL, ctx, 3) == 0);

	TEST_ASSERT_VAL("find other", hashmap__size(ctx->ids) == 2);

	TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "EVENT1,param=3/",

	TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 2);

	TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "EVENT1,param=3/",

						    (void **)&val_ptr));

	TEST_ASSERT_VAL("find other", hashmap__find(ctx->ids, "EVENT2,param=3/",

	TEST_ASSERT_VAL("find ids", hashmap__find(ctx->ids, "EVENT2,param=3/",

						    (void **)&val_ptr));



	expr__ctx_free(ctx);

tools/perf/tests/pmu-events.c

+5 −6
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ static int resolve_metric_simple(struct expr_parse_ctx *pctx, 
			ref->metric_expr = pe->metric_expr;

			list_add_tail(&metric->list, compound_list);



			rc = expr__find_other(pe->metric_expr, NULL, pctx, 0);

			rc = expr__find_ids(pe->metric_expr, NULL, pctx, 0);

			if (rc)

				goto out_err;

			break; /* The hashmap has been modified, so restart */
@@ -916,9 +916,8 @@ static int test_parsing(void) 
			if (!pe->metric_expr)

				continue;

			expr__ctx_clear(ctx);

			if (expr__find_other(pe->metric_expr, NULL, ctx, 0)

				  < 0) {

				expr_failure("Parse other failed", map, pe);

			if (expr__find_ids(pe->metric_expr, NULL, ctx, 0) < 0) {

				expr_failure("Parse find ids failed", map, pe);

				ret++;

				continue;

			}
@@ -990,8 +989,8 @@ static int metric_parse_fake(const char *str) 
		pr_debug("expr__ctx_new failed");

		return TEST_FAIL;

	}

	if (expr__find_other(str, NULL, ctx, 0) < 0) {

		pr_err("expr__find_other failed\n");

	if (expr__find_ids(str, NULL, ctx, 0) < 0) {

		pr_err("expr__find_ids failed\n");

		return -1;

	}

tools/perf/util/expr.c

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int expr__parse(double *final_val, struct expr_parse_ctx *ctx, 
	return __expr__parse(final_val, ctx, expr, EXPR_PARSE, runtime) ? -1 : 0;

}



int expr__find_other(const char *expr, const char *one,

int expr__find_ids(const char *expr, const char *one,

		   struct expr_parse_ctx *ctx, int runtime)

{

	int ret = __expr__parse(NULL, ctx, expr, EXPR_OTHER, runtime);

tools/perf/util/expr.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 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);

int expr__find_other(const char *expr, const char *one,

int expr__find_ids(const char *expr, const char *one,

		struct expr_parse_ctx *ids, int runtime);



double expr_id_data__value(const struct expr_id_data *data);

tools/perf/util/metricgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -857,7 +857,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_other(pe->metric_expr, NULL, m->pctx, runtime) < 0) {

	if (expr__find_ids(pe->metric_expr, NULL, m->pctx, runtime) < 0) {

		if (m->metric_refs_cnt == 0) {

			expr__ctx_free(m->pctx);

			free(m);