Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1338509

Re: [PATCH 12/55] perf tools: Enable config raw and numeric events

From Arnaldo Carvalho de Melo <acme@kernel.org>
Newsgroups linux.kernel
Subject Re: [PATCH 12/55] perf tools: Enable config raw and numeric events
Date 2016-02-19 23:00 +0100
Message-ID <r41fI-3j1-1@gated-at.bofh.it> (permalink)
References <r3RJo-4w0-7@gated-at.bofh.it> <r3Scq-4Z3-11@gated-at.bofh.it> <r3UQW-6RV-23@gated-at.bofh.it> <r3UQW-6RV-21@gated-at.bofh.it> <r3V0C-6Wq-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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 <acme@redhat.com>
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 <adrian.hunter@intel.com>
    Cc: Alexei Starovoitov <ast@kernel.org>
    Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
    Cc: Cody P Schafer <dev@codyps.com>
    Cc: He Kuang <hekuang@huawei.com>
    Cc: Jeremie Galarneau <jeremie.galarneau@efficios.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Kirill Smelkov <kirr@nexedi.com>
    Cc: Li Zefan <lizefan@huawei.com>
    Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Zefan Li <lizefan@huawei.com>
    Cc: pi3orama@163.com
    Link: http://lkml.kernel.org/n/tip-e3xzpx9cqsmwnaguaxyw6r42@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

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 <str> PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT
 %type <num> value_sym
 %type <head> event_config
+%type <head> opt_event_config
 %type <term> event_term
 %type <head> event_pmu
 %type <head> 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;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/55] perf tools: Bugfix, BPF improvements and overwrite ring buffer support Wang Nan <wangnan0@huawei.com> - 2016-02-19 13:10 +0100
  [PATCH 45/55] perf record: Don't poll on overwrite channel Wang Nan <wangnan0@huawei.com> - 2016-02-19 13:10 +0100
  [PATCH 22/55] perf core: Prepare writing into ring buffer from end Wang Nan <wangnan0@huawei.com> - 2016-02-19 13:10 +0100
  [PATCH 12/55] perf tools: Enable config raw and numeric events Wang Nan <wangnan0@huawei.com> - 2016-02-19 13:20 +0100
    Re: [PATCH 12/55] perf tools: Enable config raw and numeric events Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 16:10 +0100
      Re: [PATCH 12/55] perf tools: Enable config raw and numeric events Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 16:20 +0100
        Re: [PATCH 12/55] perf tools: Enable config raw and numeric events Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-02-19 23:00 +0100
    [tip:perf/core] perf tools: Enable config raw and numeric events tip-bot for Wang Nan <tipbot@zytor.com> - 2016-02-20 12:40 +0100

csiph-web