From: Ian Rogers <irogers@google.com> To: Jiri Olsa <jolsa@redhat.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 03/22] perf stat: Switch aggregation to use for_each loop Date: Mon, 13 Dec 2021 08:17:07 -0800 [thread overview] Message-ID: <CAP-5=fVy6LysuDLWRNgWZocfAs=khzdK_aOG7HYVs2E_a4Bpzg@mail.gmail.com> (raw) In-Reply-To: <YbT7Bg3KA/re1HAF@krava> On Sat, Dec 11, 2021 at 11:25 AM Jiri Olsa <jolsa@redhat.com> wrote: > > On Tue, Dec 07, 2021 at 06:45:48PM -0800, Ian Rogers wrote: > > Tidy up the use of cpu and index to hopefully make the code less error > > prone. Avoid unused warnings with (void) which will be removed in a > > later patch. > > > > In aggr_update_shadow, the perf_cpu_map is switched from > > the evlist to the counter's cpu map, so the index is appropriate. This > > addresses a problem where uncore counts, with a cpumap like: > > $ cat /sys/devices/uncore_imc_0/cpumask > > 0,18 > > Don't aggregate counts in CPUs based on the index of those values in the > > cpumap (0 and 1) but on the actual CPU (0 and 18). Thereby correcting > > metric calculations in per-socket mode for counters with without a full > > cpumask. > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/util/stat-display.c | 48 +++++++++++++++++++--------------- > > 1 file changed, 27 insertions(+), 21 deletions(-) > > > > diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c > > index 588601000f3f..efab39a759ff 100644 > > --- a/tools/perf/util/stat-display.c > > +++ b/tools/perf/util/stat-display.c > > @@ -330,8 +330,8 @@ static void print_metric_header(struct perf_stat_config *config, > > static int first_shadow_cpu(struct perf_stat_config *config, > > struct evsel *evsel, struct aggr_cpu_id id) > > { > > - struct evlist *evlist = evsel->evlist; > > - int i; > > + struct perf_cpu_map *cpus; > > + int cpu, idx; > > > > if (config->aggr_mode == AGGR_NONE) > > return id.core; > > @@ -339,14 +339,11 @@ static int first_shadow_cpu(struct perf_stat_config *config, > > if (!config->aggr_get_id) > > return 0; > > > > - for (i = 0; i < evsel__nr_cpus(evsel); i++) { > > - int cpu2 = evsel__cpus(evsel)->map[i]; > > - > > - if (cpu_map__compare_aggr_cpu_id( > > - config->aggr_get_id(config, evlist->core.cpus, cpu2), > > - id)) { > > - return cpu2; > > - } > > + cpus = evsel__cpus(evsel); > > + perf_cpu_map__for_each_cpu(cpu, idx, cpus) { > > + if (cpu_map__compare_aggr_cpu_id(config->aggr_get_id(config, cpus, idx), > > + id)) > > + return cpu; > > so this looks strange, you pass idx instead of cpu2 to aggr_get_id, > which takes idx as 3rd argument, so it looks like it was broken now, > should this be a separate fix? Yep, I tried to cover this in the commit message, but agree a separate patch would be clearer. The aggregation is currently broken on anything other than CPU 0 or when the CPU mask covers every CPU - the case for something like topdown, hence this not being spotted. > also the original code for some reason passed evlist->core.cpus > to aggr_get_id, which might differ rom evsel's cpus Part of the same fix. > same for aggr_update_shadow change In this case the cpu is really an index and so the change is just renaming one to the other for the sake of clarity. Thanks, Ian > jirka >
WARNING: multiple messages have this Message-ID (diff)
From: Ian Rogers <irogers@google.com> To: Jiri Olsa <jolsa@redhat.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 03/22] perf stat: Switch aggregation to use for_each loop Date: Mon, 13 Dec 2021 08:17:07 -0800 [thread overview] Message-ID: <CAP-5=fVy6LysuDLWRNgWZocfAs=khzdK_aOG7HYVs2E_a4Bpzg@mail.gmail.com> (raw) In-Reply-To: <YbT7Bg3KA/re1HAF@krava> On Sat, Dec 11, 2021 at 11:25 AM Jiri Olsa <jolsa@redhat.com> wrote: > > On Tue, Dec 07, 2021 at 06:45:48PM -0800, Ian Rogers wrote: > > Tidy up the use of cpu and index to hopefully make the code less error > > prone. Avoid unused warnings with (void) which will be removed in a > > later patch. > > > > In aggr_update_shadow, the perf_cpu_map is switched from > > the evlist to the counter's cpu map, so the index is appropriate. This > > addresses a problem where uncore counts, with a cpumap like: > > $ cat /sys/devices/uncore_imc_0/cpumask > > 0,18 > > Don't aggregate counts in CPUs based on the index of those values in the > > cpumap (0 and 1) but on the actual CPU (0 and 18). Thereby correcting > > metric calculations in per-socket mode for counters with without a full > > cpumask. > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/util/stat-display.c | 48 +++++++++++++++++++--------------- > > 1 file changed, 27 insertions(+), 21 deletions(-) > > > > diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c > > index 588601000f3f..efab39a759ff 100644 > > --- a/tools/perf/util/stat-display.c > > +++ b/tools/perf/util/stat-display.c > > @@ -330,8 +330,8 @@ static void print_metric_header(struct perf_stat_config *config, > > static int first_shadow_cpu(struct perf_stat_config *config, > > struct evsel *evsel, struct aggr_cpu_id id) > > { > > - struct evlist *evlist = evsel->evlist; > > - int i; > > + struct perf_cpu_map *cpus; > > + int cpu, idx; > > > > if (config->aggr_mode == AGGR_NONE) > > return id.core; > > @@ -339,14 +339,11 @@ static int first_shadow_cpu(struct perf_stat_config *config, > > if (!config->aggr_get_id) > > return 0; > > > > - for (i = 0; i < evsel__nr_cpus(evsel); i++) { > > - int cpu2 = evsel__cpus(evsel)->map[i]; > > - > > - if (cpu_map__compare_aggr_cpu_id( > > - config->aggr_get_id(config, evlist->core.cpus, cpu2), > > - id)) { > > - return cpu2; > > - } > > + cpus = evsel__cpus(evsel); > > + perf_cpu_map__for_each_cpu(cpu, idx, cpus) { > > + if (cpu_map__compare_aggr_cpu_id(config->aggr_get_id(config, cpus, idx), > > + id)) > > + return cpu; > > so this looks strange, you pass idx instead of cpu2 to aggr_get_id, > which takes idx as 3rd argument, so it looks like it was broken now, > should this be a separate fix? Yep, I tried to cover this in the commit message, but agree a separate patch would be clearer. The aggregation is currently broken on anything other than CPU 0 or when the CPU mask covers every CPU - the case for something like topdown, hence this not being spotted. > also the original code for some reason passed evlist->core.cpus > to aggr_get_id, which might differ rom evsel's cpus Part of the same fix. > same for aggr_update_shadow change In this case the cpu is really an index and so the change is just renaming one to the other for the sake of clarity. Thanks, Ian > jirka > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-12-13 16:17 UTC|newest] Thread overview: 80+ 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 ` Ian Rogers 2021-12-08 2:45 ` [PATCH 01/22] libperf: Add comments to perf_cpu_map Ian Rogers 2021-12-08 2:45 ` Ian Rogers 2021-12-08 12:05 ` John Garry 2021-12-08 12:05 ` John Garry 2021-12-08 14:34 ` Ian Rogers 2021-12-08 14:34 ` Ian Rogers 2021-12-08 15:09 ` Ian Rogers 2021-12-08 15:09 ` Ian Rogers 2021-12-10 19:08 ` Arnaldo Carvalho de Melo 2021-12-10 19:08 ` Arnaldo Carvalho de Melo 2021-12-13 8:56 ` John Garry 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 2:45 ` Ian Rogers 2021-12-08 12:50 ` John Garry 2021-12-08 12:50 ` John Garry 2021-12-10 19:10 ` Arnaldo Carvalho de Melo 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-08 2:45 ` Ian Rogers 2021-12-11 19:24 ` Jiri Olsa 2021-12-11 19:24 ` Jiri Olsa 2021-12-13 16:17 ` Ian Rogers [this message] 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 ` 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 ` Ian Rogers 2021-12-08 2:45 ` [PATCH 06/22] perf cpumap: Remove map+index get_socket Ian Rogers 2021-12-08 2:45 ` Ian Rogers 2021-12-11 19:25 ` Jiri Olsa 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 ` Ian Rogers 2021-12-08 2:45 ` [PATCH 08/22] perf cpumap: Remove map+index get_core Ian Rogers 2021-12-08 2:45 ` Ian Rogers 2021-12-08 2:45 ` [PATCH 09/22] perf cpumap: Remove map+index get_node Ian Rogers 2021-12-08 2:45 ` 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 ` Ian Rogers 2021-12-08 2:45 ` [PATCH 11/22] perf cpumap: Remove unused cpu_map__socket Ian Rogers 2021-12-08 2:45 ` Ian Rogers 2021-12-08 2:45 ` [PATCH 12/22] perf cpumap: Simplify equal function name Ian Rogers 2021-12-08 2:45 ` Ian Rogers 2021-12-08 2:45 ` [PATCH 13/22] perf cpumap: Rename empty functions Ian Rogers 2021-12-08 2:45 ` 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:45 ` 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 ` 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 ` Ian Rogers 2021-12-08 2:46 ` [PATCH 17/22] perf cpumap: Refactor cpu_map__build_map Ian Rogers 2021-12-08 2:46 ` Ian Rogers 2021-12-11 19:25 ` Jiri Olsa 2021-12-11 19:25 ` Jiri Olsa 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 ` Ian Rogers 2021-12-08 2:46 ` [PATCH 19/22] perf cpumap: Move 'has' function to libperf Ian Rogers 2021-12-08 2:46 ` Ian Rogers 2021-12-08 17:59 ` Mathieu Poirier 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 ` Ian Rogers 2021-12-08 2:46 ` [PATCH 21/22] perf cpumap: Trim the cpu_aggr_map Ian Rogers 2021-12-08 2:46 ` Ian Rogers 2021-12-11 19:24 ` Jiri Olsa 2021-12-11 19:24 ` Jiri Olsa 2021-12-13 16:11 ` Ian Rogers 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-08 2:46 ` Ian Rogers 2021-12-13 11:39 ` [PATCH 00/22] Refactor perf cpumap James Clark 2021-12-13 11:39 ` James Clark 2021-12-13 16:10 ` Ian Rogers 2021-12-13 16:10 ` Ian Rogers 2021-12-13 22:06 ` 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='CAP-5=fVy6LysuDLWRNgWZocfAs=khzdK_aOG7HYVs2E_a4Bpzg@mail.gmail.com' \ --to=irogers@google.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=james.clark@arm.com \ --cc=john.garry@huawei.com \ --cc=jolsa@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.