From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753315AbcB2KKo (ORCPT ); Mon, 29 Feb 2016 05:10:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53577 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752304AbcB2KKj (ORCPT ); Mon, 29 Feb 2016 05:10:39 -0500 Date: Mon, 29 Feb 2016 11:10:35 +0100 From: Jiri Olsa To: Andi Kleen Cc: acme@kernel.org, jolsa@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH 1/6] perf, tools, stat: Check existence of frontend/backed stalled cycles Message-ID: <20160229101035.GA14521@krava.redhat.com> References: <1456532881-26621-1-git-send-email-andi@firstfloor.org> <1456532881-26621-2-git-send-email-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456532881-26621-2-git-send-email-andi@firstfloor.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 29 Feb 2016 10:10:38 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 26, 2016 at 04:27:56PM -0800, Andi Kleen wrote: > From: Andi Kleen > > Only put the frontend/backend stalled cycles into the default > perf stat events when the CPU actually supports them. > > This avoids empty columns with --metric-only on newer Intel CPUs. > > Signed-off-by: Andi Kleen Acked-by: Jiri Olsa thanks, jirka > --- > tools/perf/builtin-stat.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 8c0bc0f..24f222d 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1441,7 +1441,7 @@ static int perf_stat_init_aggr_mode_file(struct perf_stat *st) > */ > static int add_default_attributes(void) > { > - struct perf_event_attr default_attrs[] = { > + struct perf_event_attr default_attrs0[] = { > > { .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_TASK_CLOCK }, > { .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_CONTEXT_SWITCHES }, > @@ -1449,8 +1449,14 @@ static int add_default_attributes(void) > { .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_PAGE_FAULTS }, > > { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_CPU_CYCLES }, > +}; > + struct perf_event_attr frontend_attrs[] = { > { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_STALLED_CYCLES_FRONTEND }, > +}; > + struct perf_event_attr backend_attrs[] = { > { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_STALLED_CYCLES_BACKEND }, > +}; > + struct perf_event_attr default_attrs1[] = { > { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_INSTRUCTIONS }, > { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_BRANCH_INSTRUCTIONS }, > { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_BRANCH_MISSES }, > @@ -1567,7 +1573,19 @@ static int add_default_attributes(void) > } > > if (!evsel_list->nr_entries) { > - if (perf_evlist__add_default_attrs(evsel_list, default_attrs) < 0) > + if (perf_evlist__add_default_attrs(evsel_list, default_attrs0) < 0) > + return -1; > + if (pmu_have_event("cpu", "stalled-cycles-frontend")) { > + if (perf_evlist__add_default_attrs(evsel_list, > + frontend_attrs) < 0) > + return -1; > + } > + if (pmu_have_event("cpu", "stalled-cycles-backend")) { > + if (perf_evlist__add_default_attrs(evsel_list, > + backend_attrs) < 0) > + return -1; > + } > + if (perf_evlist__add_default_attrs(evsel_list, default_attrs1) < 0) > return -1; > } > > -- > 2.5.0 >