From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
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>,
John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>, Kajol Jain <kjain@linux.ibm.com>,
James Clark <james.clark@arm.com>,
German Gomez <german.gomez@arm.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Riccardo Mancini <rickyman7@gmail.com>,
Andi Kleen <ak@linux.intel.com>,
Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>,
Alexander Antonov <alexander.antonov@linux.intel.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
netdev@vger.kernel.org, bpf@vger.kernel.org,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 2/5] perf cpumap: More cpu map reuse by merge.
Date: Mon, 28 Mar 2022 17:26:24 -0300 [thread overview]
Message-ID: <YkIZ8MNdWvtPEikz@kernel.org> (raw)
In-Reply-To: <20220328062414.1893550-3-irogers@google.com>
Em Sun, Mar 27, 2022 at 11:24:11PM -0700, Ian Rogers escreveu:
> perf_cpu_map__merge will reuse one of its arguments if they are equal or
> the other argument is NULL. The arguments could be reused if it is known
> one set of values is a subset of the other. For example, a map of 0-1
> and a map of just 0 when merged yields the map of 0-1. Currently a new
> map is created rather than adding a reference count to the original 0-1
> map.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/lib/perf/cpumap.c | 38 ++++++++++++++++++++++++++++----------
> 1 file changed, 28 insertions(+), 10 deletions(-)
>
> diff --git a/tools/lib/perf/cpumap.c b/tools/lib/perf/cpumap.c
> index ee66760f1e63..953bc50b0e41 100644
> --- a/tools/lib/perf/cpumap.c
> +++ b/tools/lib/perf/cpumap.c
> @@ -319,6 +319,29 @@ struct perf_cpu perf_cpu_map__max(struct perf_cpu_map *map)
> return map->nr > 0 ? map->map[map->nr - 1] : result;
> }
>
> +/** Is 'b' a subset of 'a'. */
> +static bool perf_cpu_map__is_subset(const struct perf_cpu_map *a,
> + const struct perf_cpu_map *b)
> +{
> + int i, j;
> +
> + if (a == b || !b)
> + return true;
> + if (!a || b->nr > a->nr)
> + return false;
> + j = 0;
> + for (i = 0; i < a->nr; i++) {
Since the kernel bumped the minimum gcc version to one that supports
declaring loop variables locally and that perf has been using this since
forever:
⬢[acme@toolbox perf]$ grep -r '(int [[:alpha:]] = 0;' tools/perf
tools/perf/util/block-info.c: for (int i = 0; i < nr_hpps; i++)
tools/perf/util/block-info.c: for (int i = 0; i < nr_hpps; i++) {
tools/perf/util/block-info.c: for (int i = 0; i < nr_reps; i++)
tools/perf/util/stream.c: for (int i = 0; i < nr_evsel; i++)
tools/perf/util/stream.c: for (int i = 0; i < nr_evsel; i++) {
tools/perf/util/stream.c: for (int i = 0; i < els->nr_evsel; i++) {
tools/perf/util/stream.c: for (int i = 0; i < es_pair->nr_streams; i++) {
tools/perf/util/stream.c: for (int i = 0; i < es_base->nr_streams; i++) {
tools/perf/util/cpumap.c: for (int j = 0; j < c->nr; j++) {
tools/perf/util/mem-events.c: for (int j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
tools/perf/util/header.c: for (int i = 0; i < ff->ph->env.nr_hybrid_cpc_nodes; i++) {
tools/perf/builtin-diff.c: for (int i = 0; i < num; i++)
tools/perf/builtin-diff.c: for (int i = 0; i < pair->block_info->num; i++) {
tools/perf/builtin-stat.c: for (int i = 0; i < perf_cpu_map__nr(a->core.cpus); i++) {
⬢[acme@toolbox perf]$
And this builds on all my test containers, please use:
for (int i = 0, j = 0; i < a->nr; i++)
In this case to make the source code more compact.
> + if (a->map[i].cpu > b->map[j].cpu)
> + return false;
> + if (a->map[i].cpu == b->map[j].cpu) {
> + j++;
> + if (j == b->nr)
> + return true;
Ok, as its guaranteed that cpu_maps are ordered.
> + }
> + }
> + return false;
> +}
> +
> /*
> * Merge two cpumaps
> *
> @@ -335,17 +358,12 @@ struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
> int i, j, k;
> struct perf_cpu_map *merged;
>
> - if (!orig && !other)
> - return NULL;
> - if (!orig) {
> - perf_cpu_map__get(other);
> - return other;
> - }
> - if (!other)
> - return orig;
> - if (orig->nr == other->nr &&
> - !memcmp(orig->map, other->map, orig->nr * sizeof(struct perf_cpu)))
> + if (perf_cpu_map__is_subset(orig, other))
> return orig;
Can't we have first the introduction of perf_cpu_map__is_subset() and
then another patch that gets the refcount, i.e. the four lines below?
> + if (perf_cpu_map__is_subset(other, orig)) {
> + perf_cpu_map__put(orig);
> + return perf_cpu_map__get(other);
> + }
>
> tmp_len = orig->nr + other->nr;
> tmp_cpus = malloc(tmp_len * sizeof(struct perf_cpu));
> --
> 2.35.1.1021.g381101b075-goog
--
- Arnaldo
next prev parent reply other threads:[~2022-03-28 20:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 6:24 [PATCH 0/5] Make evlist CPUs more accurate Ian Rogers
2022-03-28 6:24 ` [PATCH 1/5] perf evlist: Rename cpus to user_cpus Ian Rogers
2022-03-28 20:18 ` Arnaldo Carvalho de Melo
2022-03-28 20:58 ` Ian Rogers
2022-03-28 6:24 ` [PATCH 2/5] perf cpumap: More cpu map reuse by merge Ian Rogers
2022-03-28 20:26 ` Arnaldo Carvalho de Melo [this message]
2022-03-28 20:50 ` Ian Rogers
2022-03-28 20:56 ` Arnaldo Carvalho de Melo
2022-03-28 6:24 ` [PATCH 3/5] perf cpumap: Add intersect function Ian Rogers
2022-03-28 20:28 ` Arnaldo Carvalho de Melo
2022-03-28 20:54 ` Ian Rogers
2022-03-28 20:59 ` Arnaldo Carvalho de Melo
2022-03-28 21:25 ` Ian Rogers
2022-03-28 6:24 ` [PATCH 4/5] perf stat: Avoid segv if core.user_cpus isn't set Ian Rogers
2022-03-28 20:32 ` Arnaldo Carvalho de Melo
2022-03-28 20:46 ` Ian Rogers
2022-03-28 6:24 ` [PATCH 5/5] perf evlist: Respect all_cpus when setting user_cpus 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=YkIZ8MNdWvtPEikz@kernel.org \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.antonov@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.v.bayduraev@linux.intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=coresight@lists.linaro.org \
--cc=daniel@iogearbox.net \
--cc=eranian@google.com \
--cc=german.gomez@arm.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=john.fastabend@gmail.com \
--cc=john.garry@huawei.com \
--cc=jolsa@kernel.org \
--cc=kafai@fb.com \
--cc=kjain@linux.ibm.com \
--cc=kpsingh@kernel.org \
--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=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rickyman7@gmail.com \
--cc=songliubraving@fb.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=yhs@fb.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).