lkml.org 
[lkml]   [2021]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v2 24/48] perf cpumap: Add CPU to aggr_cpu_id
On Wed, Dec 22, 2021 at 11:47 PM Ian Rogers <irogers@google.com> wrote:
>
> With no aggregration, such as 'perf stat -A', the aggr_cpu_id lacks a
> way to describe per CPU aggregation and the core is set to the CPU in
> places like print_counter_aggrdata in stat-display.c. Setting the core
> to the CPU is undesirable as the CPU will exceed valid core values and
> lead to confusion. Add a CPU variable to address this.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
[SNIP]
> diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
> index 985c87f1f1ca..a535fd360d46 100644
> --- a/tools/perf/util/cpumap.c
> +++ b/tools/perf/util/cpumap.c
> @@ -253,6 +253,20 @@ struct aggr_cpu_id aggr_cpu_id__core(int cpu, void *data)
>
> }
>
> +struct aggr_cpu_id aggr_cpu_id__cpu(int cpu, void *data)
> +{
> + struct aggr_cpu_id id;
> +
> + /* aggr_cpu_id__die returns a struct with socket and die set*/

A copy and paste error?

Thanks,
Namhyung


> + id = aggr_cpu_id__core(cpu, data);
> + if (aggr_cpu_id__is_empty(&id))
> + return id;
> +
> + id.cpu = cpu;
> + return id;
> +
> +}
> +
> struct aggr_cpu_id aggr_cpu_id__node(int cpu, void *data __maybe_unused)
> {
> struct aggr_cpu_id id = aggr_cpu_id__empty();
> @@ -576,7 +590,8 @@ bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b
> a->node == b->node &&
> a->socket == b->socket &&
> a->die == b->die &&
> - a->core == b->core;
> + a->core == b->core &&
> + a->cpu == b->cpu;
> }
>
> bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a)
> @@ -585,7 +600,8 @@ bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a)
> a->node == -1 &&
> a->socket == -1 &&
> a->die == -1 &&
> - a->core == -1;
> + a->core == -1 &&
> + a->cpu == -1;
> }
>
> struct aggr_cpu_id aggr_cpu_id__empty(void)
> @@ -595,7 +611,8 @@ struct aggr_cpu_id aggr_cpu_id__empty(void)
> .node = -1,
> .socket = -1,
> .die = -1,
> - .core = -1
> + .core = -1,
> + .cpu = -1
> };
> return ret;
> }
> diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
> index 8acef8ff8753..651c6417d3c3 100644
> --- a/tools/perf/util/cpumap.h
> +++ b/tools/perf/util/cpumap.h
> @@ -22,6 +22,8 @@ struct aggr_cpu_id {
> int die;
> /** The core id as read from /sys/devices/system/cpu/cpuX/topology/core_id. */
> int core;
> + /** CPU aggregation, note there is one CPU for each SMT thread. */
> + int cpu;
> };
>
> /** A collection of aggr_cpu_id values, the "built" version is sorted and uniqued. */
> @@ -109,6 +111,12 @@ struct aggr_cpu_id aggr_cpu_id__die(int cpu, void *data);
> * compatible with aggr_cpu_id_get_t.
> */
> struct aggr_cpu_id aggr_cpu_id__core(int cpu, void *data);
> +/**
> + * aggr_cpu_id__core - Create an aggr_cpu_id with the cpu, core, die and socket
> + * populated with the cpu, core, die and socket for cpu. The function signature
> + * is compatible with aggr_cpu_id_get_t.
> + */
> +struct aggr_cpu_id aggr_cpu_id__cpu(int cpu, void *data);
> /**
> * aggr_cpu_id__node - Create an aggr_cpu_id with the numa node populated for
> * cpu. The function signature is compatible with aggr_cpu_id_get_t.
> --
> 2.34.1.307.g9b7440fafd-goog
>

\
 
 \ /
  Last update: 2021-12-29 01:02    [W:0.183 / U:12.648 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site