Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753290AbbF3GrP (ORCPT ); Tue, 30 Jun 2015 02:47:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40476 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751817AbbF3Gqw (ORCPT ); Tue, 30 Jun 2015 02:46:52 -0400 Date: Tue, 30 Jun 2015 08:46:42 +0200 From: Jiri Olsa To: kan.liang@intel.com Cc: acme@kernel.org, jolsa@kernel.org, ak@linux.intel.com, namhyung@kernel.org, eranian@google.com, adrian.hunter@intel.com, dsahern@gmail.com, a.p.zijlstra@chello.nl, mingo@redhat.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] perf,tools: get correct cpu id for print_aggr Message-ID: <20150630064642.GC6008@krava.redhat.com> References: <1435607735-6332-1-git-send-email-kan.liang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1435607735-6332-1-git-send-email-kan.liang@intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2432 Lines: 67 On Mon, Jun 29, 2015 at 03:55:34PM -0400, kan.liang@intel.com wrote: > From: Kan Liang > > print_aggr fails to print per-core/per-socket statistics after commit > b7f0c203586b ("perf evlist: Propagate cpu maps to evsels in an evlist"), > if events have differnt cpus. Because in print_aggr, aggr_get_id needs > index (not cpu id) to find core/pkg id. > This patch introduced perf_evsel__get_cpumap_index to get the index by > cpu id for a given event. The index can be used to find correct cpu id > for print_aggr. > SNIP > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 37e301a..a3ea735 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -708,6 +708,7 @@ static void print_aggr(char *prefix) > nr = 0; > for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { > cpu2 = perf_evsel__cpus(counter)->map[cpu]; > + cpu2 = perf_evsel__get_cpumap_index(cpu2, evsel_list->cpus); > s2 = aggr_get_id(evsel_list->cpus, cpu2); > if (s2 != id) > continue; hum, looks like passing the actual cpu number was introduced in: 582ec0829b3d perf stat: Fix per-socket output bug for uncore events also, we already have the index into counter's cpus, why not use those for getting aggregated id (core,socket).. what do I miss? thanks, jirka --- diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 37e301a32f43..47c3c1ffea45 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -694,7 +694,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg) static void print_aggr(char *prefix) { struct perf_evsel *counter; - int cpu, cpu2, s, s2, id, nr; + int cpu, s, s2, id, nr; double uval; u64 ena, run, val; @@ -707,8 +707,7 @@ static void print_aggr(char *prefix) val = ena = run = 0; nr = 0; for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { - cpu2 = perf_evsel__cpus(counter)->map[cpu]; - s2 = aggr_get_id(evsel_list->cpus, cpu2); + s2 = aggr_get_id(perf_evsel__cpus(counter), cpu); if (s2 != id) continue; val += perf_counts(counter->counts, cpu, 0)->val; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/