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

perf tools: Add perf pmu object to access pmu format definition 



Adding pmu object which provides interface to pmu's sysfs
event format definition located at:
  ${sysfs_mount}/bus/event_source/devices/${pmu}/format

Following interface is exported:
  struct perf_pmu* perf_pmu__find(char *name);
  - this function returns pmu object, which is then
    passed as a handle to other interface functions

  int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,
                       struct list_head *head_terms);
  - this function configures perf_event_attr struct based
    on pmu's format definitions and config terms data,
    containined in head_terms list.

Parser generator is used to retrive the pmu's format definition.
The generated parser is part of the patch. Added makefile rule
'pmu-parser' to generate the parser code out of the bison/flex
sources.

Added builtin test 'Test perf pmu format parsing', which could
be run like:
	perf test pmu

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


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

tools/perf/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ LIB_H += util/build-id.h 
LIB_H += util/debug.h

LIB_H += util/debugfs.h

LIB_H += util/sysfs.h

LIB_H += util/pmu.h

LIB_H += util/event.h

LIB_H += util/evsel.h

LIB_H += util/evlist.h
@@ -323,6 +324,7 @@ LIB_OBJS += $(OUTPUT)util/config.o 
LIB_OBJS += $(OUTPUT)util/ctype.o

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

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

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

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

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

LIB_OBJS += $(OUTPUT)util/evlist.o
@@ -361,6 +363,8 @@ 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/pmu-flex.o

LIB_OBJS += $(OUTPUT)util/pmu-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
@@ -773,6 +777,9 @@ $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS 
$(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/pmu-flex.o: util/pmu-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 $<
@@ -810,6 +817,7 @@ help: 
	@echo '  info		- make GNU info documentation (access with info <foo>)'

	@echo '  pdf		- make pdf documentation'

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

	@echo '  pmu-parser	- make pmu format 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'
@@ -863,6 +871,10 @@ 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



pmu-parser:

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

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



### Detect prefix changes

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

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

tools/perf/builtin-test.c

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "util/parse-events.h"

#include "util/symbol.h"

#include "util/thread_map.h"

#include "util/pmu.h"

#include "../../include/linux/hw_breakpoint.h"



#include <sys/mman.h>
@@ -1484,6 +1485,11 @@ static int test__rdpmc(void) 


#endif



static int test__perf_pmu(void)

{

	return perf_pmu__test();

}



static struct test {

	const char *desc;

	int (*func)(void);
@@ -1518,6 +1524,10 @@ static struct test { 
		.desc = "Validate PERF_RECORD_* events & perf_sample fields",

		.func = test__PERF_RECORD,

	},

	{

		.desc = "Test perf pmu format parsing",

		.func = test__perf_pmu,

	},

	{

		.func = NULL,

	},

tools/perf/util/pmu-bison.c

0 → 100644
+1663 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/perf/util/pmu-bison.h

0 → 100644
+73 −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 {

     PP_CONFIG = 258,

     PP_CONFIG1 = 259,

     PP_CONFIG2 = 260,

     PP_VALUE = 261,

     PP_ERROR = 262

   };

#endif







#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

typedef union YYSTYPE

{



/* Line 1685 of yacc.c  */

#line 31 "util/pmu.y"



	unsigned long num;

	DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS);







/* Line 1685 of yacc.c  */

#line 65 "util/pmu-bison.h"

} YYSTYPE;

# define YYSTYPE_IS_TRIVIAL 1

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

# define YYSTYPE_IS_DECLARED 1

#endif



extern YYSTYPE perf_pmu_lval;

tools/perf/util/pmu-flex.c

0 → 100644
+1821 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE