Commit 114a9d6e authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf metric: Add utilities to work on ids map. 



Add utilities to new/free an ids hashmap, as well as to union. Add
testing of the union. Unioning hashmaps will be used when parsing the
metric, if a value is known then the hashmap is unnecessary, otherwise
we need to union together all the event ids to compute their values for
reporting.

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-9-irogers@google.com


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

tools/perf/tests/expr.c

+47 −0
Original line number Diff line number Diff line
@@ -6,6 +6,51 @@ 
#include <string.h>

#include <linux/zalloc.h>



static int test_ids_union(void)

{

	struct hashmap *ids1, *ids2;



	/* Empty union. */

	ids1 = ids__new();

	TEST_ASSERT_VAL("ids__new", ids1);

	ids2 = ids__new();

	TEST_ASSERT_VAL("ids__new", ids2);



	ids1 = ids__union(ids1, ids2);

	TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 0);



	/* Union {foo, bar} against {}. */

	ids2 = ids__new();

	TEST_ASSERT_VAL("ids__new", ids2);



	TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids1, strdup("foo"), NULL), 0);

	TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids1, strdup("bar"), NULL), 0);



	ids1 = ids__union(ids1, ids2);

	TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 2);



	/* Union {foo, bar} against {foo}. */

	ids2 = ids__new();

	TEST_ASSERT_VAL("ids__new", ids2);

	TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids2, strdup("foo"), NULL), 0);



	ids1 = ids__union(ids1, ids2);

	TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 2);



	/* Union {foo, bar} against {bar,baz}. */

	ids2 = ids__new();

	TEST_ASSERT_VAL("ids__new", ids2);

	TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids2, strdup("bar"), NULL), 0);

	TEST_ASSERT_EQUAL("ids__insert", ids__insert(ids2, strdup("baz"), NULL), 0);



	ids1 = ids__union(ids1, ids2);

	TEST_ASSERT_EQUAL("union", (int)hashmap__size(ids1), 3);



	ids__free(ids1);



	return 0;

}



static int test(struct expr_parse_ctx *ctx, const char *e, double val2)

{

	double val;
@@ -24,6 +69,8 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) 
	int ret;

	struct expr_parse_ctx *ctx;



	TEST_ASSERT_EQUAL("ids_union", test_ids_union(), 0);



	ctx = expr__ctx_new();

	TEST_ASSERT_VAL("expr__ctx_new", ctx);

	expr__add_id_val(ctx, strdup("FOO"), 1);

tools/perf/util/expr.c

+67 −4
Original line number Diff line number Diff line
@@ -59,8 +59,29 @@ static bool key_equal(const void *key1, const void *key2, 
	return !strcmp((const char *)key1, (const char *)key2);

}



/* Caller must make sure id is allocated */

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

struct hashmap *ids__new(void)

{

	return hashmap__new(key_hash, key_equal, NULL);

}



void ids__free(struct hashmap *ids)

{

	struct hashmap_entry *cur;

	size_t bkt;



	if (ids == NULL)

		return;



	hashmap__for_each_entry(ids, cur, bkt) {

		free((char *)cur->key);

		free(cur->value);

	}



	hashmap__free(ids);

}



int ids__insert(struct hashmap *ids, const char *id,

		struct expr_id *parent)

{

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

	char *old_key = NULL;
@@ -70,10 +91,10 @@ int expr__add_id(struct expr_parse_ctx *ctx, const char *id) 
	if (!data_ptr)

		return -ENOMEM;



	data_ptr->parent = ctx->parent;

	data_ptr->parent = parent;

	data_ptr->kind = EXPR_ID_DATA__PARENT;



	ret = hashmap__set(ctx->ids, id, data_ptr,

	ret = hashmap__set(ids, id, data_ptr,

			   (const void **)&old_key, (void **)&old_data);

	if (ret)

		free(data_ptr);
@@ -82,6 +103,48 @@ int expr__add_id(struct expr_parse_ctx *ctx, const char *id) 
	return ret;

}



struct hashmap *ids__union(struct hashmap *ids1, struct hashmap *ids2)

{

	size_t bkt;

	struct hashmap_entry *cur;

	int ret;

	struct expr_id_data *old_data = NULL;

	char *old_key = NULL;



	if (!ids1)

		return ids2;



	if (!ids2)

		return ids1;



	if (hashmap__size(ids1) <  hashmap__size(ids2)) {

		struct hashmap *tmp = ids1;



		ids1 = ids2;

		ids2 = tmp;

	}

	hashmap__for_each_entry(ids2, cur, bkt) {

		ret = hashmap__set(ids1, cur->key, cur->value,

				(const void **)&old_key, (void **)&old_data);

		free(old_key);

		free(old_data);



		if (ret) {

			hashmap__free(ids1);

			hashmap__free(ids2);

			return NULL;

		}

	}

	hashmap__free(ids2);

	return ids1;

}



/* Caller must make sure id is allocated */

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

{

	return ids__insert(ctx->ids, id, ctx->parent);

}



/* Caller must make sure id is allocated */

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

{

tools/perf/util/expr.h

+12 −0
Original line number Diff line number Diff line
@@ -30,9 +30,19 @@ struct expr_scanner_ctx { 
	int runtime;

};



struct hashmap *ids__new(void);

void ids__free(struct hashmap *ids);

int ids__insert(struct hashmap *ids, const char *id, struct expr_id *parent);

/*

 * Union two sets of ids (hashmaps) and construct a third, freeing ids1 and

 * ids2.

 */

struct hashmap *ids__union(struct hashmap *ids1, struct hashmap *ids2);



struct expr_parse_ctx *expr__ctx_new(void);

void expr__ctx_clear(struct expr_parse_ctx *ctx);

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);
@@ -41,8 +51,10 @@ int expr__get_id(struct expr_parse_ctx *ctx, const char *id, 
		 struct expr_id_data **data);

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_ids(const char *expr, const char *one,

		struct expr_parse_ctx *ids, int runtime);