Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753239AbbF3NZQ (ORCPT ); Tue, 30 Jun 2015 09:25:16 -0400 Received: from mga02.intel.com ([134.134.136.20]:57557 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753116AbbF3NZI convert rfc822-to-8bit (ORCPT ); Tue, 30 Jun 2015 09:25:08 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,377,1432623600"; d="scan'208";a="516581051" From: "Liang, Kan" To: Jiri Olsa CC: "acme@kernel.org" , "jolsa@kernel.org" , "ak@linux.intel.com" , "namhyung@kernel.org" , "eranian@google.com" , "Hunter, Adrian" , "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 Thread-Topic: [PATCH 1/2] perf,tools: get correct cpu id for print_aggr Thread-Index: AQHQsuIoOgInbasgLk6Vkhu+aaRsF53EFSsAgADpROA= Date: Tue, 30 Jun 2015 13:24:59 +0000 Message-ID: <37D7C6CF3E00A74B8858931C1DB2F0770188353D@SHSMSX103.ccr.corp.intel.com> References: <1435607735-6332-1-git-send-email-kan.liang@intel.com> <20150630064642.GC6008@krava.redhat.com> In-Reply-To: <20150630064642.GC6008@krava.redhat.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3035 Lines: 79 > 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 > Right, I will change it. > also, we already have the index into counter's cpus, why not use those for > getting aggregated id (core,socket).. what do I miss? Yes, the index is already there. But we still pass evlist's cpu map to aggr_get_id. So once evsel and evlist have different cpu maps (e.g. -a with uncore event), the wrong aggregated id will be return. I think the patch as below will fix all these issues. Thanks, Kan --- diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 37e301a..47c3c1f 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/