From: James Clark <james.clark@arm.com>
To: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
jolsa@redhat.com
Cc: james.clark@arm.com, Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
Thomas Richter <tmricht@linux.ibm.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH 08/13 v4] perf tools: Start using cpu_aggr_id in map
Date: Fri, 13 Nov 2020 19:26:49 +0200 [thread overview]
Message-ID: <20201113172654.989-9-james.clark@arm.com> (raw)
In-Reply-To: <20201113172654.989-1-james.clark@arm.com>
Use the new cpu_aggr_id struct in the cpu map
instead of int so that it can store more data.
No functional changes.
Signed-off-by: James Clark <james.clark@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: John Garry <john.garry@huawei.com>
---
tools/perf/builtin-stat.c | 6 +++---
tools/perf/util/cpumap.c | 8 ++++----
tools/perf/util/cpumap.h | 2 +-
tools/perf/util/stat-display.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 344e50651b55..afe9fa6112b6 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1223,10 +1223,10 @@ static struct aggr_cpu_id perf_stat__get_aggr(struct perf_stat_config *config,
cpu = map->map[idx];
- if (config->cpus_aggr_map->map[cpu] == -1)
- config->cpus_aggr_map->map[cpu] = get_id(config, map, idx).id;
+ if (cpu_map__aggr_cpu_id_is_empty(config->cpus_aggr_map->map[cpu]))
+ config->cpus_aggr_map->map[cpu] = get_id(config, map, idx);
- id.id = config->cpus_aggr_map->map[cpu];
+ id = config->cpus_aggr_map->map[cpu];
return id;
}
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index e90270f0be57..0f42e6a6b704 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -97,14 +97,14 @@ struct perf_cpu_map *perf_cpu_map__empty_new(int nr)
struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr)
{
- struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(int) * nr);
+ struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(struct aggr_cpu_id) * nr);
if (cpus != NULL) {
int i;
cpus->nr = nr;
for (i = 0; i < nr; i++)
- cpus->map[i] = -1;
+ cpus->map[i] = cpu_map__empty_aggr_cpu_id();
refcount_set(&cpus->refcnt, 1);
}
@@ -169,11 +169,11 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
for (cpu = 0; cpu < nr; cpu++) {
s1 = f(cpus, cpu, data);
for (s2 = 0; s2 < c->nr; s2++) {
- if (s1.id == c->map[s2])
+ if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2]))
break;
}
if (s2 == c->nr) {
- c->map[c->nr] = s1.id;
+ c->map[c->nr] = s1;
c->nr++;
}
}
diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index b112069038be..d8fc265bc762 100644
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -14,7 +14,7 @@ struct aggr_cpu_id {
struct cpu_aggr_map {
refcount_t refcnt;
int nr;
- int map[];
+ struct aggr_cpu_id map[];
};
struct perf_record_cpu_map_data;
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 01acb7d5e120..ad91e8a7d5af 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -509,7 +509,7 @@ static void aggr_update_shadow(struct perf_stat_config *config,
struct evsel *counter;
for (s = 0; s < config->aggr_map->nr; s++) {
- id.id = config->aggr_map->map[s];
+ id = config->aggr_map->map[s];
evlist__for_each_entry(evlist, counter) {
val = 0;
for (cpu = 0; cpu < evsel__nr_cpus(counter); cpu++) {
@@ -641,7 +641,7 @@ static void print_counter_aggrdata(struct perf_stat_config *config,
struct aggr_cpu_id id;
double uval;
- ad.id.id = id.id = config->aggr_map->map[s];
+ ad.id = id = config->aggr_map->map[s];
ad.val = ad.ena = ad.run = 0;
ad.nr = 0;
if (!collect_data(config, counter, aggr_cb, &ad))
@@ -1167,7 +1167,7 @@ static void print_percore_thread(struct perf_stat_config *config,
for (int i = 0; i < evsel__nr_cpus(counter); i++) {
s2 = config->aggr_get_id(config, evsel__cpus(counter), i);
for (s = 0; s < config->aggr_map->nr; s++) {
- id.id = config->aggr_map->map[s];
+ id = config->aggr_map->map[s];
if (cpu_map__compare_aggr_cpu_id(s2, id))
break;
}
--
2.28.0
next prev parent reply other threads:[~2020-11-13 17:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 17:26 [PATCH 00/13 v4] perf tools: fix perf stat with large socket IDs James Clark
2020-11-13 17:26 ` [PATCH 01/13 v4] perf tools: Improve topology test James Clark
2020-11-13 17:26 ` [PATCH 02/13 v4] perf tools: Use allocator for perf_cpu_map James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:50 ` James Clark
2020-11-13 17:26 ` [PATCH 03/13 v4] perf tools: Add new struct for cpu aggregation James Clark
2020-11-13 17:26 ` [PATCH 04/13 v4] perf tools: Replace aggregation ID with a struct James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:51 ` James Clark
2020-11-13 17:26 ` [PATCH 05/13 v4] perf tools: add new map type for aggregation James Clark
2020-11-13 17:26 ` [PATCH 06/13 v4] perf tools: drop in cpu_aggr_map struct James Clark
2020-11-13 17:26 ` [PATCH 07/13 v4] perf tools: restrict visibility of functions James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:52 ` James Clark
2020-11-13 17:26 ` James Clark [this message]
2020-11-13 17:26 ` [PATCH 09/13 v4] perf tools: Add separate node member James Clark
2020-11-13 17:26 ` [PATCH 10/13 v4] perf tools: Add separate socket member James Clark
2020-11-13 17:26 ` [PATCH 11/13 v4] perf tools: Add separate die member James Clark
2020-11-13 17:26 ` [PATCH 12/13 v4] perf tools: Add separate core member James Clark
2020-11-13 17:26 ` [PATCH 13/13 v4] perf tools: add thread field James Clark
2020-11-15 21:17 ` Jiri Olsa
2020-11-17 14:53 ` James Clark
2020-11-15 21:18 ` [PATCH 00/13 v4] perf tools: fix perf stat with large socket IDs 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=20201113172654.989-9-james.clark@arm.com \
--to=james.clark@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tmricht@linux.ibm.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).