From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@redhat.com>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 19/20] perf tools: Split out PE_VALUE_SYM parsing token to SW and HW tokens
Date: Thu, 5 Jul 2012 12:45:17 -0300 [thread overview]
Message-ID: <1341503118-13198-20-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1341503118-13198-1-git-send-email-acme@infradead.org>
From: Jiri Olsa <jolsa@redhat.com>
Spliting PE_VALUE_SYM token to PE_VALUE_SYM_HW and PE_VALUE_SYM_SW
tokens to separate hardware and software symbols.
This will be useful in upcomming patch where we want to be able to parse
out only hardware events.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1341352848-11833-6-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/parse-events.l | 2 +-
tools/perf/util/parse-events.y | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 6cbe092..384ca74 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -56,7 +56,7 @@ static int sym(yyscan_t scanner, int type, int config)
YYSTYPE *yylval = parse_events_get_lval(scanner);
yylval->num = (type << 16) + config;
- return PE_VALUE_SYM;
+ return type == PERF_TYPE_HARDWARE ? PE_VALUE_SYM_HW : PE_VALUE_SYM_SW;
}
static int term(yyscan_t scanner, int type)
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 9525c45..2bc5fbf 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -26,14 +26,15 @@ do { \
%}
%token PE_START_EVENTS PE_START_TERMS
-%token PE_VALUE PE_VALUE_SYM PE_RAW PE_TERM
+%token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM
%token PE_NAME
%token PE_MODIFIER_EVENT PE_MODIFIER_BP
%token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT
%token PE_PREFIX_MEM PE_PREFIX_RAW
%token PE_ERROR
%type <num> PE_VALUE
-%type <num> PE_VALUE_SYM
+%type <num> PE_VALUE_SYM_HW
+%type <num> PE_VALUE_SYM_SW
%type <num> PE_RAW
%type <num> PE_TERM
%type <str> PE_NAME
@@ -41,6 +42,7 @@ do { \
%type <str> PE_NAME_CACHE_OP_RESULT
%type <str> PE_MODIFIER_EVENT
%type <str> PE_MODIFIER_BP
+%type <num> value_sym
%type <head> event_config
%type <term> event_term
%type <head> event_pmu
@@ -109,8 +111,13 @@ PE_NAME '/' event_config '/'
$$ = list;
}
+value_sym:
+PE_VALUE_SYM_HW
+|
+PE_VALUE_SYM_SW
+
event_legacy_symbol:
-PE_VALUE_SYM '/' event_config '/'
+value_sym '/' event_config '/'
{
struct parse_events_data__events *data = _data;
struct list_head *list = NULL;
@@ -123,7 +130,7 @@ PE_VALUE_SYM '/' event_config '/'
$$ = list;
}
|
-PE_VALUE_SYM sep_slash_dc
+value_sym sep_slash_dc
{
struct parse_events_data__events *data = _data;
struct list_head *list = NULL;
--
1.7.9.2.358.g22243
next prev parent reply other threads:[~2012-07-05 15:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-05 15:44 [GIT PULL 00/20] perf/core improvements and fixes Arnaldo Carvalho de Melo
2012-07-05 15:44 ` [PATCH 01/20] tools lib traceevent: Let filtering numbers by string use function names Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 02/20] tools lib traceevent: Add support for "%.*s" in bprintk events Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 03/20] tools lib traceevent: Add support to show migrate disable counter Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 04/20] tools lib traceevent: Fix %pM print format arg handling Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 05/20] tools lib traceevent: Fix trace_printk for long integers Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 06/20] tools lib traceevent: Fix printk_cmp() Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 07/20] tools lib traceevent: Introduce extend_token() Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 08/20] tools lib traceevent: Handle strdup failure cases Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 09/20] tools lib traceevent: Handle realloc() failure path Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 10/20] tools lib traceevent: Pass string type argument to args Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 11/20] tools lib traceevent: Do not call add_event() again if allocation failed Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 12/20] tools lib traceevent: Fix some comments Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 13/20] tools lib traceevent: Check result of malloc() during reading token Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 14/20] tools lib traceevent: Check return value of arg_to_str() Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 15/20] tools lib traceevent: Add missing break in make_bprint_args Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 16/20] tools lib traceevent: Cleanup realloc use Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 17/20] perf test: Use ARRAY_SIZE in parse events tests Arnaldo Carvalho de Melo
2012-07-05 15:45 ` [PATCH 18/20] perf tools: Add empty rule for new line in event syntax parsing Arnaldo Carvalho de Melo
2012-07-05 15:45 ` Arnaldo Carvalho de Melo [this message]
2012-07-05 15:45 ` [PATCH 20/20] perf tools: Split event symbols arrays to hw and sw parts Arnaldo Carvalho de Melo
2012-07-06 8:22 ` [GIT PULL 00/20] perf/core improvements and fixes Ingo Molnar
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=1341503118-13198-20-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=paulus@samba.org \
/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).