From a5732681e0e6ea0c3024f9d23bcf99b9237189ee Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 25 Nov 2019 22:33:02 -0300 Subject: perf tests: Rename tests/map_groups.c to tests/maps.c One more step in mergint the maps and map_groups structs. Cc: Adrian Hunter Cc: Andi Kleen Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lkml.kernel.org/n/tip-bw6aagubqxc47m54k2maezfu@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/Build | 2 +- tools/perf/tests/builtin-test.c | 4 +- tools/perf/tests/map_groups.c | 120 ---------------------------------------- tools/perf/tests/maps.c | 120 ++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 2 +- 5 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 tools/perf/tests/map_groups.c create mode 100644 tools/perf/tests/maps.c (limited to 'tools') diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 5b9b0a813916..a3c595fba943 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -52,7 +52,7 @@ perf-y += perf-hooks.o perf-y += clang.o perf-y += unit_number__scnprintf.o perf-y += mem2node.o -perf-y += map_groups.o +perf-y += maps.o perf-y += time-utils-test.o $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 3a4b9837b54d..7115aa32a51e 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -297,8 +297,8 @@ static struct test generic_tests[] = { .func = test__time_utils, }, { - .desc = "map_groups__merge_in", - .func = test__map_groups__merge_in, + .desc = "maps__merge_in", + .func = test__maps__merge_in, }, { .func = NULL, diff --git a/tools/perf/tests/map_groups.c b/tools/perf/tests/map_groups.c deleted file mode 100644 index 7febd02069ae..000000000000 --- a/tools/perf/tests/map_groups.c +++ /dev/null @@ -1,120 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include "tests.h" -#include "map.h" -#include "maps.h" -#include "dso.h" -#include "debug.h" - -struct map_def { - const char *name; - u64 start; - u64 end; -}; - -static int check_maps(struct map_def *merged, unsigned int size, struct maps *maps) -{ - struct map *map; - unsigned int i = 0; - - maps__for_each_entry(maps, map) { - if (i > 0) - TEST_ASSERT_VAL("less maps expected", (map && i < size) || (!map && i == size)); - - TEST_ASSERT_VAL("wrong map start", map->start == merged[i].start); - TEST_ASSERT_VAL("wrong map end", map->end == merged[i].end); - TEST_ASSERT_VAL("wrong map name", !strcmp(map->dso->name, merged[i].name)); - TEST_ASSERT_VAL("wrong map refcnt", refcount_read(&map->refcnt) == 1); - - i++; - } - - return TEST_OK; -} - -int test__map_groups__merge_in(struct test *t __maybe_unused, int subtest __maybe_unused) -{ - struct maps maps; - unsigned int i; - struct map_def bpf_progs[] = { - { "bpf_prog_1", 200, 300 }, - { "bpf_prog_2", 500, 600 }, - { "bpf_prog_3", 800, 900 }, - }; - struct map_def merged12[] = { - { "kcore1", 100, 200 }, - { "bpf_prog_1", 200, 300 }, - { "kcore1", 300, 500 }, - { "bpf_prog_2", 500, 600 }, - { "kcore1", 600, 800 }, - { "bpf_prog_3", 800, 900 }, - { "kcore1", 900, 1000 }, - }; - struct map_def merged3[] = { - { "kcore1", 100, 200 }, - { "bpf_prog_1", 200, 300 }, - { "kcore1", 300, 500 }, - { "bpf_prog_2", 500, 600 }, - { "kcore1", 600, 800 }, - { "bpf_prog_3", 800, 900 }, - { "kcore1", 900, 1000 }, - { "kcore3", 1000, 1100 }, - }; - struct map *map_kcore1, *map_kcore2, *map_kcore3; - int ret; - - maps__init(&maps, NULL); - - for (i = 0; i < ARRAY_SIZE(bpf_progs); i++) { - struct map *map; - - map = dso__new_map(bpf_progs[i].name); - TEST_ASSERT_VAL("failed to create map", map); - - map->start = bpf_progs[i].start; - map->end = bpf_progs[i].end; - maps__insert(&maps, map); - map__put(map); - } - - map_kcore1 = dso__new_map("kcore1"); - TEST_ASSERT_VAL("failed to create map", map_kcore1); - - map_kcore2 = dso__new_map("kcore2"); - TEST_ASSERT_VAL("failed to create map", map_kcore2); - - map_kcore3 = dso__new_map("kcore3"); - TEST_ASSERT_VAL("failed to create map", map_kcore3); - - /* kcore1 map overlaps over all bpf maps */ - map_kcore1->start = 100; - map_kcore1->end = 1000; - - /* kcore2 map hides behind bpf_prog_2 */ - map_kcore2->start = 550; - map_kcore2->end = 570; - - /* kcore3 map hides behind bpf_prog_3, kcore1 and adds new map */ - map_kcore3->start = 880; - map_kcore3->end = 1100; - - ret = maps__merge_in(&maps, map_kcore1); - TEST_ASSERT_VAL("failed to merge map", !ret); - - ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps); - TEST_ASSERT_VAL("merge check failed", !ret); - - ret = maps__merge_in(&maps, map_kcore2); - TEST_ASSERT_VAL("failed to merge map", !ret); - - ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps); - TEST_ASSERT_VAL("merge check failed", !ret); - - ret = maps__merge_in(&maps, map_kcore3); - TEST_ASSERT_VAL("failed to merge map", !ret); - - ret = check_maps(merged3, ARRAY_SIZE(merged3), &maps); - TEST_ASSERT_VAL("merge check failed", !ret); - return TEST_OK; -} diff --git a/tools/perf/tests/maps.c b/tools/perf/tests/maps.c new file mode 100644 index 000000000000..edcbc70ff9d6 --- /dev/null +++ b/tools/perf/tests/maps.c @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include "tests.h" +#include "map.h" +#include "maps.h" +#include "dso.h" +#include "debug.h" + +struct map_def { + const char *name; + u64 start; + u64 end; +}; + +static int check_maps(struct map_def *merged, unsigned int size, struct maps *maps) +{ + struct map *map; + unsigned int i = 0; + + maps__for_each_entry(maps, map) { + if (i > 0) + TEST_ASSERT_VAL("less maps expected", (map && i < size) || (!map && i == size)); + + TEST_ASSERT_VAL("wrong map start", map->start == merged[i].start); + TEST_ASSERT_VAL("wrong map end", map->end == merged[i].end); + TEST_ASSERT_VAL("wrong map name", !strcmp(map->dso->name, merged[i].name)); + TEST_ASSERT_VAL("wrong map refcnt", refcount_read(&map->refcnt) == 1); + + i++; + } + + return TEST_OK; +} + +int test__maps__merge_in(struct test *t __maybe_unused, int subtest __maybe_unused) +{ + struct maps maps; + unsigned int i; + struct map_def bpf_progs[] = { + { "bpf_prog_1", 200, 300 }, + { "bpf_prog_2", 500, 600 }, + { "bpf_prog_3", 800, 900 }, + }; + struct map_def merged12[] = { + { "kcore1", 100, 200 }, + { "bpf_prog_1", 200, 300 }, + { "kcore1", 300, 500 }, + { "bpf_prog_2", 500, 600 }, + { "kcore1", 600, 800 }, + { "bpf_prog_3", 800, 900 }, + { "kcore1", 900, 1000 }, + }; + struct map_def merged3[] = { + { "kcore1", 100, 200 }, + { "bpf_prog_1", 200, 300 }, + { "kcore1", 300, 500 }, + { "bpf_prog_2", 500, 600 }, + { "kcore1", 600, 800 }, + { "bpf_prog_3", 800, 900 }, + { "kcore1", 900, 1000 }, + { "kcore3", 1000, 1100 }, + }; + struct map *map_kcore1, *map_kcore2, *map_kcore3; + int ret; + + maps__init(&maps, NULL); + + for (i = 0; i < ARRAY_SIZE(bpf_progs); i++) { + struct map *map; + + map = dso__new_map(bpf_progs[i].name); + TEST_ASSERT_VAL("failed to create map", map); + + map->start = bpf_progs[i].start; + map->end = bpf_progs[i].end; + maps__insert(&maps, map); + map__put(map); + } + + map_kcore1 = dso__new_map("kcore1"); + TEST_ASSERT_VAL("failed to create map", map_kcore1); + + map_kcore2 = dso__new_map("kcore2"); + TEST_ASSERT_VAL("failed to create map", map_kcore2); + + map_kcore3 = dso__new_map("kcore3"); + TEST_ASSERT_VAL("failed to create map", map_kcore3); + + /* kcore1 map overlaps over all bpf maps */ + map_kcore1->start = 100; + map_kcore1->end = 1000; + + /* kcore2 map hides behind bpf_prog_2 */ + map_kcore2->start = 550; + map_kcore2->end = 570; + + /* kcore3 map hides behind bpf_prog_3, kcore1 and adds new map */ + map_kcore3->start = 880; + map_kcore3->end = 1100; + + ret = maps__merge_in(&maps, map_kcore1); + TEST_ASSERT_VAL("failed to merge map", !ret); + + ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps); + TEST_ASSERT_VAL("merge check failed", !ret); + + ret = maps__merge_in(&maps, map_kcore2); + TEST_ASSERT_VAL("failed to merge map", !ret); + + ret = check_maps(merged12, ARRAY_SIZE(merged12), &maps); + TEST_ASSERT_VAL("merge check failed", !ret); + + ret = maps__merge_in(&maps, map_kcore3); + TEST_ASSERT_VAL("failed to merge map", !ret); + + ret = check_maps(merged3, ARRAY_SIZE(merged3), &maps); + TEST_ASSERT_VAL("merge check failed", !ret); + return TEST_OK; +} diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index f2b9bb024746..25aea387e2bf 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -107,7 +107,7 @@ const char *test__clang_subtest_get_desc(int subtest); int test__clang_subtest_get_nr(void); int test__unit_number__scnprint(struct test *test, int subtest); int test__mem2node(struct test *t, int subtest); -int test__map_groups__merge_in(struct test *t, int subtest); +int test__maps__merge_in(struct test *t, int subtest); int test__time_utils(struct test *t, int subtest); bool test__bp_signal_is_supported(void); -- cgit v1.2.3