From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v4 3/9] perf evlist: Maintain evlist->all_cpus
Date: Mon, 4 Nov 2019 16:25:16 -0800 [thread overview]
Message-ID: <20191105002522.83803-4-andi@firstfloor.org> (raw)
In-Reply-To: <20191105002522.83803-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Maintain a cpumap in the evlist that is the union of all the cpus
of the events.
This needs a cpumap merge operation. To make the merge operation
work efficiently maintain the cpumap in a sorted state.
The sorting is also needed for the affinity loop changes later.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/lib/cpumap.c | 42 ++++++++++++++++++++++++
tools/perf/lib/evlist.c | 1 +
tools/perf/lib/include/internal/evlist.h | 1 +
tools/perf/lib/include/perf/cpumap.h | 2 ++
4 files changed, 46 insertions(+)
diff --git a/tools/perf/lib/cpumap.c b/tools/perf/lib/cpumap.c
index 2ca1fafa620d..5ca26a9d318f 100644
--- a/tools/perf/lib/cpumap.c
+++ b/tools/perf/lib/cpumap.c
@@ -68,6 +68,11 @@ static struct perf_cpu_map *cpu_map__default_new(void)
return cpus;
}
+static int cmp_int(const void *a, const void *b)
+{
+ return *(const int *)a - *(const int*)b;
+}
+
static struct perf_cpu_map *cpu_map__trim_new(int nr_cpus, int *tmp_cpus)
{
size_t payload_size = nr_cpus * sizeof(int);
@@ -76,6 +81,7 @@ static struct perf_cpu_map *cpu_map__trim_new(int nr_cpus, int *tmp_cpus)
if (cpus != NULL) {
cpus->nr = nr_cpus;
memcpy(cpus->map, tmp_cpus, payload_size);
+ qsort(cpus->map, nr_cpus, sizeof(int), cmp_int);
refcount_set(&cpus->refcnt, 1);
}
@@ -272,3 +278,39 @@ int perf_cpu_map__max(struct perf_cpu_map *map)
return max;
}
+
+struct perf_cpu_map *perf_cpu_map__update(struct perf_cpu_map *orig,
+ struct perf_cpu_map *other)
+{
+ int *tmp_cpus;
+ int tmp_len;
+ int i, j, k;
+ struct perf_cpu_map *merged;
+
+ if (!orig) {
+ perf_cpu_map__get(other);
+ return other;
+ }
+ if (orig->nr == other->nr &&
+ !memcmp(orig->map, other->map, orig->nr * sizeof(int)))
+ return orig;
+ tmp_len = orig->nr + other->nr;
+ tmp_cpus = malloc(tmp_len * sizeof(int));
+ if (!tmp_cpus)
+ return NULL;
+ i = j = k = 0;
+ while (i < orig->nr && j < other->nr) {
+ if (orig->map[i] <= other->map[j])
+ tmp_cpus[k++] = orig->map[i++];
+ else
+ tmp_cpus[k++] = other->map[j++];
+ }
+ while (i < orig->nr)
+ tmp_cpus[k++] = orig->map[i++];
+ while (j < other->nr)
+ tmp_cpus[k++] = other->map[j++];
+ assert(k < tmp_len);
+ merged = cpu_map__trim_new(k, tmp_cpus);
+ free(tmp_cpus);
+ return merged;
+}
diff --git a/tools/perf/lib/evlist.c b/tools/perf/lib/evlist.c
index 205ddbb80bc1..35a627283122 100644
--- a/tools/perf/lib/evlist.c
+++ b/tools/perf/lib/evlist.c
@@ -54,6 +54,7 @@ static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,
perf_thread_map__put(evsel->threads);
evsel->threads = perf_thread_map__get(evlist->threads);
+ evlist->all_cpus = perf_cpu_map__update(evlist->all_cpus, evsel->cpus);
}
static void perf_evlist__propagate_maps(struct perf_evlist *evlist)
diff --git a/tools/perf/lib/include/internal/evlist.h b/tools/perf/lib/include/internal/evlist.h
index a2fbccf1922f..74dc8c3f0b66 100644
--- a/tools/perf/lib/include/internal/evlist.h
+++ b/tools/perf/lib/include/internal/evlist.h
@@ -18,6 +18,7 @@ struct perf_evlist {
int nr_entries;
bool has_user_cpus;
struct perf_cpu_map *cpus;
+ struct perf_cpu_map *all_cpus;
struct perf_thread_map *threads;
int nr_mmaps;
size_t mmap_len;
diff --git a/tools/perf/lib/include/perf/cpumap.h b/tools/perf/lib/include/perf/cpumap.h
index ac9aa497f84a..dcf61da64267 100644
--- a/tools/perf/lib/include/perf/cpumap.h
+++ b/tools/perf/lib/include/perf/cpumap.h
@@ -12,6 +12,8 @@ LIBPERF_API struct perf_cpu_map *perf_cpu_map__dummy_new(void);
LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list);
LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file);
LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map);
+LIBPERF_API struct perf_cpu_map *perf_cpu_map__update(struct perf_cpu_map *orig,
+ struct perf_cpu_map *other);
LIBPERF_API void perf_cpu_map__put(struct perf_cpu_map *map);
LIBPERF_API int perf_cpu_map__cpu(const struct perf_cpu_map *cpus, int idx);
LIBPERF_API int perf_cpu_map__nr(const struct perf_cpu_map *cpus);
--
2.23.0
next prev parent reply other threads:[~2019-11-05 0:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 0:25 Optimize perf stat for large number of events/cpus Andi Kleen
2019-11-05 0:25 ` [PATCH v4 1/9] perf pmu: Use file system cache to optimize sysfs access Andi Kleen
2019-11-05 0:25 ` [PATCH v4 2/9] perf affinity: Add infrastructure to save/restore affinity Andi Kleen
2019-11-05 0:25 ` Andi Kleen [this message]
2019-11-06 16:34 ` [PATCH v4 3/9] perf evlist: Maintain evlist->all_cpus Jiri Olsa
2019-11-05 0:25 ` [PATCH v4 4/9] perf evsel: Add iterator to iterate over events ordered by CPU Andi Kleen
2019-11-05 0:25 ` [PATCH v4 5/9] perf stat: Use affinity for closing file descriptors Andi Kleen
2019-11-06 16:33 ` Jiri Olsa
2019-11-06 16:34 ` Jiri Olsa
2019-11-05 0:25 ` [PATCH v4 6/9] perf stat: Factor out open error handling Andi Kleen
2019-11-06 16:33 ` Jiri Olsa
2019-11-05 0:25 ` [PATCH v4 7/9] perf stat: Use affinity for opening events Andi Kleen
2019-11-06 16:34 ` Jiri Olsa
2019-11-05 0:25 ` [PATCH v4 8/9] perf stat: Use affinity for reading Andi Kleen
2019-11-05 0:25 ` [PATCH v4 9/9] perf stat: Use affinity for enabling/disabling events Andi Kleen
2019-11-06 16:34 ` Jiri Olsa
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=20191105002522.83803-4-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).