From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161989AbcBSVwQ (ORCPT ); Fri, 19 Feb 2016 16:52:16 -0500 Received: from mail.kernel.org ([198.145.29.136]:53951 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161164AbcBSVwO (ORCPT ); Fri, 19 Feb 2016 16:52:14 -0500 Date: Fri, 19 Feb 2016 18:52:07 -0300 From: Arnaldo Carvalho de Melo To: Wang Nan Cc: Alexei Starovoitov , Brendan Gregg , Adrian Hunter , Cody P Schafer , "David S. Miller" , He Kuang , =?iso-8859-1?Q?J=E9r=E9mie?= Galarneau , Jiri Olsa , Kirill Smelkov , Li Zefan , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra , pi3orama@163.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 12/55] perf tools: Enable config raw and numeric events Message-ID: <20160219215207.GB12977@kernel.org> References: <1455882283-79592-1-git-send-email-wangnan0@huawei.com> <1455882283-79592-13-git-send-email-wangnan0@huawei.com> <20160219141405.GC16141@kernel.org> <20160219150847.GE16141@kernel.org> <20160219151533.GA12977@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160219151533.GA12977@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, Feb 19, 2016 at 12:15:33PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Fri, Feb 19, 2016 at 12:08:47PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Fri, Feb 19, 2016 at 11:44:00AM +0000, Wang Nan escreveu: > > > This patch allows setting config terms for raw and numeric events. > > > For example: > > > > > > # perf stat -e cycles/name=cyc/ ls > > > ... > > > 1821108 cyc > > > ... > > > > > > # perf stat -e r6530160/name=event/ ls > > > ... > > > 1103195 event > > > ... > > > > > > # perf record -e cycles -e 4:0x6530160/name=evtx,call-graph=fp/ -a sleep 1 > > > ... > > > # perf report --stdio > > > > Nice stuff, but I'm investigating now why I'm getting this: > > > > [acme@jouet linux]$ make O=/tmp/build/perf -C tools/perf install-bin > > make: Entering directory '/home/acme/git/linux/tools/perf' > > BUILD: Doing 'make -j4' parallel build > > BISON /tmp/build/perf/util/parse-events-bison.c > > util/parse-events.y:436.23-38: error: symbol opt_event_config is used, but is not defined as a token and has no rules > > PE_VALUE ':' PE_VALUE opt_event_config > > ^^^^^^^^^^^^^^^^ > > Ok, this is because I deferred the patch that introduces this > 'opt_event_config' thing, that is buried in a BPF patch, when it > could've probably have stood out in a separate patch, trying that now. Ok, so I added the patch below, that uses this opt_event_config thing to simplify other places where the event config is optional, like tracepoints, please see if this is ok, my bison skills are limited: commit 095d8d6283cf8556432673c408cf85de4bbcd64d Author: Arnaldo Carvalho de Melo Date: Fri Feb 19 18:45:12 2016 -0300 perf tools: Introduce opt_event_config nonterminal To remove duplicated code that differs only in using the matching '/a,b,c/' part or NULL if no event configuration is done ('//' or no pair of slashes at all). Will be used by some new targets allowing the configuration of hardware events, etc. Lifted part of the 'opt_event_config' nonterminal from a patch by Wang Nan. Cc: Adrian Hunter Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Cody P Schafer Cc: He Kuang Cc: Jeremie Galarneau Cc: Jiri Olsa Cc: Kirill Smelkov Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/n/tip-e3xzpx9cqsmwnaguaxyw6r42@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index c0eac88ef474..ce68746bdc89 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -64,6 +64,7 @@ static inc_group_count(struct list_head *list, %type PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT %type value_sym %type event_config +%type opt_event_config %type event_term %type event_pmu %type event_legacy_symbol @@ -222,16 +223,6 @@ PE_NAME '/' event_config '/' $$ = list; } | -PE_NAME '/' '/' -{ - struct parse_events_evlist *data = _data; - struct list_head *list; - - ALLOC_LIST(list); - ABORT_ON(parse_events_add_pmu(data, list, $1, NULL)); - $$ = list; -} -| PE_KERNEL_PMU_EVENT sep_dc { struct parse_events_evlist *data = _data; @@ -378,7 +369,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc } event_legacy_tracepoint: -tracepoint_name +tracepoint_name opt_event_config { struct parse_events_evlist *data = _data; struct parse_events_error *error = data->error; @@ -389,24 +380,7 @@ tracepoint_name error->idx = @1.first_column; if (parse_events_add_tracepoint(list, &data->idx, $1.sys, $1.event, - error, NULL)) - return -1; - - $$ = list; -} -| -tracepoint_name '/' event_config '/' -{ - struct parse_events_evlist *data = _data; - struct parse_events_error *error = data->error; - struct list_head *list; - - ALLOC_LIST(list); - if (error) - error->idx = @1.first_column; - - if (parse_events_add_tracepoint(list, &data->idx, $1.sys, $1.event, - error, $3)) + error, $2)) return -1; $$ = list; @@ -476,6 +450,21 @@ PE_BPF_SOURCE $$ = list; } +opt_event_config: +'/' event_config '/' +{ + $$ = $2; +} +| +'/' '/' +{ + $$ = NULL; +} +| +{ + $$ = NULL; +} + start_terms: event_config { struct parse_events_terms *data = _data;