Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89812fc8 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add parser generator for events parsing 



Changing event parsing to use flex/bison parse generator.
The event syntax stays as it was.

grammar description:

events: events ',' event | event

event:  event_def PE_MODIFIER_EVENT | event_def

event_def: event_legacy_symbol sep_dc     |
           event_legacy_cache sep_dc      |
           event_legacy_breakpoint sep_dc |
           event_legacy_tracepoint sep_dc |
           event_legacy_numeric sep_dc    |
           event_legacy_raw sep_dc

event_legacy_symbol:      PE_NAME_SYM

event_legacy_cache:       PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT |
                          PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT  |
                          PE_NAME_CACHE_TYPE

event_legacy_raw:         PE_SEP_RAW PE_VALUE

event_legacy_numeric:     PE_VALUE ':' PE_VALUE

event_legacy_breakpoint:  PE_SEP_BP ':' PE_VALUE ':' PE_MODIFIER_BP

event_breakpoint_type:    PE_MODIFIER_BPTYPE | empty

PE_NAME_SYM:              cpu-cycles|cycles                              |
                          stalled-cycles-frontend|idle-cycles-frontend   |
                          stalled-cycles-backend|idle-cycles-backend     |
                          instructions                                   |
                          cache-references                               |
                          cache-misses                                   |
                          branch-instructions|branches                   |
                          branch-misses                                  |
                          bus-cycles                                     |
                          cpu-clock                                      |
                          task-clock                                     |
                          page-faults|faults                             |
                          minor-faults                                   |
                          major-faults                                   |
                          context-switches|cs                            |
                          cpu-migrations|migrations                      |
                          alignment-faults                               |
                          emulation-faults

PE_NAME_CACHE_TYPE:       L1-dcache|l1-d|l1d|L1-data             |
                          L1-icache|l1-i|l1i|L1-instruction      |
                          LLC|L2                                 |
                          dTLB|d-tlb|Data-TLB                    |
                          iTLB|i-tlb|Instruction-TLB             |
                          branch|branches|bpu|btb|bpc            |
                          node

PE_NAME_CACHE_OP_RESULT:  load|loads|read                        |
                          store|stores|write                     |
                          prefetch|prefetches                    |
                          speculative-read|speculative-load      |
                          refs|Reference|ops|access              |
                          misses|miss

PE_MODIFIER_EVENT:        [ukhp]{0,5}

PE_MODIFIER_BP:           [rwx]

PE_SEP_BP:                'mem'

PE_SEP_RAW:               'r'

sep_dc:                   ':' |

Added flex/bison files for event grammar parsing. The generated
parser is part of the patch. Added makefile rule 'event-parser'
to generate the parser code out of the bison/flex sources.

Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/n/tip-u4pfig5waq3ll2bfcdex8fgi@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 641cc938

tools/perf/Makefile

+17 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ 


CC = $(CROSS_COMPILE)gcc

AR = $(CROSS_COMPILE)ar

FLEX = $(CROSS_COMPILE)flex

BISON= $(CROSS_COMPILE)bison



# Additional ARCH settings for x86

ifeq ($(ARCH),i386)
@@ -357,6 +359,8 @@ LIB_OBJS += $(OUTPUT)util/session.o 
LIB_OBJS += $(OUTPUT)util/thread.o

LIB_OBJS += $(OUTPUT)util/thread_map.o

LIB_OBJS += $(OUTPUT)util/trace-event-parse.o

LIB_OBJS += $(OUTPUT)util/parse-events-flex.o

LIB_OBJS += $(OUTPUT)util/parse-events-bison.o

LIB_OBJS += $(OUTPUT)util/trace-event-read.o

LIB_OBJS += $(OUTPUT)util/trace-event-info.o

LIB_OBJS += $(OUTPUT)util/trace-event-scripting.o
@@ -645,6 +649,8 @@ ifndef V 
	QUIET_LINK     = @echo '   ' LINK $@;

	QUIET_MKDIR    = @echo '   ' MKDIR $@;

	QUIET_GEN      = @echo '   ' GEN $@;

	QUIET_FLEX     = @echo '   ' FLEX $@;

	QUIET_BISON    = @echo '   ' BISON $@;

endif

endif
@@ -725,6 +731,9 @@ $(OUTPUT)perf.o perf.spec \ 
	$(SCRIPTS) \

	: $(OUTPUT)PERF-VERSION-FILE



.SUFFIXES:

.SUFFIXES: .o .c .S .s



$(OUTPUT)%.o: %.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $<

$(OUTPUT)%.i: %.c $(OUTPUT)PERF-CFLAGS
@@ -761,6 +770,9 @@ $(OUTPUT)util/ui/browsers/map.o: util/ui/browsers/map.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/parse-events-flex.o: util/parse-events-flex.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls -Wno-switch-default -Wno-unused-function $<



$(OUTPUT)util/scripting-engines/trace-event-perl.o: util/scripting-engines/trace-event-perl.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow $<
@@ -797,6 +809,7 @@ help: 
	@echo '  html		- make html documentation'

	@echo '  info		- make GNU info documentation (access with info <foo>)'

	@echo '  pdf		- make pdf documentation'

	@echo '  event-parser	- make event parser code'

	@echo '  TAGS		- use etags to make tag information for source browsing'

	@echo '  tags		- use ctags to make tag information for source browsing'

	@echo '  cscope	- use cscope to make interactive browsing database'
@@ -846,6 +859,10 @@ cscope: 
	$(RM) cscope*

	$(FIND) . -name '*.[hcS]' -print | xargs cscope -b



event-parser:

	$(QUIET_BISON)$(BISON) -v util/parse-events.y -d -o util/parse-events-bison.c

	$(QUIET_FLEX)$(FLEX) --header-file=util/parse-events-flex.h -t util/parse-events.l > util/parse-events-flex.c



### Detect prefix changes

TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\

             $(bindir_SQ):$(perfexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)

tools/perf/builtin-test.c

+3 −3
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static int test__checkevent_raw(struct perf_evlist *evlist) 


	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);

	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);

	TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);

	TEST_ASSERT_VAL("wrong config", 0x1a == evsel->attr.config);

	return 0;

}
@@ -872,7 +872,7 @@ static struct test__event_st { 
		.check = test__checkevent_tracepoint_multi,

	},

	{

		.name  = "r1",

		.name  = "r1a",

		.check = test__checkevent_raw,

	},

	{
@@ -916,7 +916,7 @@ static struct test__event_st { 
		.check = test__checkevent_tracepoint_multi_modifier,

	},

	{

		.name  = "r1:kp",

		.name  = "r1a:kp",

		.check = test__checkevent_raw_modifier,

	},

	{

tools/perf/util/parse-events-bison.c

0 → 100644
+1715 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/perf/util/parse-events-bison.h

0 → 100644
+79 −0
Original line number Diff line number Diff line 
/* A Bison parser, made by GNU Bison 2.4.3.  */



/* Skeleton interface for Bison's Yacc-like parsers in C

   

      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,

   2009, 2010 Free Software Foundation, Inc.

   

   This program is free software: you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation, either version 3 of the License, or

   (at your option) any later version.

   

   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.

   

   You should have received a copy of the GNU General Public License

   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */



/* As a special exception, you may create a larger work that contains

   part or all of the Bison parser skeleton and distribute that work

   under terms of your choice, so long as that work isn't itself a

   parser generator using the skeleton or a modified version thereof

   as a parser skeleton.  Alternatively, if you modify or redistribute

   the parser skeleton itself, you may (at your option) remove this

   special exception, which will cause the skeleton and the resulting

   Bison output files to be licensed under the GNU General Public

   License without this special exception.

   

   This special exception was added by the Free Software Foundation in

   version 2.2 of Bison.  */





/* Tokens.  */

#ifndef YYTOKENTYPE

# define YYTOKENTYPE

   /* Put the tokens into the symbol table, so that GDB and other debuggers

      know about them.  */

   enum yytokentype {

     PE_VALUE = 258,

     PE_VALUE_SYM = 259,

     PE_RAW = 260,

     PE_NAME = 261,

     PE_MODIFIER_EVENT = 262,

     PE_MODIFIER_BP = 263,

     PE_NAME_CACHE_TYPE = 264,

     PE_NAME_CACHE_OP_RESULT = 265,

     PE_PREFIX_MEM = 266,

     PE_PREFIX_RAW = 267,

     PE_ERROR = 268

   };

#endif







#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

typedef union YYSTYPE

{



/* Line 1685 of yacc.c  */

#line 42 "util/parse-events.y"



	char *str;

	unsigned long num;







/* Line 1685 of yacc.c  */

#line 71 "util/parse-events-bison.h"

} YYSTYPE;

# define YYSTYPE_IS_TRIVIAL 1

# define yystype YYSTYPE /* obsolescent; will be withdrawn */

# define YYSTYPE_IS_DECLARED 1

#endif



extern YYSTYPE parse_events_lval;

tools/perf/util/parse-events-flex.c

0 → 100644
+2225 −0

File added.

Preview size limit exceeded, changes collapsed.