perf tools: add support for libpfm4
Subsystems (4)
Ian Rogers
reviewerPATCH v5 1/1 perf tools: add support for libpfm4
This patch links perf with the libpfm4 library if it is available and NO_LIBPFM4 isn't passed to the build. The libpfm4 library contains hardware event tables for all processors supported by perf_events. It is a helper library that helps convert from a symbolic event name to the event encoding required by the underlying kernel interface. This library is open-source and available from: http://perfmon2.sf.net.
With this patch, it is possible to specify full hardware events by name. Hardware filters are also supported. Events must be specified via the --pfm-events and not -e option. Both options are active at the same time and it is possible to mix and match:
$ perf stat --pfm-events inst_retired:any_p:c=1:i -e cycles ....
v5 is a rebase.
v4 is a rebase on git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
branch perf/core and re-adds the tools/build/feature/test-libpfm4.c missed in v3.
v3 is against acme/perf/core and removes a diagnostic warning.
v2 of this patch makes the --pfm-events man page documentation conditional on libpfm4 behing configured. It tidies some of the documentation and adds the feature test missed in the v1 patch.
Author: Stephane Eranian <[email protected]>
--- tools/build/Makefile.feature | 6 +- tools/build/feature/Makefile | 7 +- tools/build/feature/test-libpfm4.c | 8 + tools/perf/Documentation/Makefile | 4 +- tools/perf/Documentation/perf-record.txt | 11 + tools/perf/Documentation/perf-stat.txt | 10 + tools/perf/Documentation/perf-top.txt | 11 + tools/perf/Makefile.config | 12 ++ tools/perf/Makefile.perf | 6 +- tools/perf/builtin-list.c | 16 ++ tools/perf/builtin-record.c | 20 ++ tools/perf/builtin-stat.c | 21 ++ tools/perf/builtin-top.c | 20 ++ tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 246 +++++++++++++++++++++++ tools/perf/util/parse-events.h | 5 + tools/perf/util/pmu.c | 11 + tools/perf/util/pmu.h | 1 + 19 files changed, 410 insertions(+), 8 deletions(-) create mode 100644 tools/build/feature/test-libpfm4.c
tools/build/Makefile.feature +4 -2
@@ -72,7 +72,8 @@ FEATURE_TESTS_BASIC := \ setns \ libaio \ libzstd \ - disassembler-four-args + disassembler-four-args \ + libpfm4 # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list # of all feature tests
@@ -127,7 +128,8 @@ FEATURE_DISPLAY ?= \ bpf \ libaio \ libzstd \ - disassembler-four-args + disassembler-four-args \ + libpfm4 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. # If in the future we need per-feature checks/flags for features not
tools/build/feature/Makefile +6 -1
@@ -67,7 +67,9 @@ FILES= \ test-llvm.bin \ test-llvm-version.bin \ test-libaio.bin \ - test-libzstd.bin + test-libzstd.bin \ + test-libpfm4.bin + FILES := $(addprefix $(OUTPUT),$(FILES))
@@ -321,6 +323,9 @@ $(OUTPUT)test-libaio.bin: $(OUTPUT)test-libzstd.bin: $(BUILD) -lzstd +$(OUTPUT)test-libpfm4.bin: + $(BUILD) -lpfm + ############################### clean:
tools/build/feature/test-libpfm4.c new file +8 -0
@@ -0,0 +1,8 @@ +#include <sys/types.h> +#include <perfmon/pfmlib.h> + +int main (void ) +{ +pfm_initialize (); +return 0 ; +}
tools/perf/Documentation/Makefile +2 -2
@@ -48,7 +48,7 @@ man5dir=$(mandir)/man5 man7dir=$(mandir)/man7 ASCIIDOC=asciidoc -ASCIIDOC_EXTRA = --unsafe -f asciidoc.conf +ASCIIDOC_EXTRA += --unsafe -f asciidoc.conf ASCIIDOC_HTML = xhtml11 MANPAGE_XSL = manpage-normal.xsl XMLTO_EXTRA =
@@ -59,7 +59,7 @@ HTML_REF = origin/html ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor -ASCIIDOC_EXTRA = -a compat-mode +ASCIIDOC_EXTRA += -a compat-mode ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -a mansource="perf" -a manmanual="perf Manual" ASCIIDOC_HTML = xhtml5
tools/perf/Documentation/perf-record.txt +11 -0
@@ -587,6 +587,17 @@ Make a copy of /proc/kcore and place it into a directory with the perf data file Limit the sample data max size, <size> is expected to be a number with appended unit character - B/K/M/G +ifdef::HAVE_LIBPFM[] +--pfm-events events:: +Select a PMU event using libpfm4 syntax (see http://perfmon2.sf.net) +including support for event filters. For example '--pfm-events +inst_retired:any_p:u:c=1:i'. More than one event can be passed to the +option using the comma separator. Hardware events and generic hardware +events cannot be mixed together. The latter must be used with the -e +option. The -e option and this one can be mixed and matched. Events +can be grouped using the {} notation. +endif::HAVE_LIBPFM[] + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1], linkperf:perf-intel-pt[1]
tools/perf/Documentation/perf-stat.txt +10 -0
@@ -71,6 +71,16 @@ report:: --tid=<tid>:: stat events on existing thread id (comma separated list) +ifdef::HAVE_LIBPFM[] +--pfm-events events:: +Select a PMU event using libpfm4 syntax (see http://perfmon2.sf.net) +including support for event filters. For example '--pfm-events +inst_retired:any_p:u:c=1:i'. More than one event can be passed to the +option using the comma separator. Hardware events and generic hardware +events cannot be mixed together. The latter must be used with the -e +option. The -e option and this one can be mixed and matched. Events +can be grouped using the {} notation. +endif::HAVE_LIBPFM[] -a:: --all-cpus::
tools/perf/Documentation/perf-top.txt +11 -0
@@ -310,6 +310,17 @@ Default is to monitor all CPUS. go straight to the histogram browser, just like 'perf top' with no events explicitely specified does. +ifdef::HAVE_LIBPFM[] +--pfm-events events:: +Select a PMU event using libpfm4 syntax (see http://perfmon2.sf.net) +including support for event filters. For example '--pfm-events +inst_retired:any_p:u:c=1:i'. More than one event can be passed to the +option using the comma separator. Hardware events and generic hardware +events cannot be mixed together. The latter must be used with the -e +option. The -e option and this one can be mixed and matched. Events +can be grouped using the {} notation. +endif::HAVE_LIBPFM[] + INTERACTIVE PROMPTING KEYS --------------------------
tools/perf/Makefile.config +12 -0
@@ -999,6 +999,18 @@ ifdef LIBCLANGLLVM endif endif +ifndef NO_LIBPFM4 + ifeq ($(feature-libpfm4), 1) + CFLAGS += -DHAVE_LIBPFM + EXTLIBS += -lpfm + ASCIIDOC_EXTRA = -aHAVE_LIBPFM=1 + $(call detected,CONFIG_LIBPFM4) + else + msg := $(warning libpfm4 not found, disables libpfm4 support. Please install libpfm4-dev); + NO_LIBPFM4 := 1 + endif +endif + # Among the variables below, these: # perfexecdir # perf_include_dir
tools/perf/Makefile.perf +4 -2
@@ -118,6 +118,8 @@ include ../scripts/utilities.mak # # Define LIBBPF_DYNAMIC to enable libbpf dynamic linking. # +# Define NO_LIBPFM4 to disable libpfm4 extension. +# # As per kernel Makefile, avoid funny character set dependencies unexport LC_ALL
@@ -188,7 +190,7 @@ AWK = awk # non-config cases config := 1 -NON_CONFIG_TARGETS := clean python-clean TAGS tags cscope help install-doc install-man install-html install-info install-pdf doc man html info pdf +NON_CONFIG_TARGETS := clean python-clean TAGS tags cscope help ifdef MAKECMDGOALS ifeq ($(filter-out $(NON_CONFIG_TARGETS),$(MAKECMDGOALS)),)
@@ -832,7 +834,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html # 'make doc' should call 'make -C Documentation all' $(DOC_TARGETS): - $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:doc=all) + $(Q)$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) $(@:doc=all) ASCIIDOC_EXTRA=$(ASCIIDOC_EXTRA) TAG_FOLDERS= . ../lib ../include TAG_FILES= ../../include/uapi/linux/perf_event.h
tools/perf/builtin-list.c +16 -0
@@ -18,6 +18,10 @@#include <subcmd/parse-options.h> #include <stdio.h> +#ifdef HAVE_LIBPFM +#include <perfmon/pfmlib.h> +#endif +static bool desc_flag = true;static bool details_flag;
@@ -56,6 +60,18 @@ int cmd_list(int argc, const char **argv)if (!raw_dump &&pager_in_use ())printf ("\nList of pre-defined events (to be used in -e):\n\n" ); +#ifdef HAVE_LIBPFM + { +int ret; + ret =pfm_initialize (); +if (ret !=PFM_SUCCESS ) { +fprintf (stderr, +"warning libpfm failed to initialize: %s\n" , +pfm_strerror (ret)); + } + } +#endif +if (argc ==0 ) {print_events (NULL , raw_dump, !desc_flag, long_desc_flag, details_flag, deprecated);
tools/perf/builtin-record.c +20 -0
@@ -64,6 +64,10 @@#include <linux/zalloc.h> #include <linux/bitmap.h> +#ifdef HAVE_LIBPFM +#include <perfmon/pfmlib.h> +#endif +struct switch_output {bool enabled;bool signal;
@@ -2405,6 +2409,11 @@ static struct option __record_options[] = {#endif OPT_CALLBACK(0, "max-size", &record.output_max_size, "size", "Limit the maximum size of the output file", parse_output_max_size), +#ifdef HAVE_LIBPFM +OPT_CALLBACK (0 ,"pfm-events" , &record.evlist,"event" , +"libpfm4 event selector. use 'perf list' to list available events" , + parse_libpfm_events_option), +#endifOPT_END () };
@@ -2445,6 +2454,17 @@ int cmd_record(int argc, const char **argv)if (rec->evlist ==NULL )return -ENOMEM ; +#ifdef HAVE_LIBPFM + { +int ret; + ret =pfm_initialize (); +if (ret !=PFM_SUCCESS ) { +ui__warning ("warning libpfm failed to initialize: %s\n" , +pfm_strerror (ret)); + } + } +#endif + err =perf_config (perf_record_config, rec);if (err)return err;
tools/perf/builtin-stat.c +21 -0
@@ -89,6 +89,10 @@#include <linux/ctype.h> #include <perf/evlist.h> +#ifdef HAVE_LIBPFM +#include <perfmon/pfmlib.h> +#endif +#define DEFAULT_SEPARATOR " "#define FREEZE_ON_SMI_PATH "devices/cpu/freeze_on_smi"
@@ -933,6 +937,11 @@ static struct option stat_options[] = { "Use with 'percore' event qualifier to show the event " "counts of one hardware thread by sum up total hardware " "threads of same physical core"), +#ifdef HAVE_LIBPFM +OPT_CALLBACK (0 ,"pfm-events" , &evsel_list,"event" , +"libpfm4 event selector. use 'perf list' to list available events" , + parse_libpfm_events_option), +#endifOPT_END () };
@@ -1871,6 +1880,18 @@ int cmd_stat(int argc, const char **argv)unsigned int interval, timeout;const char *const stat_subcommands[] = {"record" ,"report" }; +#ifdef HAVE_LIBPFM + { +int ret; + ret =pfm_initialize (); +if (ret !=PFM_SUCCESS ) { +fprintf (stderr, +"warning libpfm failed to initialize: %s\n" , +pfm_strerror (ret)); + } + } +#endif +setlocale (LC_ALL ,"" ); evsel_list =evlist__new ();
tools/perf/builtin-top.c +20 -0
@@ -84,6 +84,10 @@#include <linux/ctype.h> #include <perf/mmap.h> +#ifdef HAVE_LIBPFM +#include <perfmon/pfmlib.h> +#endif +static volatile int done;static volatile int resize;
@@ -1545,6 +1549,11 @@ int cmd_top(int argc, const char **argv) "number of thread to run event synthesize"),OPT_BOOLEAN (0 ,"namespaces" , &opts->record_namespaces,"Record namespaces events" ), +#ifdef HAVE_LIBPFM +OPT_CALLBACK (0 ,"pfm-events" , &top.evlist,"event" , +"libpfm4 event selector. use 'perf list' to list available events" , + parse_libpfm_events_option), +#endifOPTS_EVSWITCH (&top.evswitch), OPT_END() };
@@ -1558,6 +1567,17 @@ int cmd_top(int argc, const char **argv)if (status <0 )return status; +#ifdef HAVE_LIBPFM + { +int ret; + ret =pfm_initialize (); +if (ret !=PFM_SUCCESS ) { +ui__warning ("warning libpfm failed to initialize: %s\n" , +pfm_strerror (ret)); + } + } +#endif + top.annotation_opts.min_pcnt =5 ; top.annotation_opts.context =4 ;
tools/perf/util/evsel.c +1 -1
@@ -2433,7 +2433,7 @@ bool perf_evsel__fallback(struct evsel *evsel, int err,/* Is there already the separator in the name. */ if (strchr (name,'/' ) || -strchr (name,':' )) + (strchr (name,':' ) && !evsel->is_libpfm_event)) sep ="" ;if (asprintf (&new_name,"%s%su" , name, sep) <0 )
tools/perf/util/evsel.h +1 -0
@@ -76,6 +76,7 @@ struct evsel {bool ignore_missing_thread;bool forced_leader;bool use_uncore_alias; +bool is_libpfm_event;/* parse modifier helper */ int exclude_GH;int sample_read;
tools/perf/util/parse-events.c +246 -0
261 lines not on this page · raw message
tools/perf/util/parse-events.h +5 -0
@@ -37,6 +37,11 @@ int parse_events_terms(struct list_head *terms, const char *str);int parse_filter (const struct option *opt,const char *str,int unset);int exclude_perf (const struct option *opt,const char *arg,int unset); +#ifdef HAVE_LIBPFM +extern int parse_libpfm_events_option (const struct option *opt,const char *str, +int unset); +#endif +#define EVENTS_HELP_MAX (128*1024)enum perf_pmu_event_symbol_type {
tools/perf/util/pmu.c +11 -0
@@ -869,6 +869,17 @@ static struct perf_pmu *pmu_find(const char *name)return NULL ; } +struct perf_pmu *perf_pmu__find_by_type (unsigned int type) +{ +struct perf_pmu *pmu; + +list_for_each_entry (pmu, &pmus, list) +if (pmu->type == type) +return pmu; + +return NULL ; +} +struct perf_pmu *perf_pmu__scan (struct perf_pmu *pmu) {/*
tools/perf/util/pmu.h +1 -0
@@ -65,6 +65,7 @@ struct perf_pmu_alias { };struct perf_pmu *perf_pmu__find (const char *name); +struct perf_pmu *perf_pmu__find_by_type (unsigned int type);int perf_pmu__config (struct perf_pmu *pmu,struct perf_event_attr *attr,struct list_head *head_terms,struct parse_events_error *error);
Signature · 1 line
2.25.1.696.g5e7596f4ac-goog
On Mon, Mar 23, 2020 at 04:58:46PM -0700, Ian Rogers wrote:
SNIP
Quoted 17 lines
tools/perf/util/parse-events.c +5
-0@@ -37,6 +37,11 @@#include "util/evsel_config.h" #include "util/event.h" +#ifdef HAVE_LIBPFM +#include <perfmon/pfmlib_perf_event.h> +static void print_libpfm_events (bool name_only); +#endif +#define MAX_NAME_LEN 100#ifdef PARSER_DEBUG
tools/perf/util/parse-events.c void print_events(const char *event_glob, bool name_only, bool quiet_flag, · line 2804
Quoted 6 lines
tools/perf/util/parse-events.c +3
-0@@ -2794,6 +2799,10 @@ void print_events(const char *event_glob, bool name_only, bool quiet_flag,print_sdt_events (NULL ,NULL , name_only);metricgroup__print (true, true,NULL , name_only, details_flag); + +#ifdef HAVE_LIBPFM +print_libpfm_events (name_only);
we should make some effort to fit this into our current list shape, currently it looks like:
$ perf list ...
TopdownL1_SMT:
Backend_Bound_SMT
[This category represents fraction of slots where no uops are being delivered due to a lack of required resources for accepting new uops in the Backend>
Bad_Speculation_SMT
[This category represents fraction of slots wasted due to incorrect speculations. SMT version; use when SMT is enabled and measuring per logical CPU]
Frontend_Bound_SMT
[This category represents fraction of slots where the processor's Frontend undersupplies its Backend. SMT version; use when SMT is enabled and measurin>
Retiring_SMT
[This category represents fraction of slots utilized by useful work i.e. issued uops that eventually get retired. SMT version; use when SMT is enabled >
Name : UNHALTED_CORE_CYCLES
PMU : ix86arch
Desc : count core clock cycles whenever the clock signal on the specific core is running (not halted) Equiv : None
Code : 0x3c
Modif : PMU: [e] : edge level (may require counter-mask >= 1) (boolean)
Modif : PMU: [i] : invert (boolean)
Modif : PMU: [c] : counter-mask in range [0-255] (integer)
Modif : PMU: [t] : measure any thread (boolean)
Modif : PMU: [intx] : monitor only inside transactional memory region (boolean) Modif : PMU: [intxcp] : do not count occurrences inside aborted transactional memory region (boolean) Modif : perf_event: [u] : monitor at user level (boolean)
Modif : perf_event: [k] : monitor at kernel level (boolean)
Modif : perf_event: [period] : sampling period (integer)
Modif : perf_event: [freq] : sampling frequency (Hz) (integer)
Modif : perf_event: [excl] : exclusive access (boolean)
Modif : perf_event: [mg] : monitor guest execution (boolean)
Modif : perf_event: [mh] : monitor host execution (boolean)
Modif : perf_event: [cpu] : CPU to program (integer)
Modif : perf_event: [pinned] : pin event to counters (boolean)
it needs some header like 'libpfm events:' and then probably just name and doc for basic list and more verbose for -v
jirka
On Mon, Mar 23, 2020 at 04:58:46PM -0700, Ian Rogers wrote:
SNIP
Quoted 8 lines
tools/perf/util/pmu.c +0
-0@@ -869,6 +869,17 @@ static struct perf_pmu *pmu_find(const char *name)return NULL ; }
tools/perf/util/pmu.c static struct perf_pmu *pmu_find(const char *name) · line 881
Quoted 10 lines
tools/perf/util/pmu.c +10
-0+struct perf_pmu *perf_pmu__find_by_type (unsigned int type) +{ +struct perf_pmu *pmu; + +list_for_each_entry (pmu, &pmus, list) +if (pmu->type == type) +return pmu; + +return NULL ; +}
please move this to separate patch
thanks,
jirka
Quoted 19 lines
tools/perf/util/pmu.c +1
-0+struct perf_pmu *perf_pmu__scan (struct perf_pmu *pmu) {/* tools/perf/util/pmu.h +1
-0@@ -65,6 +65,7 @@ struct perf_pmu_alias { };struct perf_pmu *perf_pmu__find (const char *name); +struct perf_pmu *perf_pmu__find_by_type (unsigned int type);int perf_pmu__config (struct perf_pmu *pmu,struct perf_event_attr *attr,struct list_head *head_terms,struct parse_events_error *error);Signature · 1 line
2.25.1.696.g5e7596f4ac-goog
On Mon, Mar 23, 2020 at 04:58:46PM -0700, Ian Rogers wrote:
SNIP
Quoted 17 lines
tools/perf/util/parse-events.c +17
-0+/* no event */ +if (*q =='\0' ) +continue ; + +memset (&attr,0 ,sizeof (attr)); +event_attr_init (&attr); + + ret =parse_libpfm_event (q, &attr); +if (ret !=PFM_SUCCESS ) { +fprintf (stderr,"failed to parse event %s : %s\n" , str,pfm_strerror (ret)); + goto error; + } + + evsel =perf_evsel__new_idx (&attr, evlist->core.nr_entries); +if (evsel ==NULL ) + goto error; +
tools/perf/util/parse-events.c char *parse_events_formats_error_string(char *additional_terms) · line 3122
Quoted 10 lines
tools/perf/util/parse-events.c +10
-0+ evsel->name =strdup (q); +if (!evsel->name) { +evsel__delete (evsel); + goto error; + } + evsel->is_libpfm_event = true; + + pmu =perf_pmu__find_by_type ((unsigned )attr.type); +if (pmu) + evsel->core.own_cpus =perf_cpu_map__get (pmu->cpus);
I think you need to do more setup in here, like in __add_event function would be great to factor those bits from __add_event function and call it from here, so it's all in one place
jirka
On Mon, Mar 23, 2020 at 04:58:46PM -0700, Ian Rogers wrote:
SNIP
Quoted 7 lines
INTERACTIVE PROMPTING KEYS
--------------------------tools/perf/Makefile.config +0
-0
tools/perf/Makefile.config ifdef LIBCLANGLLVM · line 1007
Quoted 9 lines
tools/perf/Makefile.config +6
-0@@ -999,6 +999,18 @@ ifdef LIBCLANGLLVM endif endif +ifndef NO_LIBPFM4 + ifeq ($(feature-libpfm4), 1) + CFLAGS += -DHAVE_LIBPFM + EXTLIBS += -lpfm + ASCIIDOC_EXTRA = -aHAVE_LIBPFM=1 + $(call detected,CONFIG_LIBPFM4)
you don't use CONFIG_LIBPFM4
but I was wondering if we should put it all in separate object like util/pfm.c to get rid of some of those ifdefs
jirka
On Mon, Mar 23, 2020 at 04:58:46PM -0700, Ian Rogers wrote:
SNIP
Quoted 16 lines
tools/build/feature/Makefile +3
-1@@ -67,7 +67,9 @@ FILES= \ test-llvm.bin \ test-llvm-version.bin \ test-libaio.bin \ - test-libzstd.bin + test-libzstd.bin \ + test-libpfm4.bin + FILES := $(addprefix $(OUTPUT),$(FILES))
tools/build/feature/Makefile $(OUTPUT)test-libaio.bin: · line 327
Quoted 5 lines
tools/build/feature/Makefile +2
-0@@ -321,6 +323,9 @@ $(OUTPUT)test-libaio.bin: $(OUTPUT)test-libzstd.bin: $(BUILD) -lzstd +$(OUTPUT)test-libpfm4.bin: + $(BUILD) -lpfm
also please move the libpfm4 detection into separated patch
thanks,
jirka
On Mon, Mar 23, 2020 at 04:58:46PM -0700, Ian Rogers wrote:
SNIP
Quoted 12 lines
tools/perf/util/parse-events.c +12
-0+ +int parse_libpfm_events_option (const struct option *opt,const char *str, +int unset__maybe_unused ) +{ +struct evlist *evlist = *(struct evlist **)opt->value; +struct perf_event_attr attr; +struct perf_pmu *pmu; +struct evsel *evsel, *grp_leader =NULL ; +char *p, *q, *p_orig; +const char *sep; +int grp_evt =-1 ; +int ret;
tools/perf/util/parse-events.c char *parse_events_formats_error_string(char *additional_terms) · line 3086
Quoted 10 lines
tools/perf/util/parse-events.c +10
-0+ + p_orig = p =strdup (str); +if (!p) +return -1 ; +/* +* force loading of the PMU list +*/ +perf_pmu__scan (NULL ); + +for (q = p;strsep (&p,",{}" ); q = p) {
it seems like this code could be really easily testtable, could you please write simple test for this?
thanks,
jirka
Quoted 23 lines · Ian Rogers
This patch links perf with the libpfm4 library if it is available and
NO_LIBPFM4isn't passed to the build. The libpfm4 library contains hardware event tables for all processors supported byperf_events. It is a helper library that helps convert from a symbolic event name to the event encoding required by the underlying kernel interface. This library is open-source and available from: http://perfmon2.sf.net.With this patch, it is possible to specify full hardware events by name. Hardware filters are also supported. Events must be specified via the --pfm-events and not -e option. Both options are active at the same time and it is possible to mix and match:
$ perf stat --pfm-events inst_retired:any_p:c=1:i -e cycles ....v5 is a rebase.
v4 is a rebase ongit://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
branch perf/core and re-adds thetools/build/feature/test-libpfm4.cmissed in v3.
v3 is against acme/perf/core and removes a diagnostic warning.
v2 of this patch makes the --pfm-events man page documentation conditional on libpfm4 behing configured. It tidies some of the documentation and adds the feature test missed in the v1 patch.
Quoted 2 lines
Author: Stephane Eranian <[email protected]>
Signed-off-by Ian Rogers <[email protected]>
I still have some conflicts, but I merged it by hand
patching file tools/build/Makefile.feature
patching file tools/build/feature/Makefile
patching file tools/build/feature/test-libpfm4.c
patching file tools/perf/Documentation/Makefile
patching file tools/perf/Documentation/perf-record.txt
patching file tools/perf/Documentation/perf-stat.txt
patching file tools/perf/Documentation/perf-top.txt
patching file tools/perf/Makefile.config
patching file tools/perf/Makefile.perf
Hunk #3 FAILED at 834.
1 out of 3 hunks FAILED -- saving rejects to file tools/perf/Makefile.perf.rej patching file tools/perf/builtin-list.c
patching file tools/perf/builtin-record.c
patching file tools/perf/builtin-stat.c
patching file tools/perf/builtin-top.c
Hunk #2 succeeded at 1549 (offset 2 lines).
Hunk #3 succeeded at 1567 (offset 2 lines).
patching file tools/perf/util/evsel.c
patching file tools/perf/util/evsel.h
patching file tools/perf/util/parse-events.c
patching file tools/perf/util/parse-events.h
patching file tools/perf/util/pmu.c
Hunk #1 succeeded at 869 (offset 5 lines).
patching file tools/perf/util/pmu.h
Hunk #1 succeeded at 65 (offset 1 line).
jirka
Ian Rogers
reviewerQuoted 57 lines · Jiri Olsa
Quoted 23 lines · Ian Rogers
This patch links perf with the libpfm4 library if it is available and
NO_LIBPFM4isn't passed to the build. The libpfm4 library contains hardware event tables for all processors supported byperf_events. It is a helper library that helps convert from a symbolic event name to the event encoding required by the underlying kernel interface. This library is open-source and available from: http://perfmon2.sf.net.With this patch, it is possible to specify full hardware events by name. Hardware filters are also supported. Events must be specified via the --pfm-events and not -e option. Both options are active at the same time and it is possible to mix and match:
$ perf stat --pfm-events inst_retired:any_p:c=1:i -e cycles ....v5 is a rebase.
v4 is a rebase ongit://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
branch perf/core and re-adds thetools/build/feature/test-libpfm4.cmissed in v3.
v3 is against acme/perf/core and removes a diagnostic warning.
v2 of this patch makes the --pfm-events man page documentation conditional on libpfm4 behing configured. It tidies some of the documentation and adds the feature test missed in the v1 patch.Quoted 2 lines
Author: Stephane Eranian <[email protected]>
Signed-off-by Ian Rogers <[email protected]>I still have some conflicts, but I merged it by hand
patching file
tools/build/Makefile.feature
patching filetools/build/feature/Makefile
patching filetools/build/feature/test-libpfm4.c
patching filetools/perf/Documentation/Makefile
patching filetools/perf/Documentation/perf-record.txt
patching filetools/perf/Documentation/perf-stat.txt
patching filetools/perf/Documentation/perf-top.txt
patching filetools/perf/Makefile.config
patching filetools/perf/Makefile.perf
Hunk #3 FAILED at 834.
1 out of 3 hunks FAILED -- saving rejects to filetools/perf/Makefile.perf.rejpatching filetools/perf/builtin-list.c
patching filetools/perf/builtin-record.c
patching filetools/perf/builtin-stat.c
patching filetools/perf/builtin-top.c
Hunk #2 succeeded at 1549 (offset 2 lines).
Hunk #3 succeeded at 1567 (offset 2 lines).
patching filetools/perf/util/evsel.c
patching filetools/perf/util/evsel.h
patching filetools/perf/util/parse-events.c
patching filetools/perf/util/parse-events.h
patching filetools/perf/util/pmu.c
Hunk #1 succeeded at 869 (offset 5 lines).
patching filetools/perf/util/pmu.h
Hunk #1 succeeded at 65 (offset 1 line).
Quoted 1 line
jirka
Thanks! I did a clone of acme's linux.git branch perf/core and applied the change with git am, then built and tested. Perhaps you are using a different tree or branch? Anyway, hopefully this is resolved now :-)
Thanks again,
Ian
Ian Rogers
reviewerQuoted 57 lines · Jiri Olsa
Quoted 23 lines · Ian Rogers
This patch links perf with the libpfm4 library if it is available and
NO_LIBPFM4isn't passed to the build. The libpfm4 library contains hardware event tables for all processors supported byperf_events. It is a helper library that helps convert from a symbolic event name to the event encoding required by the underlying kernel interface. This library is open-source and available from: http://perfmon2.sf.net.With this patch, it is possible to specify full hardware events by name. Hardware filters are also supported. Events must be specified via the --pfm-events and not -e option. Both options are active at the same time and it is possible to mix and match:
$ perf stat --pfm-events inst_retired:any_p:c=1:i -e cycles ....v5 is a rebase.
v4 is a rebase ongit://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
branch perf/core and re-adds thetools/build/feature/test-libpfm4.cmissed in v3.
v3 is against acme/perf/core and removes a diagnostic warning.
v2 of this patch makes the --pfm-events man page documentation conditional on libpfm4 behing configured. It tidies some of the documentation and adds the feature test missed in the v1 patch.Quoted 2 lines
Author: Stephane Eranian <[email protected]>
Signed-off-by Ian Rogers <[email protected]>I still have some conflicts, but I merged it by hand
patching file
tools/build/Makefile.feature
patching filetools/build/feature/Makefile
patching filetools/build/feature/test-libpfm4.c
patching filetools/perf/Documentation/Makefile
patching filetools/perf/Documentation/perf-record.txt
patching filetools/perf/Documentation/perf-stat.txt
patching filetools/perf/Documentation/perf-top.txt
patching filetools/perf/Makefile.config
patching filetools/perf/Makefile.perf
Hunk #3 FAILED at 834.
1 out of 3 hunks FAILED -- saving rejects to filetools/perf/Makefile.perf.rejpatching filetools/perf/builtin-list.c
patching filetools/perf/builtin-record.c
patching filetools/perf/builtin-stat.c
patching filetools/perf/builtin-top.c
Hunk #2 succeeded at 1549 (offset 2 lines).
Hunk #3 succeeded at 1567 (offset 2 lines).
patching filetools/perf/util/evsel.c
patching filetools/perf/util/evsel.h
patching filetools/perf/util/parse-events.c
patching filetools/perf/util/parse-events.h
patching filetools/perf/util/pmu.c
Hunk #1 succeeded at 869 (offset 5 lines).
patching filetools/perf/util/pmu.h
Hunk #1 succeeded at 65 (offset 1 line).
Quoted 1 line
jirka
Thanks for looking at this! I sent a new version (v7):
https://lore.kernel.org/lkml/[email protected]/T/#u
that adds Stephane's improvements for handling fallback when perf_event_open fails. Please let us know if there are issues we can address with the patch set.
Thanks,
Ian