perf tools: add support for libpfm4
Subsystems (4)
Ian Rogers
reviewerv8 cover 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 ....
v8 addresses review comments from [email protected].
Breaks the patch into 4, adds a test and moves the libpfm code into its own file. perf list encoding tries to be closer to existing:
...
skx pfm-events
UNHALTED_CORE_CYCLES
[Count core clock cycles whenever the clock signal on the specific ...
UNHALTED_REFERENCE_CYCLES
[Unhalted reference cycles]
INSTRUCTION_RETIRED
[Number of instructions at retirement]
INSTRUCTIONS_RETIRED
[This is an alias for INSTRUCTION_RETIRED]
BRANCH_INSTRUCTIONS_RETIRED
[Count branch instructions at retirement. Specifically, this event ...
MISPREDICTED_BRANCH_RETIRED
[Count mispredicted branch instructions at retirement. ...
BACLEARS
[Branch re-steered]
BACLEARS:ANY
[Number of front-end re-steers due to BPU misprediction]
BR_INST_RETIRED
[Branch instructions retired (Precise Event)]
BR_INST_RETIRED:CONDITIONAL
[Counts all taken and not taken macro conditional branch ...
...
and supports --long-desc/-v:
...
BACLEARS
[Branch re-steered]
Code : 0xe6
BACLEARS:ANY
[Number of front-end re-steers due to BPU misprediction] Umask : 0x01 : PMU: [default]
Modif : PMU: [e] : edge level (may require counter-mask >= 1) ... 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 ... Modif : PMU: [intxcp] : do not count occurrences inside aborted ... 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)
BR_INST_RETIRED
[Branch instructions retired (Precise Event)]
Code : 0xc4
BR_INST_RETIRED:CONDITIONAL
[Counts all taken and not taken macro conditional branch ... Umask : 0x01 : PMU: [precise]
v7 rebases and adds fallback code for libpfm4 events.
The fallback code is to force user only priv level in case the perf_event_open() syscall failed for permissions reason. the fallback forces a user privilege level restriction on the event string, so depending on the syntax either u or :u is needed.
But libpfm4 can use a : or . as the separator, so simply searching for ':' vs. '/' is not good enough to determine the syntax needed. Therefore, this patch introduces a new evsel boolean field to mark events coming from libpfm4. The field is then used to adjust the fallback string.
v6 was a rebase.
v5 was a rebase.
v4 was 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.
Ian Rogers (1):
perf doc: allow ASCIIDOC_EXTRA to be an argument
Stephane Eranian (3):
tools feature: add support for detecting libpfm4 perf pmu: add perf_pmu__find_by_type helper perf tools: add support for libpfm4
tools/build/Makefile.feature | 6 +- tools/build/feature/Makefile | 6 +- tools/build/feature/test-libpfm4.c | 9 + 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 | 14 +- tools/perf/builtin-record.c | 13 ++ tools/perf/builtin-stat.c | 13 ++ tools/perf/builtin-top.c | 13 ++ tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 9 + tools/perf/tests/pfm.c | 206 +++++++++++++++++ tools/perf/tests/tests.h | 3 + tools/perf/util/Build | 2 + tools/perf/util/evsel.c | 6 + tools/perf/util/evsel.h | 3 + tools/perf/util/parse-events.c | 37 ++- tools/perf/util/parse-events.h | 5 + tools/perf/util/pfm.c | 272 +++++++++++++++++++++++ tools/perf/util/pfm.h | 19 ++ tools/perf/util/pmu.c | 11 + tools/perf/util/pmu.h | 1 + 26 files changed, 687 insertions(+), 16 deletions(-) create mode 100644 tools/build/feature/test-libpfm4.c create mode 100644 tools/perf/tests/pfm.c create mode 100644 tools/perf/util/pfm.c create mode 100644 tools/perf/util/pfm.h
Signature · 1 line
2.26.0.110.g2183baf09c-goog
Ian Rogers
reviewerPATCH v8 1/4 perf doc: allow ASCIIDOC_EXTRA to be an argument
This will allow parent makefiles to pass values to asciidoc.
--- tools/perf/Documentation/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
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
Signature · 1 line
2.26.0.110.g2183baf09c-goog
Ian Rogers
reviewerPATCH v8 2/4 tools feature: add support for detecting libpfm4
In reply to Ian RogersFrom: Stephane Eranian <[email protected]>
libpfm4 provides an alternate command line encoding of perf events.
--- tools/build/Makefile.feature | 6 ++++-- tools/build/feature/Makefile | 6 +++++- tools/build/feature/test-libpfm4.c | 9 +++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 tools/build/feature/test-libpfm4.c
tools/build/Makefile.feature +4 -2
@@ -73,7 +73,8 @@ FEATURE_TESTS_BASIC := \ libaio \ libzstd \ disassembler-four-args \ - file-handle + file-handle \ + libpfm4 # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list # of all feature tests
@@ -128,7 +129,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 +5 -1
@@ -68,7 +68,8 @@ FILES= \ test-llvm-version.bin \ test-libaio.bin \ test-libzstd.bin \ - test-file-handle.bin + test-file-handle.bin \ + test-libpfm4.bin FILES := $(addprefix $(OUTPUT),$(FILES))
@@ -325,6 +326,9 @@ $(OUTPUT)test-libzstd.bin: $(OUTPUT)test-file-handle.bin: $(BUILD) +$(OUTPUT)test-libpfm4.bin: + $(BUILD) -lpfm + ############################### clean:
tools/build/feature/test-libpfm4.c new file +9 -0
@@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <sys/types.h> +#include <perfmon/pfmlib.h> + +int main (void ) +{ +pfm_initialize (); +return 0 ; +}
Signature · 1 line
2.26.0.110.g2183baf09c-goog
Re: [PATCH v8 2/4] tools feature: add support for detecting libpfm4
Quoted 18 lines · Ian Rogers
From: Stephane Eranian <[email protected]>
libpfm4 provides an alternate command line encoding of perf events.
Signed-off-by Stephane Eranian <[email protected]>Reviewed-by Ian Rogers <[email protected]>--- tools/build/Makefile.feature | 6 ++++-- tools/build/feature/Makefile | 6 +++++- tools/build/feature/test-libpfm4.c | 9 +++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 tools/build/feature/test-libpfm4.ctools/build/Makefile.feature +0
-0
tools/build/Makefile.feature FEATURE_TESTS_BASIC := \ · line 77
Quoted 6 lines
tools/build/Makefile.feature +2
-1@@ -73,7 +73,8 @@ FEATURE_TESTS_BASIC := \ libaio \ libzstd \ disassembler-four-args \ - file-handle + file-handle \ + libpfm4
let's treat this the same way as libbpf and do not include it in the basic check, which will fail for omst users
jirka
Ian Rogers
reviewerPATCH v8 3/4 perf pmu: add perf_pmu__find_by_type helper
In reply to Ian RogersFrom: Stephane Eranian <[email protected]>
This is used by libpfm4 during event parsing to locate the pmu for an event.
--- tools/perf/util/pmu.c | 11 +++++++++++ tools/perf/util/pmu.h | 1 + 2 files changed, 12 insertions(+)
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.26.0.110.g2183baf09c-goog
Ian Rogers
reviewerPATCH v8 4/4 perf tools: add support for libpfm4
In reply to Ian RogersFrom: Stephane Eranian <[email protected]>
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 ....
--- 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 | 14 +- tools/perf/builtin-record.c | 13 ++ tools/perf/builtin-stat.c | 13 ++ tools/perf/builtin-top.c | 13 ++ tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 9 + tools/perf/tests/pfm.c | 206 +++++++++++++++++ tools/perf/tests/tests.h | 3 + tools/perf/util/Build | 2 + tools/perf/util/evsel.c | 6 + tools/perf/util/evsel.h | 3 + tools/perf/util/parse-events.c | 37 ++- tools/perf/util/parse-events.h | 5 + tools/perf/util/pfm.c | 272 +++++++++++++++++++++++ tools/perf/util/pfm.h | 19 ++ 20 files changed, 655 insertions(+), 11 deletions(-) create mode 100644 tools/perf/tests/pfm.c create mode 100644 tools/perf/util/pfm.c create mode 100644 tools/perf/util/pfm.h
tools/perf/Documentation/perf-record.txt +11 -0
@@ -596,6 +596,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
@@ -319,6 +319,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
@@ -1012,6 +1012,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 +12 -2
@@ -18,6 +18,10 @@#include <subcmd/parse-options.h> #include <stdio.h> +#ifdef HAVE_LIBPFM +#include "util/pfm.h" +#endif +static bool desc_flag = true;static bool details_flag;
@@ -45,7 +49,7 @@ int cmd_list(int argc, const char **argv)"perf list [<options>] [hw|sw|cache|tracepoint|pmu|sdt|event_glob]" ,NULL }; - +const char *header ="\nList of pre-defined events (to be used in -e):\n\n" ;set_option_flag (list_options,0 ,"raw-dump" ,PARSE_OPT_HIDDEN ); argc = parse_options(argc, argv, list_options, list_usage,
@@ -53,8 +57,14 @@ int cmd_list(int argc, const char **argv)setup_pager (); +#ifdef HAVE_LIBPFM +libpfm_initialize (); + + header ="\nList of pre-defined events (to be used in -e or --pfm-events):\n\n" ; +#endif +if (!raw_dump &&pager_in_use ()) -printf ("\nList of pre-defined events (to be used in -e):\n\n" ); +puts (header);if (argc ==0 ) { print_events(NULL, raw_dump, !desc_flag, long_desc_flag,
tools/perf/builtin-record.c +13 -0
@@ -64,6 +64,10 @@#include <linux/zalloc.h> #include <linux/bitmap.h> +#ifdef HAVE_LIBPFM +#include "util/pfm.h" +#endif +struct switch_output {bool enabled;bool signal;
@@ -2421,6 +2425,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 () };
@@ -2461,6 +2470,10 @@ int cmd_record(int argc, const char **argv)if (rec->evlist ==NULL )return -ENOMEM ; +#ifdef HAVE_LIBPFM +libpfm_initialize (); +#endif + err =perf_config (perf_record_config, rec);if (err)return err;
tools/perf/builtin-stat.c +13 -0
@@ -89,6 +89,10 @@#include <linux/ctype.h> #include <perf/evlist.h> +#ifdef HAVE_LIBPFM +#include "util/pfm.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,10 @@ int cmd_stat(int argc, const char **argv)unsigned int interval, timeout;const char *const stat_subcommands[] = {"record" ,"report" }; +#ifdef HAVE_LIBPFM +libpfm_initialize (); +#endif +setlocale (LC_ALL ,"" ); evsel_list =evlist__new ();
tools/perf/builtin-top.c +13 -0
@@ -84,6 +84,10 @@#include <linux/ctype.h> #include <perf/mmap.h> +#ifdef HAVE_LIBPFM +#include "util/pfm.h" +#endif +static volatile int done;static volatile int resize;
@@ -1571,6 +1575,11 @@ int cmd_top(int argc, const char **argv) "Sort the output by the event at the index n in group. " "If n is invalid, sort by the first event. " "WARNING: should be used on grouped 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 () };
@@ -1584,6 +1593,10 @@ int cmd_top(int argc, const char **argv)if (status <0 )return status; +#ifdef HAVE_LIBPFM +libpfm_initialize (); +#endif + top.annotation_opts.min_pcnt =5 ; top.annotation_opts.context =4 ;
tools/perf/tests/Build +1 -0
@@ -56,6 +56,7 @@ perf-y += mem2node.o perf-y += maps.o perf-y += time-utils-test.o perf-y += genelf.o +perf-y += pfm.o $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build $(call rule_mkdir)
tools/perf/tests/builtin-test.c +9 -0
@@ -313,6 +313,15 @@ static struct test generic_tests[] = { .desc = "maps__merge_in", .func = test__maps__merge_in, }, + { + .desc = "Test libpfm4 support", + .func = test__pfm, + .subtest = { + .skip_if_fail = true, + .get_nr = test__pfm_subtest_get_nr, + .get_desc = test__pfm_subtest_get_desc, + } + }, { .func = NULL, },
tools/perf/tests/pfm.c new file +206 -0
206 lines not on this page · raw message
tools/perf/tests/tests.h +3 -0
@@ -112,6 +112,9 @@ int test__mem2node(struct test *t, int subtest);int test__maps__merge_in (struct test *t,int subtest);int test__time_utils (struct test *t,int subtest);int test__jit_write_elf (struct test *test,int subtest); +int test__pfm (struct test *test,int subtest); +const char *test__pfm_subtest_get_desc (int subtest); +int test__pfm_subtest_get_nr (void );bool test__bp_signal_is_supported (void );bool test__bp_account_is_supported (void );
tools/perf/util/Build +2 -0
@@ -177,6 +177,8 @@ perf-$(CONFIG_LIBBPF) += bpf-event.o perf-$(CONFIG_CXX) += c++/ +perf-$(CONFIG_LIBPFM4) += pfm.o + CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_llvm-utils.o += -DPERF_INCLUDE_DIR="BUILD_STR($(perf_include_dir_SQ))"
tools/perf/util/evsel.c +6 -0
@@ -2447,9 +2447,15 @@ bool perf_evsel__fallback(struct evsel *evsel, int err,const char *sep =":" ;/* Is there already the separator in the name. */ +#ifndef HAVE_LIBPFM if (strchr (name,'/' ) ||strchr (name,':' )) sep ="" ; +#else +if (strchr (name,'/' ) || + (strchr (name,':' ) && !evsel->is_libpfm_event)) + sep ="" ; +#endif if (asprintf (&new_name,"%s%su" , name, sep) <0 )return false;
tools/perf/util/evsel.h +3 -0
@@ -76,6 +76,9 @@ struct evsel {bool ignore_missing_thread;bool forced_leader;bool use_uncore_alias; +#ifdef HAVE_LIBPFM +bool is_libpfm_event; +#endif /* parse modifier helper */ int exclude_GH;int sample_read;
tools/perf/util/parse-events.c +30 -7
@@ -37,6 +37,10 @@#include "util/evsel_config.h" #include "util/event.h" +#ifdef HAVE_LIBPFM +#include "util/pfm.h" +#endif +#define MAX_NAME_LEN 100#ifdef PARSER_DEBUG
@@ -344,6 +348,7 @@ static char *get_config_name(struct list_head *head_terms)static struct evsel *__add_event (struct list_head *list,int *idx,struct perf_event_attr *attr, +bool init_attr,char *name,struct perf_pmu *pmu,struct list_head *config_terms,bool auto_merge_stats,const char *cpu_list)
@@ -352,7 +357,8 @@ __add_event(struct list_head *list, int *idx,struct perf_cpu_map *cpus = pmu ? pmu->cpus : cpu_list ?perf_cpu_map__new (cpu_list) :NULL ; -event_attr_init (attr); +if (init_attr) +event_attr_init (attr); evsel =perf_evsel__new_idx (attr, *idx);if (!evsel)
@@ -370,15 +376,27 @@ __add_event(struct list_head *list, int *idx,if (config_terms)list_splice (config_terms, &evsel->config_terms); -list_add_tail (&evsel->core.node, list); +if (list) +list_add_tail (&evsel->core.node, list); +return evsel; } +#ifdef HAVE_LIBPFM +struct evsel *parse_events__pfm_add_event (int idx,struct perf_event_attr *attr, +char *name,struct perf_pmu *pmu) +{ +return __add_event (NULL , &idx, attr, false, name, pmu,NULL , false, +NULL ); +} +#endif +static int add_event (struct list_head *list,int *idx,struct perf_event_attr *attr,char *name,struct list_head *config_terms) { -return __add_event (list, idx, attr, name,NULL , config_terms, false,NULL ) ?0 : -ENOMEM ; +return __add_event (list, idx, attr, true, name,NULL , config_terms, + false,NULL ) ?0 : -ENOMEM ; } static int add_event_tool(struct list_head *list, int *idx,
@@ -390,7 +408,8 @@ static int add_event_tool(struct list_head *list, int *idx, .config = PERF_COUNT_SW_DUMMY, }; - evsel =__add_event (list, idx, &attr,NULL ,NULL ,NULL , false,"0" ); + evsel =__add_event (list, idx, &attr, true,NULL ,NULL ,NULL , false, +"0" );if (!evsel)return -ENOMEM ; evsel->tool_event = tool_event;
@@ -1446,8 +1465,8 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (!head_config) { attr.type = pmu->type; - evsel =__add_event (list, &parse_state->idx, &attr,NULL , pmu,NULL , - auto_merge_stats,NULL ); + evsel =__add_event (list, &parse_state->idx, &attr, true,NULL , + pmu,NULL , auto_merge_stats,NULL );if (evsel) { evsel->pmu_name = name ?strdup (name) :NULL ; evsel->use_uncore_alias = use_uncore_alias;
@@ -1487,7 +1506,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,return -EINVAL ; } - evsel =__add_event (list, &parse_state->idx, &attr, + evsel =__add_event (list, &parse_state->idx, &attr, true,get_config_name (head_config), pmu, &config_terms, auto_merge_stats,NULL );if (evsel) {
@@ -2794,6 +2813,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, long_desc); +#endif }int parse_events__is_hardcoded_term (struct parse_events_term *term)
tools/perf/util/parse-events.h +5 -0
@@ -185,6 +185,11 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,struct list_head *head_config, bool auto_merge_stats, bool use_alias); +#ifdef HAVE_LIBPFM +struct perf_pmu ; +struct evsel *parse_events__pfm_add_event (int idx,struct perf_event_attr *attr, +char *name,struct perf_pmu *pmu); +#endif int parse_events_multi_pmu_add(struct parse_events_state *parse_state, char *str,
tools/perf/util/pfm.c new file +272 -0
272 lines not on this page · raw message
tools/perf/util/pfm.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Support for libpfm4 event encoding. +* +* Copyright 2020 Google LLC. +*/ +#ifndef __PERF_PFM_H +#define __PERF_PFM_H + +#include <subcmd/parse-options.h> + +void libpfm_initialize (void ); + +int parse_libpfm_events_option (const struct option *opt,const char *str, +int unset); + +void print_libpfm_events (bool name_only,bool long_desc); + +#endif /* __PERF_PFM_H */
Signature · 1 line
2.26.0.110.g2183baf09c-goog
On Sat, Apr 11, 2020 at 12:46:31AM -0700, Ian Rogers wrote:
SNIP
tools/perf/builtin-list.c line 23
Quoted 13 lines
TAG_FOLDERS= . ../lib ../include
TAG_FILES=../../include/uapi/linux/perf_event.htools/perf/builtin-list.c +3
-0@@ -18,6 +18,10 @@#include <subcmd/parse-options.h> #include <stdio.h> +#ifdef HAVE_LIBPFM +#include "util/pfm.h" +#endif
so we have the HAVE_LIBPFM you could do the:
#ifdef HAVE_LIBPFM
#else
#endif
in util/pfm.h and add stubs for libpfm_initialize and others in case HAVE_LIBPFM is not defined.. that clear out all the #ifdefs in the change
SNIP
Quoted 6 lines
tools/perf/tests/builtin-test.c +0
-0@@ -313,6 +313,15 @@ static struct test generic_tests[] = { .desc = "maps__merge_in",
tools/perf/tests/builtin-test.c static struct test generic_tests[] = { · line 323
Quoted 10 lines
tools/perf/tests/builtin-test.c +8
-0.func = test__maps__merge_in, }, + { + .desc = "Test libpfm4 support", + .func = test__pfm, + .subtest = { + .skip_if_fail = true, + .get_nr = test__pfm_subtest_get_nr, + .get_desc = test__pfm_subtest_get_desc, + }
awesome :)
SNIP
Quoted 7 lines
tools/perf/util/evsel.c +0
-0@@ -2447,9 +2447,15 @@ bool perf_evsel__fallback(struct evsel *evsel, int err,const char *sep =":" ;
tools/perf/util/evsel.c bool perf_evsel__fallback(struct evsel *evsel, int err, · line 2458
Quoted 10 lines
tools/perf/util/evsel.c +6
-0/* Is there already the separator in the name. */ +#ifndef HAVE_LIBPFM if (strchr (name,'/' ) ||strchr (name,':' )) sep ="" ; +#else +if (strchr (name,'/' ) || + (strchr (name,':' ) && !evsel->is_libpfm_event)) + sep ="" ; +#endif
^^^^^^^^
Quoted 8 lines
tools/perf/util/evsel.c +0
-0if (asprintf (&new_name,"%s%su" , name, sep) <0 )return false;tools/perf/util/evsel.h +0
-0
tools/perf/util/evsel.h struct evsel { · line 81
Quoted 6 lines
tools/perf/util/evsel.h +3
-0@@ -76,6 +76,9 @@ struct evsel {bool ignore_missing_thread;bool forced_leader;bool use_uncore_alias; +#ifdef HAVE_LIBPFM +bool is_libpfm_event; +#endif
perhaps we could had this one in unconditionaly, because I think we have some members like that for aux tracing.. and that would remove the #ifdef above
SNIP
tools/perf/util/evsel.h struct evsel {
Quoted 9 lines
tools/perf/util/evsel.h +8
-0+#ifdef HAVE_LIBPFM +struct evsel *parse_events__pfm_add_event (int idx,struct perf_event_attr *attr, +char *name,struct perf_pmu *pmu) +{ +return __add_event (NULL , &idx, attr, false, name, pmu,NULL , false, +NULL ); +} +#endif
could you instead add parse_events__add_event and call it from pfm code?
SNIP
Quoted 19 lines
tools/perf/util/evsel.h +19
-0+ pmu =perf_pmu__find_by_type ((unsigned int )attr.type); + evsel =parse_events__pfm_add_event (evlist->core.nr_entries, + &attr, q, pmu); +if (evsel ==NULL ) + goto error; + + evsel->is_libpfm_event = true; + +evlist__add (evlist, evsel); + +if (grp_evt ==0 ) + grp_leader = evsel; + +if (grp_evt >-1 ) { + evsel->leader = grp_leader; + grp_leader->core.nr_members++; + grp_evt++; + } +
tools/perf/util/evsel.h
Quoted 10 lines
tools/perf/util/evsel.h +10
-0+if (*sep =='}' ) { +if (grp_evt <0 ) { +ui__error ("cannot close a non-existing event group\n" ); + goto error; + } + evlist->nr_groups++; + grp_leader =NULL ; + grp_evt =-1 ; + } + evsel->is_libpfm_event = true;
seems to be set twice in here
tools/perf/util/evsel.h
Quoted 12 lines
tools/perf/util/evsel.h +12
-0+ } +return 0 ; +error: +free (p_orig); +return -1 ; +} + +static const char *srcs[PFM_ATTR_CTRL_MAX ] = { + [PFM_ATTR_CTRL_UNKNOWN ] ="???" , + [PFM_ATTR_CTRL_PMU ] ="PMU" , + [PFM_ATTR_CTRL_PERF_EVENT ] ="perf_event" , +};
SNIP
thanks,
jirka
Ian Rogers
reviewerQuoted 98 lines · Jiri Olsa
On Sat, Apr 11, 2020 at 12:46:31AM -0700, Ian Rogers wrote:
SNIP
tools/perf/builtin-list.c line 23
Quoted 13 lines
TAG_FOLDERS= . ../lib ../include
TAG_FILES=../../include/uapi/linux/perf_event.htools/perf/builtin-list.c +3
-0@@ -18,6 +18,10 @@#include <subcmd/parse-options.h> #include <stdio.h> +#ifdef HAVE_LIBPFM +#include "util/pfm.h" +#endif so we have the
HAVE_LIBPFMyou could do the:#ifdef
HAVE_LIBPFM
#else
#endifin
util/pfm.hand add stubs forlibpfm_initializeand others in caseHAVE_LIBPFMis not defined.. that clear out all the #ifdefs in the changeSNIP
Quoted 6 lines
tools/perf/tests/builtin-test.c +0
-0@@ -313,6 +313,15 @@ static struct test generic_tests[] = { .desc = "maps__merge_in",tools/perf/tests/builtin-test.c static struct test generic_tests[] = { · line 323
Quoted 10 lines
tools/perf/tests/builtin-test.c +8
-0.func = test__maps__merge_in, }, + { + .desc = "Test libpfm4 support", + .func = test__pfm, + .subtest = { + .skip_if_fail = true, + .get_nr = test__pfm_subtest_get_nr, + .get_desc = test__pfm_subtest_get_desc, + }awesome :)
SNIP
Quoted 7 lines
tools/perf/util/evsel.c +0
-0@@ -2447,9 +2447,15 @@ bool perf_evsel__fallback(struct evsel *evsel, int err,const char *sep =":" ;tools/perf/util/evsel.c bool perf_evsel__fallback(struct evsel *evsel, int err, · line 2458
Quoted 10 lines
tools/perf/util/evsel.c +6
-0/* Is there already the separator in the name. */ +#ifndef HAVE_LIBPFM if (strchr (name,'/' ) ||strchr (name,':' )) sep ="" ; +#else +if (strchr (name,'/' ) || + (strchr (name,':' ) && !evsel->is_libpfm_event)) + sep ="" ; +#endif ^^^^^^^^
Quoted 8 lines
tools/perf/util/evsel.c +0
-0if (asprintf (&new_name,"%s%su" , name, sep) <0 )return false;tools/perf/util/evsel.h +0
-0tools/perf/util/evsel.h struct evsel { · line 81
Quoted 6 lines
tools/perf/util/evsel.h +3
-0@@ -76,6 +76,9 @@ struct evsel {bool ignore_missing_thread;bool forced_leader;bool use_uncore_alias; +#ifdef HAVE_LIBPFM +bool is_libpfm_event; +#endif perhaps we could had this one in unconditionaly, because I think we have some members like that for aux tracing.. and that would remove the #ifdef above
SNIP
Quoted 1 line
Quoted 10 lines
tools/perf/util/evsel.h
Quoted 8 lines
tools/perf/util/evsel.h +8
-0+#ifdef HAVE_LIBPFM +struct evsel *parse_events__pfm_add_event (int idx,struct perf_event_attr *attr, +char *name,struct perf_pmu *pmu) +{ +return __add_event (NULL , &idx, attr, false, name, pmu,NULL , false, +NULL ); +} +#endif could you instead add
parse_events__add_eventand call it from pfm code?
I wasn't clear whether this was just a name change given the different arguments on existing functions. Hopefully everything is addressed in the v9 set:
https://lore.kernel.org/lkml/[email protected]/T/#m32fc3e3605e49b01e12418f59ef3977cab0561ed
Thanks,
Ian
Quoted 53 lines
SNIP
Quoted 19 lines
tools/perf/util/evsel.h +19
-0+ pmu =perf_pmu__find_by_type ((unsigned int )attr.type); + evsel =parse_events__pfm_add_event (evlist->core.nr_entries, + &attr, q, pmu); +if (evsel ==NULL ) + goto error; + + evsel->is_libpfm_event = true; + +evlist__add (evlist, evsel); + +if (grp_evt ==0 ) + grp_leader = evsel; + +if (grp_evt >-1 ) { + evsel->leader = grp_leader; + grp_leader->core.nr_members++; + grp_evt++; + } +tools/perf/util/evsel.h
Quoted 10 lines
tools/perf/util/evsel.h +10
-0+if (*sep =='}' ) { +if (grp_evt <0 ) { +ui__error ("cannot close a non-existing event group\n" ); + goto error; + } + evlist->nr_groups++; + grp_leader =NULL ; + grp_evt =-1 ; + } + evsel->is_libpfm_event = true;seems to be set twice in here
tools/perf/util/evsel.h
Quoted 12 lines
tools/perf/util/evsel.h +12
-0+ } +return 0 ; +error: +free (p_orig); +return -1 ; +} + +static const char *srcs[PFM_ATTR_CTRL_MAX ] = { + [PFM_ATTR_CTRL_UNKNOWN ] ="???" , + [PFM_ATTR_CTRL_PMU ] ="PMU" , + [PFM_ATTR_CTRL_PERF_EVENT ] ="perf_event" , +};SNIP
thanks,
jirka