From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Wang Nan <wangnan0@huawei.com>
Cc: "Alexei Starovoitov" <ast@kernel.org>,
"Brendan Gregg" <brendan.d.gregg@gmail.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Cody P Schafer" <dev@codyps.com>,
"David S. Miller" <davem@davemloft.net>,
"He Kuang" <hekuang@huawei.com>,
"Jérémie Galarneau" <jeremie.galarneau@efficios.com>,
"Jiri Olsa" <jolsa@kernel.org>,
"Kirill Smelkov" <kirr@nexedi.com>,
"Li Zefan" <lizefan@huawei.com>,
"Masami Hiramatsu" <masami.hiramatsu.pt@hitachi.com>,
"Namhyung Kim" <namhyung@kernel.org>,
"Peter Zijlstra" <peterz@infradead.org>,
pi3orama@163.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 12/55] perf tools: Enable config raw and numeric events
Date: Fri, 19 Feb 2016 18:52:07 -0300 [thread overview]
Message-ID: <20160219215207.GB12977@kernel.org> (raw)
In-Reply-To: <20160219151533.GA12977@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 <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;
next prev parent reply other threads:[~2016-02-19 21:52 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-19 11:43 [PATCH 00/55] perf tools: Bugfix, BPF improvements and overwrite ring buffer support Wang Nan
2016-02-19 11:43 ` [PATCH 01/55] perf tools: Record text offset in dso to calculate objdump address Wang Nan
2016-02-19 11:43 ` [PATCH 02/55] perf tools: Adjust symbol for shared objects Wang Nan
2016-02-19 11:43 ` [PATCH 03/55] perf tools: Rename bpf_prog_priv__clear() to clear_prog_priv() Wang Nan
2016-02-20 11:36 ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2016-02-19 11:43 ` [PATCH 04/55] perf tools: Fix checking asprintf return value Wang Nan
2016-02-20 11:36 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-19 11:43 ` [PATCH 05/55] perf tools: Add API to config maps in bpf object Wang Nan
2016-02-19 11:43 ` [PATCH 06/55] perf tools: Enable BPF object configure syntax Wang Nan
2016-02-19 11:43 ` [PATCH 07/55] perf record: Apply config to BPF objects before recording Wang Nan
2016-02-19 11:43 ` [PATCH 08/55] perf tools: Enable passing event to BPF object Wang Nan
2016-02-19 11:43 ` [PATCH 09/55] perf tools: Create config_term_names array Wang Nan
2016-02-20 11:36 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-19 11:43 ` [PATCH 10/55] perf stat: Forbid user passing improper config terms Wang Nan
[not found] ` <20160219140333.GB16141@kernel.org>
2016-02-19 15:08 ` Arnaldo Carvalho de Melo
2016-02-20 11:37 ` [tip:perf/core] perf stat: Bail out on unsupported event config modifiers tip-bot for Wang Nan
2016-02-19 11:43 ` [PATCH 11/55] perf tools: Rename and move pmu_event_name to get_config_name Wang Nan
2016-02-20 11:37 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-19 11:44 ` [PATCH 12/55] perf tools: Enable config raw and numeric events Wang Nan
[not found] ` <20160219141405.GC16141@kernel.org>
2016-02-19 15:08 ` Arnaldo Carvalho de Melo
2016-02-19 15:15 ` Arnaldo Carvalho de Melo
2016-02-19 21:52 ` Arnaldo Carvalho de Melo [this message]
2016-02-20 11:38 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-19 11:44 ` [PATCH 13/55] perf tools: Enable config and setting names for legacy cache events Wang Nan
2016-02-20 11:38 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-19 11:44 ` [PATCH 14/55] perf tools: Support setting different slots in a BPF map separately Wang Nan
2016-02-19 11:44 ` [PATCH 15/55] perf tools: Enable indices setting syntax for BPF maps Wang Nan
2016-02-19 11:44 ` [PATCH 16/55] perf tools: Pass tracepoint options to BPF script Wang Nan
2016-02-19 11:44 ` [PATCH 17/55] perf tools: Introduce bpf-output event Wang Nan
2016-02-19 11:44 ` [PATCH 18/55] perf data: Support converting data from bpf_perf_event_output() Wang Nan
2016-02-19 11:44 ` [PATCH 19/55] perf data: Explicitly set byte order for integer types Wang Nan
2016-02-19 11:44 ` [PATCH 20/55] perf core: Introduce new ioctl options to pause and resume ring buffer Wang Nan
2016-02-19 11:44 ` [PATCH 21/55] perf core: Set event's default overflow_handler Wang Nan
2016-02-19 11:44 ` [PATCH 22/55] perf core: Prepare writing into ring buffer from end Wang Nan
2016-02-19 11:44 ` [PATCH 23/55] perf core: Add backward attribute to perf event Wang Nan
2016-02-19 11:44 ` [PATCH 24/55] perf core: Reduce perf event output overhead by new overflow handler Wang Nan
2016-02-19 11:44 ` [PATCH 25/55] perf tools: Only validate is_pos for tracking evsels Wang Nan
2016-02-19 11:44 ` [PATCH 26/55] perf tools: Print write_backward value in perf_event_attr__fprintf Wang Nan
2016-02-19 11:44 ` [PATCH 27/55] perf tools: Make ordered_events reusable Wang Nan
2016-02-19 11:44 ` [PATCH 28/55] perf record: Extract synthesize code to record__synthesize() Wang Nan
2016-02-19 11:44 ` [PATCH 29/55] perf tools: Add perf_data_file__switch() helper Wang Nan
2016-02-19 11:44 ` [PATCH 30/55] perf record: Turns auxtrace_snapshot_enable into 3 states Wang Nan
2016-02-19 11:44 ` [PATCH 31/55] perf record: Introduce record__finish_output() to finish a perf.data Wang Nan
2016-02-19 11:44 ` [PATCH 32/55] perf record: Add '--timestamp-filename' option to append timestamp to output filename Wang Nan
2016-02-19 11:44 ` [PATCH 33/55] perf record: Split output into multiple files via '--switch-output' Wang Nan
2016-02-19 11:44 ` [PATCH 34/55] perf record: Force enable --timestamp-filename when --switch-output is provided Wang Nan
2016-02-19 11:44 ` [PATCH 35/55] perf record: Disable buildid cache options by default in switch output mode Wang Nan
2016-02-19 11:44 ` [PATCH 36/55] perf record: Re-synthesize tracking events after output switching Wang Nan
2016-02-19 11:44 ` [PATCH 37/55] perf record: Generate tracking events for process forked by perf Wang Nan
2016-02-19 11:44 ` [PATCH 38/55] perf record: Ensure return non-zero rc when mmap fail Wang Nan
2016-02-19 11:44 ` [PATCH 39/55] perf record: Prevent reading invalid data in record__mmap_read Wang Nan
2016-02-19 11:44 ` [PATCH 40/55] perf tools: Add evlist channel helpers Wang Nan
2016-02-19 11:44 ` [PATCH 41/55] perf tools: Automatically add new channel according to evlist Wang Nan
2016-02-19 11:44 ` [PATCH 42/55] perf tools: Operate multiple channels Wang Nan
2016-02-19 11:44 ` [PATCH 43/55] perf tools: Squash overwrite setting into channel Wang Nan
2016-02-19 11:44 ` [PATCH 44/55] perf record: Don't read from and poll overwrite channel Wang Nan
2016-02-19 11:44 ` [PATCH 45/55] perf record: Don't poll on " Wang Nan
2016-02-19 11:44 ` [PATCH 46/55] perf tools: Detect avalibility of write_backward Wang Nan
2016-02-19 11:44 ` [PATCH 47/55] perf tools: Enable overwrite settings Wang Nan
2016-02-19 11:44 ` [PATCH 48/55] perf tools: Set write_backward attribut bit for overwrite events Wang Nan
2016-02-19 11:44 ` [PATCH 49/55] perf tools: Record fd into perf_mmap Wang Nan
2016-02-19 11:44 ` [PATCH 50/55] perf tools: Add API to pause a channel Wang Nan
2016-02-19 11:44 ` [PATCH 51/55] perf record: Toggle overwrite ring buffer for reading Wang Nan
2016-02-19 11:44 ` [PATCH 52/55] perf record: Rename variable to make code clear Wang Nan
2016-02-19 11:44 ` [PATCH 53/55] perf record: Read from backward ring buffer Wang Nan
2016-02-19 11:44 ` [PATCH 54/55] perf record: Allow generate tracking events at the end of output Wang Nan
2016-02-19 11:44 ` [PATCH 55/55] perf tools: Don't warn about out of order event if write_backward is used Wang Nan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160219215207.GB12977@kernel.org \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ast@kernel.org \
--cc=brendan.d.gregg@gmail.com \
--cc=davem@davemloft.net \
--cc=dev@codyps.com \
--cc=hekuang@huawei.com \
--cc=jeremie.galarneau@efficios.com \
--cc=jolsa@kernel.org \
--cc=kirr@nexedi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=pi3orama@163.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).