From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966138AbdCXSu7 (ORCPT ); Fri, 24 Mar 2017 14:50:59 -0400 Received: from terminus.zytor.com ([65.50.211.136]:44621 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965805AbdCXSuw (ORCPT ); Fri, 24 Mar 2017 14:50:52 -0400 Date: Fri, 24 Mar 2017 11:49:43 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, acme@redhat.com, ak@linux.intel.com, tglx@linutronix.de, jolsa@kernel.org, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, acme@redhat.com, mingo@kernel.org, ak@linux.intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@kernel.org In-Reply-To: <20170320201711.14142-7-andi@firstfloor.org> References: <20170320201711.14142-7-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf pmu: Special case uncore_ prefix Git-Commit-ID: a820e33547aee9fd0460106c1fc577a125c23975 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a820e33547aee9fd0460106c1fc577a125c23975 Gitweb: http://git.kernel.org/tip/a820e33547aee9fd0460106c1fc577a125c23975 Author: Andi Kleen AuthorDate: Mon, 20 Mar 2017 13:17:04 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 21 Mar 2017 16:10:59 -0300 perf pmu: Special case uncore_ prefix Special case uncore_ prefix in PMU match, to allow for shorter event uncore specifications. Before: perf stat -a -e uncore_cbox/event=0x35,umask=0x1,filter_opc=0x19C/ sleep 1 After perf stat -a -e cbox/event=0x35,umask=0x1,filter_opc=0x19C/ sleep 1 Committer tests: # perf list uncore List of pre-defined events (to be used in -e): uncore_cbox_0/clockticks/ [Kernel PMU event] uncore_cbox_1/clockticks/ [Kernel PMU event] uncore_imc/data_reads/ [Kernel PMU event] uncore_imc/data_writes/ [Kernel PMU event] # perf stat -a -e cbox_0/clockticks/ sleep 1 Performance counter stats for 'system wide': 281,474,976,653,084 cbox_0/clockticks/ 1.000870129 seconds time elapsed # Signed-off-by: Andi Kleen Acked-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Link: http://lkml.kernel.org/r/20170320201711.14142-7-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.y | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 20935b17..04fd8c9 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -239,6 +239,9 @@ PE_NAME opt_event_config while ((pmu = perf_pmu__scan(pmu)) != NULL) { char *name = pmu->name; + if (!strncmp(name, "uncore_", 7) && + strncmp($1, "uncore_", 7)) + name += 7; if (!strncmp($1, name, strlen($1))) { if (parse_events_copy_term_list(orig_terms, &terms)) YYABORT;