perf stat aggregation: Add separate die member

[linux-2.6-microblaze.git] / tools / perf / tests / topology.c

diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
index 22daf2b..e3f8228 100644 (file)
--- a/tools/perf/tests/topology.c
+++ b/tools/perf/tests/topology.c
@@ -40,7 +40,7 @@ static int session_write_header(char *path)
        session = perf_session__new(&data, false, NULL);
        TEST_ASSERT_VAL("can't get session", !IS_ERR(session));
 
-       session->evlist = perf_evlist__new_default();
+       session->evlist = evlist__new_default();
        TEST_ASSERT_VAL("can't get evlist", session->evlist);
 
        perf_header__set_feat(&session->header, HEADER_CPU_TOPOLOGY);
@@ -65,9 +65,11 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
                .mode = PERF_DATA_MODE_READ,
        };
        int i;
+       struct aggr_cpu_id id;
 
        session = perf_session__new(&data, false, NULL);
        TEST_ASSERT_VAL("can't get session", !IS_ERR(session));
+       cpu__setup_cpunode_map();
 
        /* On platforms with large numbers of CPUs process_cpu_topology()
         * might issue an error while reading the perf.data file section
@@ -85,11 +87,18 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
         *  "socket_id number is too big. You may need to upgrade the
         *  perf tool."
         *
-        *  This is the reason why this test might be skipped.
+        *  This is the reason why this test might be skipped. aarch64 and
+        *  s390 always write this part of the header, even when the above
+        *  condition is true (see do_core_id_test in header.c). So always
+        *  run this test on those platforms.
         */
-       if (!session->header.env.cpu)
+       if (!session->header.env.cpu
+                       && strncmp(session->header.env.arch, "s390", 4)
+                       && strncmp(session->header.env.arch, "aarch64", 7))
                return TEST_SKIP;
 
+       TEST_ASSERT_VAL("Session header CPU map not set", session->header.env.cpu);
+
        for (i = 0; i < session->header.env.nr_cpus_avail; i++) {
                if (!cpu_map__has(map, i))
                        continue;
@@ -98,14 +107,53 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
                         session->header.env.cpu[i].socket_id);
        }
 
+       // Test that core ID contains socket, die and core
        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, NULL) & 0xffff)));
+               id = cpu_map__get_core(map, i, NULL);
+               TEST_ASSERT_VAL("Core map - Core ID doesn't match",
+                       session->header.env.cpu[map->map[i]].core_id == cpu_map__id_to_cpu(id.id));
+
+               TEST_ASSERT_VAL("Core map - Socket ID doesn't match",
+                       session->header.env.cpu[map->map[i]].socket_id == id.socket);
+
+               TEST_ASSERT_VAL("Core map - Die ID doesn't match",
+                       session->header.env.cpu[map->map[i]].die_id == id.die);
+               TEST_ASSERT_VAL("Core map - Node ID is set", id.node == -1);
+       }
+
+       // Test that die ID contains socket and die
+       for (i = 0; i < map->nr; i++) {
+               id = cpu_map__get_die(map, i, NULL);
+               TEST_ASSERT_VAL("Die map - Socket ID doesn't match",
+                       session->header.env.cpu[map->map[i]].socket_id == id.socket);
+
+               TEST_ASSERT_VAL("Die map - Die ID doesn't match",
+                       session->header.env.cpu[map->map[i]].die_id == id.die);
 
-               TEST_ASSERT_VAL("Socket ID doesn't match",
-                       (session->header.env.cpu[map->map[i]].socket_id == cpu_map__get_socket(map, i, NULL)));
+               TEST_ASSERT_VAL("Die map - Node ID is set", id.node == -1);
+               TEST_ASSERT_VAL("Die map - ID is set", id.id == -1);
        }
 
+       // Test that socket ID contains only socket
+       for (i = 0; i < map->nr; i++) {
+               id = cpu_map__get_socket(map, i, NULL);
+               TEST_ASSERT_VAL("Socket map - Socket ID doesn't match",
+                       session->header.env.cpu[map->map[i]].socket_id == id.socket);
+
+               TEST_ASSERT_VAL("Socket map - Node ID is set", id.node == -1);
+               TEST_ASSERT_VAL("Socket map - Die ID is set", id.die == -1);
+               TEST_ASSERT_VAL("Socket map - ID is set", id.id == -1);
+       }
+
+       // Test that node ID contains only node
+       for (i = 0; i < map->nr; i++) {
+               id = cpu_map__get_node(map, i, NULL);
+               TEST_ASSERT_VAL("Node map - Node ID doesn't match",
+                       cpu__get_node(map->map[i]) == id.node);
+               TEST_ASSERT_VAL("Node map - ID is set", id.id == -1);
+               TEST_ASSERT_VAL("Node map - Socket is set", id.socket == -1);
+               TEST_ASSERT_VAL("Node map - Die ID is set", id.die == -1);
+       }
        perf_session__delete(session);
 
        return 0;