perf stat: improvements for handling of multiple PMUs
v3 cover perf stat: improvements for handling of multiple PMUs
This series of patches adds some simple improvements to the way perf stat handles PMUs that have multiple instances by:
1. Adding glob-like matching in addition to the prefix-based matching introduced previously (patch 1).
2. Adding the ability to recover the PMU names when printing the events separately with the --no-merge option (patch 2).
3. Restoring auto-merge for events created by prefix or glob-like match (patch 3). Note that this still keeps the behavior that disables auto-merging of legacy symbolic events (e.g. cycles).
V3:
- Consolidated prefix and glob matching into a single glob match with a trailing * to maintain prefix matching and have more consistent behavior. E.g., all of these match all the uncore_imc PMUs: imc, imc*, *imc, *imc*
V2:
- Updated the documentation to explain prefix and glob matching of PMU names, and event auto-merging.
- Added sample output to the third patch.
Agustin Vega-Frias (3):
perf, tools: Support wildcards on pmu name in dynamic pmu events perf, tools: Display pmu name when printing unmerged events in stat perf pmu: Auto-merge PMU events created by prefix or glob match
tools/perf/Documentation/perf-list.txt | 8 +++++++- tools/perf/Documentation/perf-stat.txt | 17 +++++++++++++++++ tools/perf/builtin-stat.c | 29 ++++++++++++++++++++++++++++- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 21 ++++++++++----------- tools/perf/util/parse-events.h | 2 +- tools/perf/util/parse-events.l | 2 +- tools/perf/util/parse-events.y | 23 ++++++++++++++--------- 9 files changed, 80 insertions(+), 24 deletions(-)
--
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
RFC v3 1/3 perf, tools: Support wildcards on pmu name in dynamic pmu events
Starting on v4.12 event parsing code for dynamic pmu events already supports prefix-based matching of multiple pmus when creating dynamic events. E.g., in a system with the following dynamic pmus:
mypmu_0
mypmu_1
mypmu_2
mypmu_4passing mypmu/<config>/ as an event spec will result in the creation of the event in all of the pmus. This change expands this matching through the use of fnmatch so glob-like expressions can be used to create events in multiple pmus. E.g., in the system described above if a user only wants to create the event in mypmu_0 and mypmu_1, mypmu_[01]/<config>/ can be passed.
--- tools/perf/Documentation/perf-list.txt | 8 +++++++- tools/perf/Documentation/perf-stat.txt | 13 +++++++++++++ tools/perf/util/parse-events.l | 2 +- tools/perf/util/parse-events.y | 19 ++++++++++++------- 4 files changed, 33 insertions(+), 9 deletions(-)
tools/perf/Documentation/perf-list.txt +7 -1
@@ -141,7 +141,13 @@ on the first memory controller on socket 0 of a Intel Xeon system Each memory controller has its own PMU. Measuring the complete system bandwidth would require specifying all imc PMUs (see perf list output), -and adding the values together. +and adding the values together. To simplify creation of multiple events, +prefix and glob matching is supported in the PMU name, and the prefix +'uncore_' is also ignored when performing the match. So the command above +can be expanded to all memory controllers by using the syntaxes: + + perf stat -C 0 -a imc/cas_count_read/,imc/cas_count_write/ -I 1000 ... + perf stat -C 0 -a *imc*/cas_count_read/,*imc*/cas_count_write/ -I 1000 ... This example measures the combined core power every second
tools/perf/Documentation/perf-stat.txt +13 -0
@@ -49,6 +49,13 @@ report:: parameters are defined by corresponding entries in /sys/bus/event_source/devices/<pmu>/format/* + Note that the last two syntaxes support prefix and glob matching in + the PMU name to simplify creation of events accross multiple instances + of the same type of PMU in large systems (e.g. memory controller PMUs). + Multiple PMU instances are typical for uncore PMUs, so the prefix + 'uncore_' is also ignored when performing this match. + + -i:: --no-inherit:: child tasks do not inherit counters
@@ -246,6 +253,12 @@ taskset. --no-merge:: Do not merge results from same PMUs. +When multiple events are created from a single event alias, stat will, +by default, aggregate the event counts and show the result in a single +row. This option disables that behavior and shows the individual events +and counts. Aliases are listed immediately after the Kernel PMU events +by perf list. + --smi-cost:: Measure SMI cost if msr/aperf/ and msr/smi/ events are supported.
tools/perf/util/parse-events.l +1 -1
@@ -175,7 +175,7 @@ bpf_source [^,{}]+\.c[a-zA-Z0-9._]* num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ num_raw_hex [a-fA-F0-9]+ -name [a-zA-Z_*?][a-zA-Z0-9_*?.]* +name [a-zA-Z_*?\[\]][a-zA-Z0-9_*?.\[\]]* name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.:]* drv_cfg_term [a-zA-Z0-9_\.]+(=[a-zA-Z0-9_*?\.:]+)? /* If you add a modifier you need to update check_modifier() */
tools/perf/util/parse-events.y +12 -7
@@ -8,6 +8,7 @@ #define YYDEBUG 1 +#include <fnmatch.h> #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>
@@ -234,21 +235,25 @@ PE_NAME opt_event_config if (parse_events_add_pmu(_parse_state, list, $1, $2)) { struct perf_pmu *pmu = NULL; int ok = 0; + char *pattern; - while ((pmu = perf_pmu__scan(pmu)) != NULL) { - char *name = pmu->name; + if (asprintf(&pattern, "?(uncore_)%s*", $1) < 0) + YYABORT; - if (!strncmp(name, "uncore_", 7) && - strncmp($1, "uncore_", 7)) - name += 7; - if (!strncmp($1, name, strlen($1))) { - if (parse_events_copy_term_list(orig_terms, &terms)) + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + if (!fnmatch(pattern, pmu->name, FNM_EXTMATCH)) { + if (parse_events_copy_term_list(orig_terms, &terms)) { + free(pattern); YYABORT; + } if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms)) ok++; parse_events_terms__delete(terms); } } + + free(pattern); + if (!ok) YYABORT; }
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Arnaldo Carvalho de Melo
maintainerRe: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Em Tue, Mar 06, 2018 at 09:04:42AM -0500, Agustin Vega-Frias escreveu:
Quoted 110 lines
Starting on v4.12 event parsing code for dynamic pmu events already supports prefix-based matching of multiple pmus when creating dynamic events. E.g., in a system with the following dynamic pmus:
mypmu_0 mypmu_1 mypmu_2 mypmu_4passing mypmu/<config>/ as an event spec will result in the creation of the event in all of the pmus. This change expands this matching through the use of fnmatch so glob-like expressions can be used to create events in multiple pmus. E.g., in the system described above if a user only wants to create the event in
mypmu_0andmypmu_1, mypmu_[01]/<config>/ can be passed.Change-Id Icb25653fc5d5239c20f3bffdfdf4ab4c9c9bb20bSigned-off-by Agustin Vega-Frias <[email protected]>--- tools/perf/Documentation/perf-list.txt | 8 +++++++- tools/perf/Documentation/perf-stat.txt | 13 +++++++++++++ tools/perf/util/parse-events.l | 2 +- tools/perf/util/parse-events.y | 19 ++++++++++++------- 4 files changed, 33 insertions(+), 9 deletions(-)tools/perf/Documentation/perf-list.txt +7
-1@@ -141,7 +141,13 @@ on the first memory controller on socket 0 of a Intel Xeon system Each memory controller has its own PMU. Measuring the complete system bandwidth would require specifying all imc PMUs (see perf list output), -and adding the values together. +and adding the values together. To simplify creation of multiple events, +prefix and glob matching is supported in the PMU name, and the prefix +'uncore_' is also ignored when performing the match. So the command above +can be expanded to all memory controllers by using the syntaxes: + + perf stat -C 0 -a imc/cas_count_read/,imc/cas_count_write/ -I 1000 ... + perf stat -C 0 -a *imc*/cas_count_read/,*imc*/cas_count_write/ -I 1000 ... This example measures the combined core power every secondtools/perf/Documentation/perf-stat.txt +13
-0@@ -49,6 +49,13 @@ report:: parameters are defined by corresponding entries in /sys/bus/event_source/devices/<pmu>/format/* + Note that the last two syntaxes support prefix and glob matching in + the PMU name to simplify creation of events accross multiple instances + of the same type of PMU in large systems (e.g. memory controller PMUs). + Multiple PMU instances are typical for uncore PMUs, so the prefix + 'uncore_' is also ignored when performing this match. + + -i:: --no-inherit:: child tasks do not inherit counters@@ -246,6 +253,12 @@ taskset. --no-merge:: Do not merge results from same PMUs. +When multiple events are created from a single event alias, stat will, +by default, aggregate the event counts and show the result in a single +row. This option disables that behavior and shows the individual events +and counts. Aliases are listed immediately after the Kernel PMU events +by perf list. + --smi-cost:: Measure SMI cost if msr/aperf/ and msr/smi/ events are supported.tools/perf/util/parse-events.l +1
-1@@ -175,7 +175,7 @@ bpf_source [^,{}]+\.c[a-zA-Z0-9._]* num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ num_raw_hex [a-fA-F0-9]+ -name [a-zA-Z_*?][a-zA-Z0-9_*?.]* +name [a-zA-Z_*?\[\]][a-zA-Z0-9_*?.\[\]]* name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.:]* drv_cfg_term [a-zA-Z0-9_\.]+(=[a-zA-Z0-9_*?\.:]+)? /* If you add a modifier you need to update check_modifier() */tools/perf/util/parse-events.y +4
-2@@ -8,6 +8,7 @@ #define YYDEBUG 1 +#include <fnmatch.h> #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>@@ -234,21 +235,25 @@ PE_NAME opt_event_config if (parse_events_add_pmu(_parse_state, list, $1, $2)) { struct perf_pmu *pmu = NULL; int ok = 0; + char *pattern; - while ((pmu = perf_pmu__scan(pmu)) != NULL) { - char *name = pmu->name; + if (asprintf(&pattern, "?(uncore_)%s*", $1) < 0) + YYABORT;
tools/perf/util/parse-events.y PE_NAME opt_event_config · line 246
Quoted 10 lines
tools/perf/util/parse-events.y +4
-5- if (!strncmp(name, "uncore_", 7) && - strncmp($1, "uncore_", 7)) - name += 7; - if (!strncmp($1, name, strlen($1))) { - if (parse_events_copy_term_list(orig_terms, &terms)) + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + if (!fnmatch(pattern, pmu->name, FNM_EXTMATCH)) { + if (parse_events_copy_term_list(orig_terms, &terms)) { + free(pattern);
This breaks the build in at least Alpine Linux 3.4, 3.5 and 3.6 and android-ndk:r15c-arm
Alpine 3.6 build failure:
CC /tmp/build/perf/util/parse-events-bison.o
util/parse-events.y: In function 'parse_events_parse':
util/parse-events.y:244:37: error: 'FNM_EXTMATCH' undeclared (first use in this function)
if (!fnmatch(pattern, pmu->name, FNM_EXTMATCH)) {
^~~~~~~~~~~~util/parse-events.y:244:37: note: each undeclared identifier is reported only once for each function it appears in
CC /tmp/build/perf/bench/mem-functions.o
mv: can't rename '/tmp/build/perf/util/.parse-events-bison.o.tmp': No such file or directory make[4]: *** [/git/linux/tools/build/Makefile.build:96: /tmp/build/perf/util/parse-events-bison.o] Error 1 make[3]: *** [/git/linux/tools/build/Makefile.build:139: util] Error 2
make[2]: *** [Makefile.perf:623: /tmp/build/perf/libperf-in.o] Error 2
make[2]: *** Waiting for unfinished jobs....
Android NDK r15c ARM, cross built from, IIRC, Fedora 24:
CC /tmp/build/perf/util/parse-events-bison.o
util/parse-events.y: In function 'parse_events_parse':
util/parse-events.y:244:37: error: 'FNM_EXTMATCH' undeclared (first use in this function)
if (!fnmatch(pattern, pmu->name, FNM_EXTMATCH)) {
^util/parse-events.y:244:37: note: each undeclared identifier is reported only once for each function it appears in
mv: cannot stat '/tmp/build/perf/util/.parse-events-bison.o.tmp': No such file or directory make[4]: *** [/git/linux/tools/build/Makefile.build:96: /tmp/build/perf/util/parse-events-bison.o] Error 1 make[4]: *** Waiting for unfinished jobs....
CC /tmp/build/perf/builtin-kmem.o
make[3]: *** [/git/linux/tools/build/Makefile.build:139: util] Error 2
make[2]: *** [Makefile.perf:623: /tmp/build/perf/libperf-in.o] Error 2
Probably others, I'll investigate later, feel free to do it if you have the time now :-)
Extra info:
1 46.29 alpine:3.4 : FAIL gcc (Alpine 5.3.0) 5.3.0 2 53.37 alpine:3.5 : FAIL gcc (Alpine 6.2.1) 6.2.1 20160822 3 48.42 alpine:3.6 : FAIL gcc (Alpine 6.3.0) 6.3.0 4 35.88 alpine:edge : FAIL gcc (Alpine 6.4.0) 6.4.0 5 96.79 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-11) 6 116.40 amazonlinux:2 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) 7 34.30 android-ndk:r12b-arm : FAIL arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 8 33.69 android-ndk:r15c-arm : FAIL arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 9 60.50 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) 10 88.54 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18) 11 108.89 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-16)
The builds are still ongoing.
- Arnaldo
Re: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Quoted 1 line · Arnaldo Carvalho de Melo
Em Tue, Mar 06, 2018 at 09:04:42AM -0500, Agustin Vega-Frias escreveu:
[snip]
Quoted 42 lines
This breaks the build in at least Alpine Linux 3.4, 3.5 and 3.6 and android-ndk:r15c-arm
Alpine 3.6 build failure:
CC
/tmp/build/perf/util/parse-events-bison.o
util/parse-events.y: In function 'parse_events_parse':
util/parse-events.y:244:37: error: 'FNM_EXTMATCH' undeclared (first use in this function)if (!fnmatch(pattern, pmu->name, FNM_EXTMATCH)) { ^~~~~~~~~~~~util/parse-events.y:244:37: note: each undeclared identifier is reported only once for each function it appears in
CC/tmp/build/perf/bench/mem-functions.o
mv: can't rename '/tmp/build/perf/util/.parse-events-bison.o.tmp': No such file or directory
make[4]: *** [/git/linux/tools/build/Makefile.build:96:/tmp/build/perf/util/parse-events-bison.o] Error 1
make[3]: *** [/git/linux/tools/build/Makefile.build:139: util] Error 2 make[2]: *** [Makefile.perf:623:/tmp/build/perf/libperf-in.o] Error 2 make[2]: *** Waiting for unfinished jobs....Android NDK r15c ARM, cross built from, IIRC, Fedora 24:
CC
/tmp/build/perf/util/parse-events-bison.o
util/parse-events.y: In function 'parse_events_parse':
util/parse-events.y:244:37: error: 'FNM_EXTMATCH' undeclared (first use in this function)if (!fnmatch(pattern, pmu->name, FNM_EXTMATCH)) { ^util/parse-events.y:244:37: note: each undeclared identifier is reported only once for each function it appears in
mv: cannot stat '/tmp/build/perf/util/.parse-events-bison.o.tmp': No such file or directory
make[4]: *** [/git/linux/tools/build/Makefile.build:96:/tmp/build/perf/util/parse-events-bison.o] Error 1
make[4]: *** Waiting for unfinished jobs....
CC/tmp/build/perf/builtin-kmem.o
make[3]: *** [/git/linux/tools/build/Makefile.build:139: util] Error 2 make[2]: *** [Makefile.perf:623:/tmp/build/perf/libperf-in.o] Error 2
Quoted 3 lines
Probably others, I'll investigate later, feel free to do it if you have the time now :-)
Sorry about that. That's probably because FNM_EXTMATCH is a GNU extension,
not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore the uncore_ prefix,
and dropping that extension.
Agust?n
Quoted 30 lines
Extra info:
1 46.29 alpine:3.4 : FAIL gcc (Alpine 5.3.0)5.3.0
2 53.37 alpine:3.5 : FAIL gcc (Alpine 6.2.1)
6.2.1 20160822
3 48.42 alpine:3.6 : FAIL gcc (Alpine 6.3.0)
6.3.0
4 35.88 alpine:edge : FAIL gcc (Alpine 6.4.0)
6.4.0
5 96.79 amazonlinux:1 : Ok gcc (GCC) 4.8.5
20150623 (Red Hat 4.8.5-11)
6 116.40 amazonlinux:2 : Ok gcc (GCC) 7.2.1
20170915 (Red Hat 7.2.1-2)
7 34.30 android-ndk:r12b-arm : FAIL
arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease)
8 33.69 android-ndk:r15c-arm : FAIL
arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease)
9 60.50 centos:5 : Ok gcc (GCC) 4.1.2
20080704 (Red Hat 4.1.2-55)
10 88.54 centos:6 : Ok gcc (GCC) 4.4.7
20120313 (Red Hat 4.4.7-18)
11 108.89 centos:7 : Ok gcc (GCC) 4.8.5
20150623 (Red Hat 4.8.5-16)The builds are still ongoing.
- Arnaldo
Signature · 4 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.
Just don't set it? Even the basic glob patterns are useful.
-Andi
Arnaldo Carvalho de Melo
maintainerRe: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Em Wed, Mar 07, 2018 at 10:54:15AM -0800, Andi Kleen escreveu:
Quoted 7 lines
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.Just don't set it? Even the basic glob patterns are useful.
Or use:
#ifndef FNM_EXTMATCH
#define FNM_EXTMATCH 0
#endif
So on systems without it, its not used, while on GNU systems, we have that functionality (pretty fancy, someone may need that... ;-))
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Em Wed, Mar 07, 2018 at 04:05:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 9 lines
Em Wed, Mar 07, 2018 at 10:54:15AM -0800, Andi Kleen escreveu:
Quoted 7 lines
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.Just don't set it? Even the basic glob patterns are useful.
Quoted 8 lines
Or use:
#ifndef
FNM_EXTMATCH
#defineFNM_EXTMATCH0
#endifSo on systems without it, its not used, while on GNU systems, we have that functionality (pretty fancy, someone may need that... ;-))
I'll try this route, btw, no need to send more patches for now.
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Em Wed, Mar 07, 2018 at 04:05:43PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 12 lines
Em Wed, Mar 07, 2018 at 04:05:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 11 lines
Em Wed, Mar 07, 2018 at 10:54:15AM -0800, Andi Kleen escreveu:
Quoted 7 lines
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.Just don't set it? Even the basic glob patterns are useful.
Or use:
Quoted 8 lines
Quoted 6 lines
#ifndef
FNM_EXTMATCH
#defineFNM_EXTMATCH0
#endifSo on systems without it, its not used, while on GNU systems, we have that functionality (pretty fancy, someone may need that... ;-))
I'll try this route, btw, no need to send more patches for now.
So, with the patch at the end of this message, it works now in those systems:
[root at jouet ~]# dm
1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 4 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 5 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-11) 6 amazonlinux:2 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) 7 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 8 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 9 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) 10 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18)
I stopped the test at this point to process some more patches, will restart the tests with those extra patches and if all goes well with the other 46 build environments, push upstream, thanks.
- Arnaldo
tools/perf/util/parse-events.y +7 -0
@@ -9,6 +9,13 @@ #define YYDEBUG 1 #include <fnmatch.h> +/* + * GNU extension, so better define it to 0 for systems such + * as Android and Alpine Linux. + */ +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>
Re: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Quoted 62 lines · Arnaldo Carvalho de Melo
Em Wed, Mar 07, 2018 at 04:05:43PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 13 lines
Em Wed, Mar 07, 2018 at 04:05:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 11 lines
Em Wed, Mar 07, 2018 at 10:54:15AM -0800, Andi Kleen escreveu:
Quoted 7 lines
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.Just don't set it? Even the basic glob patterns are useful.
Or use:
Quoted 8 lines
Quoted 6 lines
#ifndef
FNM_EXTMATCH
#defineFNM_EXTMATCH0
#endifSo on systems without it, its not used, while on GNU systems, we have that functionality (pretty fancy, someone may need that... ;-))
I'll try this route, btw, no need to send more patches for now.
So, with the patch at the end of this message, it works now in those systems:
[root at jouet ~]# dm
1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 4 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 5 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623(Red Hat 4.8.5-11)
6 amazonlinux:2 : Ok gcc (GCC) 7.2.1 20170915
(Red Hat 7.2.1-2)
7 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
8 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
9 centos:5 : Ok gcc (GCC) 4.1.2 20080704
(Red Hat 4.1.2-55)
10 centos:6 : Ok gcc (GCC) 4.4.7 20120313
(Red Hat 4.4.7-18)I stopped the test at this point to process some more patches, will restart the tests with those extra patches and if all goes well with the
other 46 build environments, push upstream, thanks.- Arnaldo
tools/perf/util/parse-events.y +0
-0@@ -9,6 +9,13 @@ #define YYDEBUG 1 #include <fnmatch.h>
tools/perf/util/parse-events.y line 21
Quoted 10 lines
tools/perf/util/parse-events.y +7
-0+/* + * GNU extension, so better define it to 0 for systems such + * as Android and Alpine Linux. + */ +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>
Hey Jiri,
The downside is that, while the compilation now works on those systems, the pattern will not work as intended in them :o( Let me cook something and send it ASAP.
Thanks,
Agust?n
Signature · 4 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Arnaldo Carvalho de Melo
maintainerRe: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Em Wed, Mar 07, 2018 at 02:49:50PM -0500, Agustin Vega-Frias escreveu:
Quoted 75 lines · Arnaldo Carvalho de Melo
Quoted 61 lines
Em Wed, Mar 07, 2018 at 04:05:43PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 13 lines
Em Wed, Mar 07, 2018 at 04:05:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 11 lines
Em Wed, Mar 07, 2018 at 10:54:15AM -0800, Andi Kleen escreveu:
Quoted 7 lines
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.Just don't set it? Even the basic glob patterns are useful.
Or use:
Quoted 8 lines
Quoted 6 lines
#ifndef
FNM_EXTMATCH
#defineFNM_EXTMATCH0
#endifSo on systems without it, its not used, while on GNU systems, we have that functionality (pretty fancy, someone may need that... ;-))
I'll try this route, btw, no need to send more patches for now.
So, with the patch at the end of this message, it works now in those systems:
[root at jouet ~]# dm
1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 4 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 5 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623(Red Hat 4.8.5-11)
6 amazonlinux:2 : Ok gcc (GCC) 7.2.1 20170915
(Red Hat 7.2.1-2)
7 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
8 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
9 centos:5 : Ok gcc (GCC) 4.1.2 20080704
(Red Hat 4.1.2-55)
10 centos:6 : Ok gcc (GCC) 4.4.7 20120313
(Red Hat 4.4.7-18)I stopped the test at this point to process some more patches, will restart the tests with those extra patches and if all goes well with the other 46 build environments, push upstream, thanks.
- Arnaldo
tools/perf/util/parse-events.y +0
-0@@ -9,6 +9,13 @@ #define YYDEBUG 1 #include <fnmatch.h>tools/perf/util/parse-events.y line 21
Quoted 10 lines
tools/perf/util/parse-events.y +7
-0+/* + * GNU extension, so better define it to 0 for systems such + * as Android and Alpine Linux. + */ +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>Hey Jiri,
Quoted 3 lines
The downside is that, while the compilation now works on those systems, the pattern will not work as intended in them :o( Let me cook something and send it ASAP.
Well, do you think this is really a big problem? Even if we add nice docs?
I haven't tested something that works with this syntax on a capable system and then on one that doesn't, to see how it would behave, probably it would say something about a syntax error?
- Arnaldo
Re: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
Quoted 80 lines · Arnaldo Carvalho de Melo
Em Wed, Mar 07, 2018 at 02:49:50PM -0500, Agustin Vega-Frias escreveu:
Quoted 75 lines · Arnaldo Carvalho de Melo
Quoted 61 lines
Em Wed, Mar 07, 2018 at 04:05:43PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 13 lines
Em Wed, Mar 07, 2018 at 04:05:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 11 lines
Em Wed, Mar 07, 2018 at 10:54:15AM -0800, Andi Kleen escreveu:
Quoted 7 lines
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.Just don't set it? Even the basic glob patterns are useful.
Or use:
Quoted 8 lines
Quoted 6 lines
#ifndef
FNM_EXTMATCH
#defineFNM_EXTMATCH0
#endifSo on systems without it, its not used, while on GNU systems, we have that functionality (pretty fancy, someone may need that... ;-))
I'll try this route, btw, no need to send more patches for now.
So, with the patch at the end of this message, it works now in those systems:
[root at jouet ~]# dm
1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 4 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 5 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623(Red Hat 4.8.5-11)
6 amazonlinux:2 : Ok gcc (GCC) 7.2.1 20170915
(Red Hat 7.2.1-2)
7 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
8 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
9 centos:5 : Ok gcc (GCC) 4.1.2 20080704
(Red Hat 4.1.2-55)
10 centos:6 : Ok gcc (GCC) 4.4.7 20120313
(Red Hat 4.4.7-18)I stopped the test at this point to process some more patches, will restart the tests with those extra patches and if all goes well with the other 46 build environments, push upstream, thanks.
- Arnaldo
tools/perf/util/parse-events.y +0
-0@@ -9,6 +9,13 @@ #define YYDEBUG 1 #include <fnmatch.h>tools/perf/util/parse-events.y line 21
Quoted 10 lines
tools/perf/util/parse-events.y +7
-0+/* + * GNU extension, so better define it to 0 for systems such + * as Android and Alpine Linux. + */ +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>Hey Jiri,
Quoted 3 lines
The downside is that, while the compilation now works on those systems, the pattern will not work as intended in them :o( Let me cook something and send it ASAP.
Quoted 7 lines
Well, do you think this is really a big problem? Even if we add nice docs?
I haven't tested something that works with this syntax on a capable system and then on one that doesn't, to see how it would behave, probably it would say something about a syntax error?
Most likely, yes, it would be flagged as a syntax error in the event name.
I'd prefer we fix this. I have the new patch ready, do you want me to just
send you that patch instead of the series?
Thanks,
Agust?n
Signature · 4 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
On Wed, Mar 07, 2018 at 03:09:08PM -0500, Agustin Vega-Frias wrote:
SNIP
Quoted 21 lines
Quoted 21 lines
Quoted 14 lines
tools/perf/util/parse-events.y line 21
Quoted 11 lines
#include <
fnmatch.h>tools/perf/util/parse-events.y +7
-0+/* + * GNU extension, so better define it to 0 for systems such + * as Android and Alpine Linux. + */ +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>Hey Jiri,
Quoted 3 lines
The downside is that, while the compilation now works on those systems, the pattern will not work as intended in them :o( Let me cook something and send it ASAP.
Well, do you think this is really a big problem? Even if we add nice docs?
Quoted 8 lines
Quoted 4 lines
I haven't tested something that works with this syntax on a capable system and then on one that doesn't, to see how it would behave, probably it would say something about a syntax error?
Most likely, yes, it would be flagged as a syntax error in the event name. I'd prefer we fix this. I have the new patch ready, do you want me to just send you that patch instead of the series?
we could also detect the extension via build features and have HAVE_FEATURE_ macro defined for it, so we'd have full functionality on system with its support
but maybe that's little too much for feature this size, or we can add it later.. now I'd be ok with the limited functionality as well
jirka
Arnaldo Carvalho de Melo
maintainerRe: [RFC V3 1/3] perf, tools: Support wildcards on pmu name in dynamic pmu events
In reply to Agustin Vega-FriasEm Wed, Mar 07, 2018 at 03:09:08PM -0500, Agustin Vega-Frias escreveu:
Quoted 84 lines · Arnaldo Carvalho de Melo
Quoted 83 lines
Em Wed, Mar 07, 2018 at 02:49:50PM -0500, Agustin Vega-Frias escreveu:
Quoted 75 lines · Arnaldo Carvalho de Melo
Quoted 61 lines
Em Wed, Mar 07, 2018 at 04:05:43PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 13 lines
Em Wed, Mar 07, 2018 at 04:05:09PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 11 lines
Em Wed, Mar 07, 2018 at 10:54:15AM -0800, Andi Kleen escreveu:
Quoted 7 lines
Quoted 5 lines
Sorry about that. That's probably because
FNM_EXTMATCHis a GNU extension, not POSIX, and the Alpine and Android runtimes likely don't implement that...
I'll send a fix reverting back to the strncmp to ignore theuncore_prefix, and dropping that extension.Just don't set it? Even the basic glob patterns are useful.
Or use:
Quoted 8 lines
Quoted 6 lines
#ifndef
FNM_EXTMATCH
#defineFNM_EXTMATCH0
#endifSo on systems without it, its not used, while on GNU systems, we have that functionality (pretty fancy, someone may need that... ;-))
I'll try this route, btw, no need to send more patches for now.
So, with the patch at the end of this message, it works now in those systems:
[root at jouet ~]# dm
1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 4 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 5 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623(Red Hat 4.8.5-11)
6 amazonlinux:2 : Ok gcc (GCC) 7.2.1 20170915
(Red Hat 7.2.1-2)
7 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
8 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc
(GCC) 4.9.x 20150123 (prerelease)
9 centos:5 : Ok gcc (GCC) 4.1.2 20080704
(Red Hat 4.1.2-55)
10 centos:6 : Ok gcc (GCC) 4.4.7 20120313
(Red Hat 4.4.7-18)I stopped the test at this point to process some more patches, will restart the tests with those extra patches and if all goes well with the other 46 build environments, push upstream, thanks.
- Arnaldo
tools/perf/util/parse-events.y +0
-0@@ -9,6 +9,13 @@ #define YYDEBUG 1 #include <fnmatch.h>tools/perf/util/parse-events.y line 21
Quoted 10 lines
tools/perf/util/parse-events.y +7
-0+/* + * GNU extension, so better define it to 0 for systems such + * as Android and Alpine Linux. + */ +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 +#endif #include <linux/compiler.h> #include <linux/list.h> #include <linux/types.h>Hey Jiri,
Quoted 3 lines
The downside is that, while the compilation now works on those systems, the pattern will not work as intended in them :o( Let me cook something and send it ASAP.
Well, do you think this is really a big problem? Even if we add nice docs?
Quoted 8 lines
Quoted 4 lines
I haven't tested something that works with this syntax on a capable system and then on one that doesn't, to see how it would behave, probably it would say something about a syntax error?
Most likely, yes, it would be flagged as a syntax error in the event name. I'd prefer we fix this. I have the new patch ready, do you want me to just send you that patch instead of the series?
Just that patch is ok.
- Arnaldo
RFC v3 2/3 perf, tools: Display pmu name when printing unmerged events in stat
In reply to Agustin Vega-FriasTo simplify creation of events accross multiple instances of the same type of PMU stat supports two methods for creating multiple events from a single event specification:
1. A prefix or glob can be used in the PMU name.
2. Aliases, which are listed immediately after the Kernel PMU events by perf list, are used.
When the --no-merge option is passed and these events are displayed individually the PMU name is lost and it's not possible to see which count corresponds to which pmu:
$ ./perf stat -a -e l3cache/read-miss/ --no-merge ls > /dev/null
Performance counter stats for 'system wide':
67 l3cache/read-miss/
67 l3cache/read-miss/
63 l3cache/read-miss/
60 l3cache/read-miss/
0.001675706 seconds time elapsed
$ ./perf stat -a -e l3cache_read_miss --no-merge ls > /dev/null
Performance counter stats for 'system wide':
12 l3cache_read_miss
17 l3cache_read_miss
10 l3cache_read_miss
8 l3cache_read_miss
0.001661305 seconds time elapsedThis change adds the original pmu name to the event. For dynamic pmu events the pmu name is restored in the event name:
$ ./perf stat -a -e l3cache/read-miss/ --no-merge ls > /dev/null
Performance counter stats for 'system wide':
63 l3cache_0_3/read-miss/
74 l3cache_0_1/read-miss/
64 l3cache_0_2/read-miss/
74 l3cache_0_0/read-miss/
0.001675706 seconds time elapsedFor alias events the name is added after the event name:
$ ./perf stat -a -e l3cache_read_miss --no-merge ls > /dev/null
Performance counter stats for 'system wide':
10 l3cache_read_miss [l3cache_0_3]
12 l3cache_read_miss [l3cache_0_1]
10 l3cache_read_miss [l3cache_0_2]
17 l3cache_read_miss [l3cache_0_0]
0.001661305 seconds time elapsed--- tools/perf/builtin-stat.c | 29 ++++++++++++++++++++++++++++- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 8 +++++++- 4 files changed, 37 insertions(+), 2 deletions(-)
tools/perf/builtin-stat.c +28 -1
@@ -1225,6 +1225,31 @@ static void aggr_update_shadow(void) } } +static void uniquify_event_name (struct perf_evsel *counter) +{ +char *new_name; +char *config; + +if (!counter->pmu_name || !strncmp (counter->name, counter->pmu_name, +strlen (counter->pmu_name))) +return ; + + config =strchr (counter->name,'/' ); +if (config) { +if (asprintf (&new_name, +"%s%s" , counter->pmu_name, config) >0 ) { +free (counter->name); + counter->name = new_name; + } + }else { +if (asprintf (&new_name, +"%s [%s]" , counter->name, counter->pmu_name) >0 ) { +free (counter->name); + counter->name = new_name; + } + } +} + static void collect_all_aliases(struct perf_evsel *counter, void (*cb)(struct perf_evsel *counter, void *data, bool first),
@@ -1253,7 +1278,9 @@ static bool collect_data(struct perf_evsel *counter,if (counter->merged_stat)return false;cb (counter, data, true); -if (!no_merge && counter->auto_merge_stats) +if (no_merge) +uniquify_event_name (counter); +else if (counter->auto_merge_stats)collect_all_aliases (counter, cb, data);return true; }
tools/perf/util/evsel.c +1 -0
@@ -244,6 +244,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->metric_name =NULL ; evsel->metric_events =NULL ; evsel->collect_stat = false; + evsel->pmu_name =NULL ; }struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx)
tools/perf/util/evsel.h +1 -0
@@ -142,6 +142,7 @@ struct perf_evsel {struct perf_evsel **metric_events;bool collect_stat;bool weak_group; +const char *pmu_name; };union u64_swap {
tools/perf/util/parse-events.c +7 -1
@@ -1247,7 +1247,12 @@ static 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); -return evsel ?0 : -ENOMEM ; +if (evsel) { + evsel->pmu_name = name; +return 0 ; + }else { +return -ENOMEM ; + } }if (perf_pmu__check_alias (pmu, head_config, &info))
@@ -1276,6 +1281,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state, evsel->snapshot = info.snapshot; evsel->metric_expr = info.metric_expr; evsel->metric_name = info.metric_name; + evsel->pmu_name = name; }return evsel ?0 : -ENOMEM ;
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
tip-bot for Agustin Vega-Frias
merge bot[tip:perf/core] perf pmu: Display pmu name when printing unmerged events in stat
perf pmu: Display pmu name when printing unmerged events in stat
Commit-ID: 8c5421c016a4ef7fd0141fe3a1ad221feba12f92 Gitweb: https://git.kernel.org/tip/8c5421c016a4ef7fd0141fe3a1ad221feba12f92 Author: Agustin Vega-Frias <[email protected]> AuthorDate: Tue, 6 Mar 2018 09:04:43 -0500 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 8 Mar 2018 10:05:49 -0300
perf pmu: Display pmu name when printing unmerged events in stat
To simplify creation of events accross multiple instances of the same type of PMU stat supports two methods for creating multiple events from a single event specification:
1. A prefix or glob can be used in the PMU name.
2. Aliases, which are listed immediately after the Kernel PMU events by perf list, are used.
When the --no-merge option is passed and these events are displayed individually the PMU name is lost and it's not possible to see which count corresponds to which pmu:
$ perf stat -a -e l3cache/read-miss/ --no-merge ls > /dev/null
Performance counter stats for 'system wide':
67 l3cache/read-miss/
67 l3cache/read-miss/
63 l3cache/read-miss/
60 l3cache/read-miss/
0.001675706 seconds time elapsed
$ perf stat -a -e l3cache_read_miss --no-merge ls > /dev/null
Performance counter stats for 'system wide':
12 l3cache_read_miss
17 l3cache_read_miss
10 l3cache_read_miss
8 l3cache_read_miss
0.001661305 seconds time elapsedThis change adds the original pmu name to the event. For dynamic pmu events the pmu name is restored in the event name:
$ perf stat -a -e l3cache/read-miss/ --no-merge ls > /dev/null
Performance counter stats for 'system wide':
63 l3cache_0_3/read-miss/
74 l3cache_0_1/read-miss/
64 l3cache_0_2/read-miss/
74 l3cache_0_0/read-miss/
0.001675706 seconds time elapsedFor alias events the name is added after the event name:
$ perf stat -a -e l3cache_read_miss --no-merge ls > /dev/null
Performance counter stats for 'system wide':
10 l3cache_read_miss [l3cache_0_3]
12 l3cache_read_miss [l3cache_0_1]
10 l3cache_read_miss [l3cache_0_2]
17 l3cache_read_miss [l3cache_0_0]
0.001661305 seconds time elapsed--- tools/perf/builtin-stat.c | 29 ++++++++++++++++++++++++++++- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 8 +++++++- 4 files changed, 37 insertions(+), 2 deletions(-)
tools/perf/builtin-stat.c +28 -1
@@ -1251,6 +1251,31 @@ static void aggr_update_shadow(void) } } +static void uniquify_event_name (struct perf_evsel *counter) +{ +char *new_name; +char *config; + +if (!counter->pmu_name || !strncmp (counter->name, counter->pmu_name, +strlen (counter->pmu_name))) +return ; + + config =strchr (counter->name,'/' ); +if (config) { +if (asprintf (&new_name, +"%s%s" , counter->pmu_name, config) >0 ) { +free (counter->name); + counter->name = new_name; + } + }else { +if (asprintf (&new_name, +"%s [%s]" , counter->name, counter->pmu_name) >0 ) { +free (counter->name); + counter->name = new_name; + } + } +} + static void collect_all_aliases(struct perf_evsel *counter, void (*cb)(struct perf_evsel *counter, void *data, bool first),
@@ -1279,7 +1304,9 @@ static bool collect_data(struct perf_evsel *counter,if (counter->merged_stat)return false;cb (counter, data, true); -if (!no_merge && counter->auto_merge_stats) +if (no_merge) +uniquify_event_name (counter); +else if (counter->auto_merge_stats)collect_all_aliases (counter, cb, data);return true; }
tools/perf/util/evsel.c +1 -0
@@ -244,6 +244,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->metric_name =NULL ; evsel->metric_events =NULL ; evsel->collect_stat = false; + evsel->pmu_name =NULL ; }struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx)
tools/perf/util/evsel.h +1 -0
@@ -142,6 +142,7 @@ struct perf_evsel {struct perf_evsel **metric_events;bool collect_stat;bool weak_group; +const char *pmu_name; };union u64_swap {
tools/perf/util/parse-events.c +7 -1
@@ -1247,7 +1247,12 @@ static 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); -return evsel ?0 : -ENOMEM ; +if (evsel) { + evsel->pmu_name = name; +return 0 ; + }else { +return -ENOMEM ; + } }if (perf_pmu__check_alias (pmu, head_config, &info))
@@ -1276,6 +1281,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state, evsel->snapshot = info.snapshot; evsel->metric_expr = info.metric_expr; evsel->metric_name = info.metric_name; + evsel->pmu_name = name; }return evsel ?0 : -ENOMEM ;
RFC v3 3/3 perf pmu: Auto-merge PMU events created by prefix or glob match
In reply to Agustin Vega-FriasAuto-merge for these events was disabled when auto-merging of non-alias events was disabled in commit 63ce844 (perf stat: Only auto-merge events that are PMU aliases).
Non-merging of legacy events is preserved:
$ ./perf stat -ag -e cache-misses,cache-misses sleep 1
Performance counter stats for 'system wide':
86,323 cache-misses
86,323 cache-misses
1.002623307 seconds time elapsedBut prefix or glob matching auto-merges the events created:
$ ./perf stat -a -e l3cache/read-miss/ sleep 1
Performance counter stats for 'system wide':
328 l3cache/read-miss/
1.002627008 seconds time elapsed
$ ./perf stat -a -e l3cache_0_[01]/read-miss/ sleep 1
Performance counter stats for 'system wide':
172 l3cache/read-miss/
1.002627008 seconds time elapsedAs with events created with aliases, auto-merging can be suppressed with the --no-merge option:
$ ./perf stat -a -e l3cache/read-miss/ --no-merge sleep 1
Performance counter stats for 'system wide':
67 l3cache/read-miss/
67 l3cache/read-miss/
63 l3cache/read-miss/
60 l3cache/read-miss/
1.002622192 seconds time elapsed
--- tools/perf/Documentation/perf-stat.txt | 14 +++++++++----- tools/perf/util/parse-events.c | 13 +++---------- tools/perf/util/parse-events.h | 2 +- tools/perf/util/parse-events.y | 4 ++-- 4 files changed, 15 insertions(+), 18 deletions(-)
tools/perf/Documentation/perf-stat.txt +9 -5
@@ -253,11 +253,15 @@ taskset. --no-merge:: Do not merge results from same PMUs. -When multiple events are created from a single event alias, stat will, -by default, aggregate the event counts and show the result in a single -row. This option disables that behavior and shows the individual events -and counts. Aliases are listed immediately after the Kernel PMU events -by perf list. +When multiple events are created from a single event specification, +stat will, by default, aggregate the event counts and show the result +in a single row. This option disables that behavior and shows +the individual events and counts. + +Multiple events are created from a single event specification when: +1. Prefix or glob matching is used for the PMU name. +2. Aliases, which are listed immediately after the Kernel PMU events + by perf list, are used. --smi-cost:: Measure SMI cost if msr/aperf/ and msr/smi/ events are supported.
tools/perf/util/parse-events.c +3 -10
@@ -1217,7 +1217,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state, get_config_name(head_config), &config_terms); } -static int __parse_events_add_pmu (struct parse_events_state *parse_state, +int parse_events_add_pmu (struct parse_events_state *parse_state,struct list_head *list,char *name,struct list_head *head_config,bool auto_merge_stats) {
@@ -1287,13 +1287,6 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state,return evsel ?0 : -ENOMEM ; } -int parse_events_add_pmu (struct parse_events_state *parse_state, -struct list_head *list,char *name, -struct list_head *head_config) -{ -return __parse_events_add_pmu (parse_state, list, name, head_config, false); -} -int parse_events_multi_pmu_add (struct parse_events_state *parse_state,char *str,struct list_head **listp) {
@@ -1323,8 +1316,8 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,return -1 ;list_add_tail (&term->list, head); -if (!__parse_events_add_pmu (parse_state, list, - pmu->name, head, true)) { +if (!parse_events_add_pmu (parse_state, list, + pmu->name, head, true)) {pr_debug ("%s -> %s/%s/\n" , str, pmu->name, alias->str); ok++;
tools/perf/util/parse-events.h +1 -1
@@ -167,7 +167,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx, void *ptr, char *type, u64 len);int parse_events_add_pmu (struct parse_events_state *parse_state,struct list_head *list,char *name, -struct list_head *head_config); +struct list_head *head_config,bool auto_merge_stats); int parse_events_multi_pmu_add(struct parse_events_state *parse_state, char *str,
tools/perf/util/parse-events.y +2 -2
@@ -232,7 +232,7 @@ PE_NAME opt_event_config YYABORT; ALLOC_LIST(list); - if (parse_events_add_pmu(_parse_state, list, $1, $2)) { + if (parse_events_add_pmu(_parse_state, list, $1, $2, false)) { struct perf_pmu *pmu = NULL; int ok = 0; char *pattern;
@@ -246,7 +246,7 @@ PE_NAME opt_event_config free(pattern); YYABORT; } - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms)) + if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true)) ok++; parse_events_terms__delete(terms); }
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
tip-bot for Agustin Vega-Frias
merge bot[tip:perf/core] perf pmu: Auto-merge PMU events created by prefix or glob match
perf pmu: Auto-merge PMU events created by prefix or glob match
Commit-ID: c199c11dce197b12ff884ac0cfcb527b1164788b Gitweb: https://git.kernel.org/tip/c199c11dce197b12ff884ac0cfcb527b1164788b Author: Agustin Vega-Frias <[email protected]> AuthorDate: Tue, 6 Mar 2018 09:04:44 -0500 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 8 Mar 2018 10:05:49 -0300
perf pmu: Auto-merge PMU events created by prefix or glob match
Auto-merge for these events was disabled when auto-merging of non-alias events was disabled in commit 63ce844 (perf stat: Only auto-merge events that are PMU aliases).
Non-merging of legacy events is preserved:
$ perf stat -ag -e cache-misses,cache-misses sleep 1
Performance counter stats for 'system wide':
86,323 cache-misses
86,323 cache-misses
1.002623307 seconds time elapsedBut prefix or glob matching auto-merges the events created:
$ perf stat -a -e l3cache/read-miss/ sleep 1
Performance counter stats for 'system wide':
328 l3cache/read-miss/
1.002627008 seconds time elapsed
$ perf stat -a -e l3cache_0_[01]/read-miss/ sleep 1
Performance counter stats for 'system wide':
172 l3cache/read-miss/
1.002627008 seconds time elapsedAs with events created with aliases, auto-merging can be suppressed with the --no-merge option:
$ perf stat -a -e l3cache/read-miss/ --no-merge sleep 1
Performance counter stats for 'system wide':
67 l3cache/read-miss/
67 l3cache/read-miss/
63 l3cache/read-miss/
60 l3cache/read-miss/
1.002622192 seconds time elapsed
--- tools/perf/Documentation/perf-stat.txt | 14 +++++++++----- tools/perf/util/parse-events.c | 13 +++---------- tools/perf/util/parse-events.h | 2 +- tools/perf/util/parse-events.y | 4 ++-- 4 files changed, 15 insertions(+), 18 deletions(-)
tools/perf/Documentation/perf-stat.txt +9 -5
@@ -267,11 +267,15 @@ taskset. --no-merge:: Do not merge results from same PMUs. -When multiple events are created from a single event alias, stat will, -by default, aggregate the event counts and show the result in a single -row. This option disables that behavior and shows the individual events -and counts. Aliases are listed immediately after the Kernel PMU events -by perf list. +When multiple events are created from a single event specification, +stat will, by default, aggregate the event counts and show the result +in a single row. This option disables that behavior and shows +the individual events and counts. + +Multiple events are created from a single event specification when: +1. Prefix or glob matching is used for the PMU name. +2. Aliases, which are listed immediately after the Kernel PMU events + by perf list, are used. --smi-cost:: Measure SMI cost if msr/aperf/ and msr/smi/ events are supported.
tools/perf/util/parse-events.c +3 -10
@@ -1217,7 +1217,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state, get_config_name(head_config), &config_terms); } -static int __parse_events_add_pmu (struct parse_events_state *parse_state, +int parse_events_add_pmu (struct parse_events_state *parse_state,struct list_head *list,char *name,struct list_head *head_config,bool auto_merge_stats) {
@@ -1287,13 +1287,6 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state,return evsel ?0 : -ENOMEM ; } -int parse_events_add_pmu (struct parse_events_state *parse_state, -struct list_head *list,char *name, -struct list_head *head_config) -{ -return __parse_events_add_pmu (parse_state, list, name, head_config, false); -} -int parse_events_multi_pmu_add (struct parse_events_state *parse_state,char *str,struct list_head **listp) {
@@ -1323,8 +1316,8 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,return -1 ;list_add_tail (&term->list, head); -if (!__parse_events_add_pmu (parse_state, list, - pmu->name, head, true)) { +if (!parse_events_add_pmu (parse_state, list, + pmu->name, head, true)) {pr_debug ("%s -> %s/%s/\n" , str, pmu->name, alias->str); ok++;
tools/perf/util/parse-events.h +1 -1
@@ -167,7 +167,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx, void *ptr, char *type, u64 len);int parse_events_add_pmu (struct parse_events_state *parse_state,struct list_head *list,char *name, -struct list_head *head_config); +struct list_head *head_config,bool auto_merge_stats); int parse_events_multi_pmu_add(struct parse_events_state *parse_state, char *str,
tools/perf/util/parse-events.y +2 -2
@@ -232,7 +232,7 @@ PE_NAME opt_event_config YYABORT; ALLOC_LIST(list); - if (parse_events_add_pmu(_parse_state, list, $1, $2)) { + if (parse_events_add_pmu(_parse_state, list, $1, $2, false)) { struct perf_pmu *pmu = NULL; int ok = 0; char *pattern;
@@ -251,7 +251,7 @@ PE_NAME opt_event_config free(pattern); YYABORT; } - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms)) + if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true)) ok++; parse_events_terms__delete(terms); }
Quoted 11 lines · Agustin Vega-Frias
This series of patches adds some simple improvements to the way perf stat handles PMUs that have multiple instances by:
1. Adding glob-like matching in addition to the prefix-based matching introduced previously (patch 1).
2. Adding the ability to recover the PMU names when printing the events separately with the --no-merge option (patch 2).
3. Restoring auto-merge for events created by prefix or glob-like match (patch 3). Note that this still keeps the behavior that disables auto-merging of legacy symbolic events (e.g. cycles).
Quoted 5 lines
V3:
- Consolidated prefix and glob matching into a single glob match with a trailing * to maintain prefix matching and have more consistent behavior. E.g., all of these match all the
uncore_imcPMUs: imc, imc*, *imc, *imc*
thanks,
jirka
Em Wed, Mar 07, 2018 at 11:04:08AM +0100, Jiri Olsa escreveu:
Quoted 12 lines · Agustin Vega-Frias
Quoted 11 lines
This series of patches adds some simple improvements to the way perf stat handles PMUs that have multiple instances by:
1. Adding glob-like matching in addition to the prefix-based matching introduced previously (patch 1).
2. Adding the ability to recover the PMU names when printing the events separately with the --no-merge option (patch 2).
3. Restoring auto-merge for events created by prefix or glob-like match (patch 3). Note that this still keeps the behavior that disables auto-merging of legacy symbolic events (e.g. cycles).
Quoted 7 lines
Quoted 5 lines
V3:
- Consolidated prefix and glob matching into a single glob match with a trailing * to maintain prefix matching and have more consistent behavior. E.g., all of these match all the
uncore_imcPMUs: imc, imc*, *imc, *imc*Acked-by Jiri Olsa <[email protected]>
Thanks, applied.
I guess Andi had Acked or Reviewed this, no?
- Arnaldo
Quoted 19 lines · Arnaldo Carvalho de Melo
Em Wed, Mar 07, 2018 at 11:04:08AM +0100, Jiri Olsa escreveu:
Quoted 18 lines · Agustin Vega-Frias
Quoted 16 lines
This series of patches adds some simple improvements to the way perf stat handles PMUs that have multiple instances by:
1. Adding glob-like matching in addition to the prefix-based matching introduced previously (patch 1).
2. Adding the ability to recover the PMU names when printing the events separately with the --no-merge option (patch 2).
3. Restoring auto-merge for events created by prefix or glob-like match (patch 3). Note that this still keeps the behavior that disables auto-merging of legacy symbolic events (e.g. cycles).V3:
- Consolidated prefix and glob matching into a single glob match with a trailing * to maintain prefix matching and have more consistent behavior. E.g., all of these match all the
uncore_imcPMUs: imc, imc*, *imc, *imc*
Quoted 5 lines
Quoted 1 line
Acked-by Jiri Olsa <[email protected]>Thanks, applied.
I guess Andi had Acked or Reviewed this, no?
not the latest version.. please wait for his ack
jirka
Arnaldo Carvalho de Melo
maintainerEm Wed, Mar 07, 2018 at 02:51:05PM +0100, Jiri Olsa escreveu:
Quoted 20 lines · Arnaldo Carvalho de Melo
Quoted 19 lines
Em Wed, Mar 07, 2018 at 11:04:08AM +0100, Jiri Olsa escreveu:
Quoted 18 lines · Agustin Vega-Frias
Quoted 16 lines
This series of patches adds some simple improvements to the way perf stat handles PMUs that have multiple instances by:
1. Adding glob-like matching in addition to the prefix-based matching introduced previously (patch 1).
2. Adding the ability to recover the PMU names when printing the events separately with the --no-merge option (patch 2).
3. Restoring auto-merge for events created by prefix or glob-like match (patch 3). Note that this still keeps the behavior that disables auto-merging of legacy symbolic events (e.g. cycles).V3:
- Consolidated prefix and glob matching into a single glob match with a trailing * to maintain prefix matching and have more consistent behavior. E.g., all of these match all the
uncore_imcPMUs: imc, imc*, *imc, *imc*
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Acked-by Jiri Olsa <[email protected]>Thanks, applied.
I guess Andi had Acked or Reviewed this, no?
not the latest version.. please wait for his ack
Sure, I have this applied to my local branch, and will add his acks or drop the patches if he still has any objection, Andi?
- Arnaldo
Andi Kleen
Acked-byQuoted 2 lines
Sure, I have this applied to my local branch, and will add his acks or drop the patches if he still has any objection, Andi?
Patches looks good to me.
-Andi