lkml.org 
[lkml]   [2012]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] perf, tool: Split out PE_VALUE_SYM parsing token to SW and HW tokens
    Date
    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 usefull in upcomming patch where we want to be able
    to parse out only hardware events.

    Signed-off-by: Jiri Olsa <jolsa@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 c05dbef..86b27a5 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.10.4


    \
     
     \ /
      Last update: 2012-07-04 00:21    [W:0.027 / U:245.528 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site