From: Jiri Olsa <jolsa@redhat.com>
To: Ian Rogers <irogers@google.com>
Cc: Andi Kleen <ak@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
John Garry <john.garry@huawei.com>,
Kajol Jain <kjain@linux.ibm.com>,
"Paul A . Clarke" <pc@us.ibm.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Riccardo Mancini <rickyman7@gmail.com>,
Kan Liang <kan.liang@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Vineet Singh <vineet.singh@intel.com>,
James Clark <james.clark@arm.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>,
coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
eranian@google.com
Subject: Re: [PATCH 17/22] perf cpumap: Refactor cpu_map__build_map
Date: Sat, 11 Dec 2021 20:25:10 +0100 [thread overview]
Message-ID: <YbT7Fg1l8sZ3R44a@krava> (raw)
In-Reply-To: <20211208024607.1784932-18-irogers@google.com>
On Tue, Dec 07, 2021 at 06:46:02PM -0800, Ian Rogers wrote:
SNIP
> - perror("cannot build core map");
> - return -1;
> - }
> - stat_config.aggr_get_id = perf_stat__get_core_file;
> - break;
> + return perf_stat__get_core_file;
> case AGGR_NODE:
> - if (perf_env__build_node_map(env, evsel_list->core.cpus, &stat_config.aggr_map)) {
> - perror("cannot build core map");
> - return -1;
> - }
> - stat_config.aggr_get_id = perf_stat__get_node_file;
> - break;
> + return perf_stat__get_node_file;
> case AGGR_NONE:
> case AGGR_GLOBAL:
> case AGGR_THREAD:
> case AGGR_UNSET:
> default:
> - break;
> + return NULL;
> }
> +}
> +
> +static int perf_stat_init_aggr_mode_file(struct perf_stat *st)
> +{
> + struct perf_env *env = &st->session->header.env;
>
> + aggr_cpu_id_get_t f = aggr_mode__get_aggr_file(stat_config.aggr_mode);
we use get_id for aggr_get_id_t, maybe we could use it instead of 'f' in
here as well
> +
> + if (!f)
> + return 0;
> +
> + stat_config.aggr_map = cpu_aggr_map__new(evsel_list->core.cpus, f, env);
> + if (!stat_config.aggr_map) {
> + pr_err("cannot build %s map", aggr_mode__string[stat_config.aggr_mode]);
> + return -1;
> + }
> + stat_config.aggr_get_id = aggr_mode__get_id_file(stat_config.aggr_mode);
> return 0;
> }
>
> diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
> index 32f9fc2dd389..ba4468f691c8 100644
> --- a/tools/perf/util/cpumap.c
> +++ b/tools/perf/util/cpumap.c
> @@ -140,7 +140,7 @@ struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_u
> return id;
> }
>
> -static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
> +static int aggr_cpu_id__cmp(const void *a_pointer, const void *b_pointer)
> {
> struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer;
> struct aggr_cpu_id *b = (struct aggr_cpu_id *)b_pointer;
> @@ -157,37 +157,40 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
> return a->thread - b->thread;
> }
>
> -int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
> - struct aggr_cpu_id (*f)(int cpu, void *data),
> - void *data)
> +struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus,
> + aggr_cpu_id_get_t f,
> + void *data)
same here
thanks,
jirka
> {
> - int nr = cpus->nr;
> - struct cpu_aggr_map *c = cpu_aggr_map__empty_new(nr);
> - int cpu, s2;
> - struct aggr_cpu_id s1;
> + int cpu, idx;
> + struct cpu_aggr_map *c = cpu_aggr_map__empty_new(cpus->nr);
>
> if (!c)
> - return -1;
> + return NULL;
>
> /* Reset size as it may only be partially filled */
> c->nr = 0;
>
> - for (cpu = 0; cpu < nr; cpu++) {
> - s1 = f(cpu, data);
> - for (s2 = 0; s2 < c->nr; s2++) {
> - if (aggr_cpu_id__equal(&s1, &c->map[s2]))
> + perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
> + bool duplicate = false;
> + struct aggr_cpu_id cpu_id = f(cpu, data);
> +
> + for (int j = 0; j < c->nr; j++) {
> + if (aggr_cpu_id__equal(&cpu_id, &c->map[j])) {
> + duplicate = true;
> break;
> + }
> }
> - if (s2 == c->nr) {
> - c->map[c->nr] = s1;
> + if (!duplicate) {
> + c->map[c->nr] = cpu_id;
> c->nr++;
> }
> }
> +
> /* ensure we process id in increasing order */
> - qsort(c->map, c->nr, sizeof(struct aggr_cpu_id), cmp_aggr_cpu_id);
> + qsort(c->map, c->nr, sizeof(struct aggr_cpu_id), aggr_cpu_id__cmp);
> +
> + return c;
>
> - *res = c;
> - return 0;
> }
>
SNIP
next prev parent reply other threads:[~2021-12-11 19:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 2:45 [PATCH 00/22] Refactor perf cpumap Ian Rogers
2021-12-08 2:45 ` [PATCH 01/22] libperf: Add comments to perf_cpu_map Ian Rogers
2021-12-08 12:05 ` John Garry
2021-12-08 14:34 ` Ian Rogers
2021-12-08 15:09 ` Ian Rogers
2021-12-10 19:08 ` Arnaldo Carvalho de Melo
2021-12-13 8:56 ` John Garry
2021-12-08 2:45 ` [PATCH 02/22] perf stat: Add aggr creators that are passed a cpu Ian Rogers
2021-12-08 12:50 ` John Garry
2021-12-10 19:10 ` Arnaldo Carvalho de Melo
2021-12-08 2:45 ` [PATCH 03/22] perf stat: Switch aggregation to use for_each loop Ian Rogers
2021-12-11 19:24 ` Jiri Olsa
2021-12-13 16:17 ` Ian Rogers
2021-12-08 2:45 ` [PATCH 04/22] perf stat: Switch to cpu version of cpu_map__get Ian Rogers
2021-12-08 2:45 ` [PATCH 05/22] perf cpumap: Switch cpu_map__build_map to cpu function Ian Rogers
2021-12-08 2:45 ` [PATCH 06/22] perf cpumap: Remove map+index get_socket Ian Rogers
2021-12-11 19:25 ` Jiri Olsa
2021-12-08 2:45 ` [PATCH 07/22] perf cpumap: Remove map+index get_die Ian Rogers
2021-12-08 2:45 ` [PATCH 08/22] perf cpumap: Remove map+index get_core Ian Rogers
2021-12-08 2:45 ` [PATCH 09/22] perf cpumap: Remove map+index get_node Ian Rogers
2021-12-08 2:45 ` [PATCH 10/22] perf cpumap: Add comments to aggr_cpu_id Ian Rogers
2021-12-08 2:45 ` [PATCH 11/22] perf cpumap: Remove unused cpu_map__socket Ian Rogers
2021-12-08 2:45 ` [PATCH 12/22] perf cpumap: Simplify equal function name Ian Rogers
2021-12-08 2:45 ` [PATCH 13/22] perf cpumap: Rename empty functions Ian Rogers
2021-12-08 2:45 ` [PATCH 14/22] perf cpumap: Document cpu__get_node and remove redundant function Ian Rogers
2021-12-08 2:46 ` [PATCH 15/22] perf cpumap: Remove map from function names that don't use a map Ian Rogers
2021-12-08 2:46 ` [PATCH 16/22] perf cpumap: Remove cpu_map__cpu, use libperf function Ian Rogers
2021-12-08 2:46 ` [PATCH 17/22] perf cpumap: Refactor cpu_map__build_map Ian Rogers
2021-12-11 19:25 ` Jiri Olsa [this message]
2021-12-08 2:46 ` [PATCH 18/22] perf cpumap: Rename cpu_map__get_X_aggr_by_cpu functions Ian Rogers
2021-12-08 2:46 ` [PATCH 19/22] perf cpumap: Move 'has' function to libperf Ian Rogers
2021-12-08 17:59 ` Mathieu Poirier
2021-12-08 2:46 ` [PATCH 20/22] perf cpumap: Add some comments to cpu_aggr_map Ian Rogers
2021-12-08 2:46 ` [PATCH 21/22] perf cpumap: Trim the cpu_aggr_map Ian Rogers
2021-12-11 19:24 ` Jiri Olsa
2021-12-13 16:11 ` Ian Rogers
2021-12-08 2:46 ` [PATCH 22/22] perf stat: Fix memory leak in check_per_pkg Ian Rogers
2021-12-13 11:39 ` [PATCH 00/22] Refactor perf cpumap James Clark
2021-12-13 16:10 ` Ian Rogers
2021-12-13 22:06 ` Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YbT7Fg1l8sZ3R44a@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=john.garry@huawei.com \
--cc=kan.liang@linux.intel.com \
--cc=kjain@linux.ibm.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=pc@us.ibm.com \
--cc=peterz@infradead.org \
--cc=rickyman7@gmail.com \
--cc=suzuki.poulose@arm.com \
--cc=vineet.singh@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).