[RFC V2 3/3] perf pmu: Auto-merge PMU events created by prefix or glob match

[Agustin Vega-Frias]

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 elapsed

But 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 elapsed

As 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

Signed-off-by: Agustin Vega-Frias 
---
 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(-)

diff --git a/tools/perf/Documentation/perf-stat.txt 
b/tools/perf/Documentation/perf-stat.txt
index 49983a7..ae406f7 100644
--- a/tools/perf/Documentation/perf-stat.txt
+++ b/tools/perf/Documentation/perf-stat.txt
@@ -252,11 +252,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.
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index bafc91e..4e80ca3 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1217,7 +1217,7 @@ int parse_events_add_numeric(struct parse_events_state 
*parse_state,
 get_config_name(head_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(>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++;
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 88108cd..5015cfd 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -167,7 +167,7 @@ int parse_events_add_breakpoint(struct list_head 

[RFC V2 3/3] perf pmu: Auto-merge PMU events created by prefix or glob match

[Agustin Vega-Frias]

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 elapsed

But 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 elapsed

As 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

Signed-off-by: Agustin Vega-Frias 
---
 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(-)

diff --git a/tools/perf/Documentation/perf-stat.txt 
b/tools/perf/Documentation/perf-stat.txt
index 49983a7..ae406f7 100644
--- a/tools/perf/Documentation/perf-stat.txt
+++ b/tools/perf/Documentation/perf-stat.txt
@@ -252,11 +252,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.
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index bafc91e..4e80ca3 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1217,7 +1217,7 @@ int parse_events_add_numeric(struct parse_events_state 
*parse_state,
 get_config_name(head_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(>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++;
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 88108cd..5015cfd 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -167,7 +167,7 @@ int parse_events_add_breakpoint(struct list_head *list, int 
*idx,