lkml.org 
[lkml]   [2022]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v4 08/48] perf cpumap: Remove map+index get_die
    From
    Migrate final users to appropriate cpu variant.

    Reviewed-by: James Clark <james.clark@arm.com>
    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/tests/topology.c | 2 +-
    tools/perf/util/cpumap.c | 9 ---------
    tools/perf/util/cpumap.h | 1 -
    tools/perf/util/stat.c | 2 +-
    4 files changed, 2 insertions(+), 12 deletions(-)

    diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
    index 69a64074b897..ce085b6f379b 100644
    --- a/tools/perf/tests/topology.c
    +++ b/tools/perf/tests/topology.c
    @@ -136,7 +136,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)

    // Test that die ID contains socket and die
    for (i = 0; i < map->nr; i++) {
    - id = cpu_map__get_die(map, i, NULL);
    + id = cpu_map__get_die_aggr_by_cpu(perf_cpu_map__cpu(map, i), NULL);
    TEST_ASSERT_VAL("Die map - Socket ID doesn't match",
    session->header.env.cpu[map->map[i]].socket_id == id.socket);

    diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
    index 342a5eaee9d3..ff91c32da688 100644
    --- a/tools/perf/util/cpumap.c
    +++ b/tools/perf/util/cpumap.c
    @@ -216,15 +216,6 @@ struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data)
    return id;
    }

    -struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx,
    - void *data)
    -{
    - if (idx < 0 || idx > map->nr)
    - return cpu_map__empty_aggr_cpu_id();
    -
    - return cpu_map__get_die_aggr_by_cpu(map->map[idx], data);
    -}
    -
    int cpu_map__get_core_id(int cpu)
    {
    int value, ret = cpu__get_topology_int(cpu, "core_id", &value);
    diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
    index a53af24301d2..365ed69699e1 100644
    --- a/tools/perf/util/cpumap.h
    +++ b/tools/perf/util/cpumap.h
    @@ -34,7 +34,6 @@ int cpu_map__get_socket_id(int cpu);
    struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data);
    int cpu_map__get_die_id(int cpu);
    struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data);
    -struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data);
    int cpu_map__get_core_id(int cpu);
    struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data);
    struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data);
    diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
    index 9eca1111fa52..5ed99bcfe91e 100644
    --- a/tools/perf/util/stat.c
    +++ b/tools/perf/util/stat.c
    @@ -336,7 +336,7 @@ static int check_per_pkg(struct evsel *counter,
    * On multi-die system, die_id > 0. On no-die system, die_id = 0.
    * We use hashmap(socket, die) to check the used socket+die pair.
    */
    - d = cpu_map__get_die(cpus, cpu, NULL).die;
    + d = cpu_map__get_die_id(cpu);
    if (d < 0)
    return -1;

    --
    2.34.1.448.ga2b2bfdf31-goog
    \
     
     \ /
      Last update: 2022-01-05 07:15    [W:6.456 / U:1.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site