From: "tip-bot2 for Arnaldo Carvalho de Melo" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Adrian Hunter <adrian.hunter@intel.com>,
Andi Kleen <ak@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: perf/urgent] perf tests: Rename tests/map_groups.c to tests/maps.c
Date: Fri, 29 Nov 2019 06:02:51 -0000 [thread overview]
Message-ID: <157500737129.21853.5454737946825912101.tip-bot2@tip-bot2> (raw)
In-Reply-To: <tip-bw6aagubqxc47m54k2maezfu@git.kernel.org>
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: a5732681e0e6ea0c3024f9d23bcf99b9237189ee
Gitweb: https://git.kernel.org/tip/a5732681e0e6ea0c3024f9d23bcf99b9237189ee
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 25 Nov 2019 22:33:02 -03:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 26 Nov 2019 11:07:46 -03:00
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 <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-bw6aagubqxc47m54k2maezfu@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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
diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build
index 5b9b0a8..a3c595f 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 3a4b983..7115aa3 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 7febd02..0000000
--- a/tools/perf/tests/map_groups.c
+++ /dev/null
@@ -1,120 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/compiler.h>
-#include <linux/kernel.h>
-#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 0000000..edcbc70
--- /dev/null
+++ b/tools/perf/tests/maps.c
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/compiler.h>
+#include <linux/kernel.h>
+#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 f2b9bb0..25aea38 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);
parent reply other threads:[~2019-11-29 6:04 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <tip-bw6aagubqxc47m54k2maezfu@git.kernel.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157500737129.21853.5454737946825912101.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).