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 16/48] perf cpumap: Remove map from function names that don't use a map.
    From
    Move to the cpu name and document for consistency.

    Reviewed-by: James Clark <james.clark@arm.com>
    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/util/cpumap.c | 12 ++++++------
    tools/perf/util/cpumap.h | 19 ++++++++++++++++---
    tools/perf/util/env.c | 6 +++---
    tools/perf/util/stat.c | 4 ++--
    4 files changed, 27 insertions(+), 14 deletions(-)

    diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
    index 1626b0991408..e0d7f1da5858 100644
    --- a/tools/perf/util/cpumap.c
    +++ b/tools/perf/util/cpumap.c
    @@ -126,7 +126,7 @@ static int cpu__get_topology_int(int cpu, const char *name, int *value)
    return sysfs__read_int(path, value);
    }

    -int cpu_map__get_socket_id(int cpu)
    +int cpu__get_socket_id(int cpu)
    {
    int value, ret = cpu__get_topology_int(cpu, "physical_package_id", &value);
    return ret ?: value;
    @@ -136,7 +136,7 @@ struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_u
    {
    struct aggr_cpu_id id = aggr_cpu_id__empty();

    - id.socket = cpu_map__get_socket_id(cpu);
    + id.socket = cpu__get_socket_id(cpu);
    return id;
    }

    @@ -190,7 +190,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    return 0;
    }

    -int cpu_map__get_die_id(int cpu)
    +int cpu__get_die_id(int cpu)
    {
    int value, ret = cpu__get_topology_int(cpu, "die_id", &value);

    @@ -202,7 +202,7 @@ struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data)
    struct aggr_cpu_id id;
    int die;

    - die = cpu_map__get_die_id(cpu);
    + die = cpu__get_die_id(cpu);
    /* There is no die_id on legacy system. */
    if (die == -1)
    die = 0;
    @@ -220,7 +220,7 @@ struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data)
    return id;
    }

    -int cpu_map__get_core_id(int cpu)
    +int cpu__get_core_id(int cpu)
    {
    int value, ret = cpu__get_topology_int(cpu, "core_id", &value);
    return ret ?: value;
    @@ -229,7 +229,7 @@ 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 id;
    - int core = cpu_map__get_core_id(cpu);
    + int core = cpu__get_core_id(cpu);

    /* cpu_map__get_die returns a struct with socket and die set*/
    id = cpu_map__get_die_aggr_by_cpu(cpu, data);
    diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
    index f849f01c5860..a053bf31a3f0 100644
    --- a/tools/perf/util/cpumap.h
    +++ b/tools/perf/util/cpumap.h
    @@ -39,11 +39,8 @@ struct perf_cpu_map *cpu_map__new_data(struct perf_record_cpu_map_data *data);
    size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size);
    size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size);
    size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp);
    -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);
    -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_node_aggr_by_cpu(int cpu, void *data);
    int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp);
    @@ -62,6 +59,22 @@ int cpu__max_present_cpu(void);
    * /sys/devices/system/node/nodeX for the given CPU.
    */
    int cpu__get_node(int cpu);
    +/**
    + * cpu__get_socket_id - Returns the socket number as read from
    + * /sys/devices/system/cpu/cpuX/topology/physical_package_id for the given CPU.
    + */
    +int cpu__get_socket_id(int cpu);
    +/**
    + * cpu__get_die_id - Returns the die id as read from
    + * /sys/devices/system/cpu/cpuX/topology/die_id for the given CPU.
    + */
    +int cpu__get_die_id(int cpu);
    +/**
    + * cpu__get_core_id - Returns the core id as read from
    + * /sys/devices/system/cpu/cpuX/topology/core_id for the given CPU.
    + */
    +int cpu__get_core_id(int cpu);
    +

    int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    struct aggr_cpu_id (*f)(int cpu, void *data),
    diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
    index b9904896eb97..fd12c0dcaefb 100644
    --- a/tools/perf/util/env.c
    +++ b/tools/perf/util/env.c
    @@ -302,9 +302,9 @@ int perf_env__read_cpu_topology_map(struct perf_env *env)
    return -ENOMEM;

    for (cpu = 0; cpu < nr_cpus; ++cpu) {
    - env->cpu[cpu].core_id = cpu_map__get_core_id(cpu);
    - env->cpu[cpu].socket_id = cpu_map__get_socket_id(cpu);
    - env->cpu[cpu].die_id = cpu_map__get_die_id(cpu);
    + env->cpu[cpu].core_id = cpu__get_core_id(cpu);
    + env->cpu[cpu].socket_id = cpu__get_socket_id(cpu);
    + env->cpu[cpu].die_id = cpu__get_die_id(cpu);
    }

    env->nr_cpus_avail = nr_cpus;
    diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
    index 5ed99bcfe91e..5c24aca0968c 100644
    --- a/tools/perf/util/stat.c
    +++ b/tools/perf/util/stat.c
    @@ -328,7 +328,7 @@ static int check_per_pkg(struct evsel *counter,
    if (!(vals->run && vals->ena))
    return 0;

    - s = cpu_map__get_socket_id(cpu);
    + s = cpu__get_socket_id(cpu);
    if (s < 0)
    return -1;

    @@ -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_id(cpu);
    + d = cpu__get_die_id(cpu);
    if (d < 0)
    return -1;

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