Commit 9aba0ada authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf expr: Add source_count for aggregating events 



Events like uncore_imc/cas_count_read/ on Skylake open multiple events
and then aggregate in the metric leader. To determine the average value
per event the number of these events is needed. Add a source_count
function that returns this value by counting the number of events with
the given metric leader. For most events the value is 1 but for
uncore_imc/cas_count_read/ it can yield values like 6.

Add a generic test, but manually tested with a test metric that uses
the function.

Signed-off-by: default avatarIan Rogers <irogers@google.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: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul A . Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Song Liu <song@kernel.org>
Cc: Wan Jiabing <wanjiabing@vivo.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/20211111002109.194172-9-irogers@google.com


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

tools/perf/tests/expr.c

+12 −0
Original line number Diff line number Diff line
@@ -171,6 +171,18 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u 
	TEST_ASSERT_VAL("#num_packages", expr__parse(&num_packages, ctx, "#num_packages") == 0);

	TEST_ASSERT_VAL("#num_dies >= #num_packages", num_dies >= num_packages);



	/*

	 * Source count returns the number of events aggregating in a leader

	 * event including the leader. Check parsing yields an id.

	 */

	expr__ctx_clear(ctx);

	TEST_ASSERT_VAL("source count",

			expr__find_ids("source_count(EVENT1)",

			NULL, ctx) == 0);

	TEST_ASSERT_VAL("source count", hashmap__size(ctx->ids) == 1);

	TEST_ASSERT_VAL("source count", hashmap__find(ctx->ids, "EVENT1",

							(void **)&val_ptr));



	expr__ctx_free(ctx);



	return 0;

tools/perf/util/evsel.c

+12 −0
Original line number Diff line number Diff line
@@ -3037,3 +3037,15 @@ void evsel__set_leader(struct evsel *evsel, struct evsel *leader) 
{

	evsel->core.leader = &leader->core;

}



int evsel__source_count(const struct evsel *evsel)

{

	struct evsel *pos;

	int count = 0;



	evlist__for_each_entry(evsel->evlist, pos) {

		if (pos->metric_leader == evsel)

			count++;

	}

	return count;

}

tools/perf/util/evsel.h

+1 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ struct evsel *evsel__leader(struct evsel *evsel); 
bool evsel__has_leader(struct evsel *evsel, struct evsel *leader);

bool evsel__is_leader(struct evsel *evsel);

void evsel__set_leader(struct evsel *evsel, struct evsel *leader);

int evsel__source_count(const struct evsel *evsel);



/*

 * Macro to swap the bit-field postition and size.

tools/perf/util/expr.c

+22 −5
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ extern int expr_debug; 


struct expr_id_data {

	union {

		struct {

			double val;

			int source_count;

		} val;

		struct {

			double val;

			const char *metric_name;
@@ -140,6 +143,13 @@ int expr__add_id(struct expr_parse_ctx *ctx, const char *id) 


/* Caller must make sure id is allocated */

int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val)

{

	return expr__add_id_val_source_count(ctx, id, val, /*source_count=*/1);

}



/* Caller must make sure id is allocated */

int expr__add_id_val_source_count(struct expr_parse_ctx *ctx, const char *id,

				  double val, int source_count)

{

	struct expr_id_data *data_ptr = NULL, *old_data = NULL;

	char *old_key = NULL;
@@ -148,7 +158,8 @@ int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val) 
	data_ptr = malloc(sizeof(*data_ptr));

	if (!data_ptr)

		return -ENOMEM;

	data_ptr->val = val;

	data_ptr->val.val = val;

	data_ptr->val.source_count = source_count;

	data_ptr->kind = EXPR_ID_DATA__VALUE;



	ret = hashmap__set(ctx->ids, id, data_ptr,
@@ -244,7 +255,7 @@ int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id, 


	switch (data->kind) {

	case EXPR_ID_DATA__VALUE:

		pr_debug2("lookup(%s): val %f\n", id, data->val);

		pr_debug2("lookup(%s): val %f\n", id, data->val.val);

		break;

	case EXPR_ID_DATA__REF:

		pr_debug2("lookup(%s): ref metric name %s\n", id,
@@ -255,7 +266,7 @@ int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id, 
			pr_debug("%s failed to count\n", id);

			return -1;

		}

		pr_debug("processing metric: %s EXIT: %f\n", id, data->val);

		pr_debug("processing metric: %s EXIT: %f\n", id, data->ref.val);

		break;

	case EXPR_ID_DATA__REF_VALUE:

		pr_debug2("lookup(%s): ref val %f metric name %s\n", id,
@@ -370,11 +381,17 @@ int expr__find_ids(const char *expr, const char *one, 
double expr_id_data__value(const struct expr_id_data *data)

{

	if (data->kind == EXPR_ID_DATA__VALUE)

		return data->val;

		return data->val.val;

	assert(data->kind == EXPR_ID_DATA__REF_VALUE);

	return data->ref.val;

}



double expr_id_data__source_count(const struct expr_id_data *data)

{

	assert(data->kind == EXPR_ID_DATA__VALUE);

	return data->val.source_count;

}



double expr__get_literal(const char *literal)

{

	static struct cpu_topology *topology;

tools/perf/util/expr.h

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ void expr__ctx_free(struct expr_parse_ctx *ctx); 
void expr__del_id(struct expr_parse_ctx *ctx, const char *id);

int expr__add_id(struct expr_parse_ctx *ctx, const char *id);

int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val);

int expr__add_id_val_source_count(struct expr_parse_ctx *ctx, const char *id,

				double val, int source_count);

int expr__add_ref(struct expr_parse_ctx *ctx, struct metric_ref *ref);

int expr__get_id(struct expr_parse_ctx *ctx, const char *id,

		 struct expr_id_data **data);
@@ -55,6 +57,7 @@ int expr__find_ids(const char *expr, const char *one, 
		   struct expr_parse_ctx *ids);



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);



#endif