Skip to contentSkip to conversation

perf,test: test cpu topology

PATCH Superseded Kan Liang 2 participants 2 messages Sep 2, 2015 – Sep 4, 2015 perf events

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Kan Liang

author
#0 lore raw

PATCH v5 1/1 perf,test: test cpu topology

From: Kan Liang <[email protected]>

This patch test cpu core_id and socket_id which are stored in perf_env.

---

Changes since jirka's original version
- Use pr_debug to replace fprintf
- Add date_size to avoid warning
- Introduce cpu_map, and compare core_id and socket_id between cpu_map and perf_env

Changes since V2:
- unlink(path)

Changes since V4:
- Changes authorship

 tools/perf/tests/Build          |  1 +
 tools/perf/tests/builtin-test.c |  4 ++
 tools/perf/tests/tests.h        |  1 +
 tools/perf/tests/topology.c     | 86 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 92 insertions(+)
 create mode 100644 tools/perf/tests/topology.c
tools/perf/tests/Build +1 -0
index c1518bd..208bbdf 100644
@@ -33,6 +33,7 @@ perf-y += parse-no-sample-id-all.o
 perf-y += kmod-path.o
 perf-y += thread-map.o
 perf-y += llvm.o
+perf-y += topology.o
 
 perf-$(CONFIG_X86) += perf-time-to-tsc.o
 
tools/perf/tests/builtin-test.c +4 -0
index 136cd93..6650f26 100644
@@ -179,6 +179,10 @@ static struct test {
 		.func = test__llvm,
 	},
 	{
+		.desc = "Test topology in session",
+		.func = test_session_topology,
+	},
+	{
 		.func = NULL,
 	},
 };
tools/perf/tests/tests.h +1 -0
index bf113a2..95654d7 100644
@@ -63,6 +63,7 @@ int test__fdarray__add(void);
 int test__kmod_path__parse(void);
 int test__thread_map(void);
 int test__llvm(void);
+int test_session_topology(void);
 
 #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
 #ifdef HAVE_DWARF_UNWIND_SUPPORT
tools/perf/tests/topology.c new file +86 -0

86 lines not on this page · raw message

Signature · 1 line
1.8.3.1
#1 lore raw

On Wed, Sep 02, 2015 at 02:23:02AM -0400, Kan Liang wrote:

SNIP

Quoted 5 lines
tools/perf/tests/topology.c new file +5 -0
+
+int test_session_topology(void)
+{
+	struct perf_session *session;
+	char path[PATH_MAX];

tools/perf/tests/topology.c line 42

Quoted 10 lines
tools/perf/tests/topology.c new file +10 -0
+	struct cpu_map *map;
+	struct perf_data_file file = {
+		.path = path,
+		.mode = PERF_DATA_MODE_WRITE,
+	};
+	int i;
+
+	TEST_ASSERT_VAL("can't get templ file", !get_temp(path));
+
+	pr_debug("krava %s\n", path);

it's not that I'd have monopoly on that, but this probably needs some better wording ;-)

tools/perf/tests/topology.c line 45

Quoted 3 lines
tools/perf/tests/topology.c new file +3 -0
+
+	session = perf_session__new(&file, false, NULL);
+	TEST_ASSERT_VAL("can't get session", session);

hum, any failed TEST_ASSERT_VAL will leave the temp file

Quoted 5 lines
tools/perf/tests/topology.c new file +5 -0
+
+	session->evlist = perf_evlist__new_default();
+	TEST_ASSERT_VAL("can't get evlist", session->evlist);
+
+	perf_header__set_feat(&session->header, HEADER_CPU_TOPOLOGY);

tools/perf/tests/topology.c line 60

Quoted 10 lines
tools/perf/tests/topology.c new file +10 -0
+	perf_header__set_feat(&session->header, HEADER_NRCPUS);
+
+	session->header.data_size += DATA_SIZE;
+
+	TEST_ASSERT_VAL("failed to write header",
+			!perf_session__write_header(session, session->evlist, file.fd, true));
+
+	perf_session__delete(session);
+
+	map = cpu_map__new(NULL);

also map, but the file is bigger issue, because someone might notice ;-)

jirka

Quoted 29 lines
tools/perf/tests/topology.c new file +26 -0
+	TEST_ASSERT_VAL("failed to get system cpumap", !(map == NULL));
+
+	file.mode = PERF_DATA_MODE_READ;
+	session = perf_session__new(&file, false, NULL);
+	TEST_ASSERT_VAL("can't get session", session);
+
+	for (i = 0; i < session->header.env.nr_cpus_online; i++) {
+		pr_debug("CPU %d, core %d, socket %d\n", i,
+			 session->header.env.cpu[i].core_id,
+			 session->header.env.cpu[i].socket_id);
+	}
+
+	for (i = 0; i < map->nr; i++) {
+		TEST_ASSERT_VAL("Core ID doesn't match",
+			(session->header.env.cpu[map->map[i]].core_id == (cpu_map__get_core(map, i) & 0xffff)));
+
+		TEST_ASSERT_VAL("Socket ID doesn't match",
+			(session->header.env.cpu[map->map[i]].socket_id == cpu_map__get_socket(map, i)));
+	}
+
+	perf_session__delete(session);
+	cpu_map__put(map);
+	unlink(path);
+
+	return 0;
+}
Signature · 1 line
1.8.3.1