Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1724490 > unrolled thread

[PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases

Started byArnaldo Carvalho de Melo <acme@kernel.org>
First post2017-08-31 20:50 +0200
Last post2017-09-05 07:30 +0200
Articles 5 — 5 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-08-31 20:50 +0200
    Re: [PATCH 1/1] perf stat: Only auto-merge events that are PMU  aliases Andi Kleen <ak@linux.intel.com> - 2017-08-31 21:10 +0200
    Re: [PATCH 1/1] perf stat: Only auto-merge events that are PMU  aliases Peter Zijlstra <peterz@infradead.org> - 2017-09-01 13:30 +0200
    Re: [PATCH 1/1] perf stat: Only auto-merge events that are PMU  aliases Jiri Olsa <jolsa@redhat.com> - 2017-09-01 18:20 +0200
    [tip:perf/urgent] perf stat: Only auto-merge events that are PMU  aliases tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com> - 2017-09-05 07:30 +0200

#1724490 — [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases

FromArnaldo Carvalho de Melo <acme@kernel.org>
Date2017-08-31 20:50 +0200
Subject[PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases
Message-ID<ukCHo-Qu-21@gated-at.bofh.it>
Hi Andi, Jiri,

	Please check the patch below, would be glad to have your acks,

- Arnaldo

Peter reported that when he explicitely asked for multiple events with
the same name on the command line it got coalesced into just one line,
i.e.:

   # perf stat -e cycles -e cycles -e cycles usleep 1

   Performance counter stats for 'usleep 1':

         3,269,652      cycles

       0.000884123 seconds time elapsed

  #

And while there is the --no-merges option to disable that auto-merging, this is
an blunt change in behaviour for such explicit request, so change the code so
that this auto merging is done only when handling the multi PMU aliases with
the same name that introduced this coalescing, restoring the previous behaviour
for explicit case:

  # perf stat -e cycles -e cycles -e cycles usleep 1

   Performance counter stats for 'usleep 1':

         1,472,837      cycles
         1,472,837      cycles
         1,472,837      cycles

       0.001764870 seconds time elapsed

  #

Reported-by: Peter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 430daf2dc7af ("perf stat: Collapse identically named events")
Link: http://lkml.kernel.org/n/tip-phjedddz2oe8udy9co3alo7d@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-stat.c      |  2 +-
 tools/perf/util/evsel.h        |  1 +
 tools/perf/util/parse-events.c | 24 ++++++++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 866da7aa54bf..85e992d9215b 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1257,7 +1257,7 @@ static bool collect_data(struct perf_evsel *counter,
 	if (counter->merged_stat)
 		return false;
 	cb(counter, data, true);
-	if (!no_merge)
+	if (!no_merge && counter->auto_merge_stats)
 		collect_all_aliases(counter, cb, data);
 	return true;
 }
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 351d3b2d8887..dd2c4b5112a5 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -131,6 +131,7 @@ struct perf_evsel {
 	bool			cmdline_group_boundary;
 	struct list_head	config_terms;
 	int			bpf_fd;
+	bool			auto_merge_stats;
 	bool			merged_stat;
 	const char *		metric_expr;
 	const char *		metric_name;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index f44aeba51d1f..f6257fb4f08c 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -310,7 +310,7 @@ static struct perf_evsel *
 __add_event(struct list_head *list, int *idx,
 	    struct perf_event_attr *attr,
 	    char *name, struct cpu_map *cpus,
-	    struct list_head *config_terms)
+	    struct list_head *config_terms, bool auto_merge_stats)
 {
 	struct perf_evsel *evsel;
 
@@ -324,6 +324,7 @@ __add_event(struct list_head *list, int *idx,
 	evsel->cpus        = cpu_map__get(cpus);
 	evsel->own_cpus    = cpu_map__get(cpus);
 	evsel->system_wide = !!cpus;
+	evsel->auto_merge_stats = auto_merge_stats;
 
 	if (name)
 		evsel->name = strdup(name);
@@ -339,7 +340,7 @@ 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) ? 0 : -ENOMEM;
+	return __add_event(list, idx, attr, name, NULL, config_terms, false) ? 0 : -ENOMEM;
 }
 
 static int parse_aliases(char *str, const char *names[][PERF_EVSEL__MAX_ALIASES], int size)
@@ -1209,9 +1210,9 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
 			 get_config_name(head_config), &config_terms);
 }
 
-int parse_events_add_pmu(struct parse_events_state *parse_state,
+static 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)
 {
 	struct perf_event_attr attr;
 	struct perf_pmu_info info;
@@ -1232,7 +1233,7 @@ 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->cpus, NULL);
+		evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu->cpus, NULL, auto_merge_stats);
 		return evsel ? 0 : -ENOMEM;
 	}
 
@@ -1254,7 +1255,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 
 	evsel = __add_event(list, &parse_state->idx, &attr,
 			    get_config_name(head_config), pmu->cpus,
-			    &config_terms);
+			    &config_terms, auto_merge_stats);
 	if (evsel) {
 		evsel->unit = info.unit;
 		evsel->scale = info.scale;
@@ -1267,6 +1268,13 @@ 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)
 {
@@ -1296,8 +1304,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)) {
+				if (!__parse_events_add_pmu(parse_state, list,
+							    pmu->name, head, true)) {
 					pr_debug("%s -> %s/%s/\n", str,
 						 pmu->name, alias->str);
 					ok++;
-- 
2.13.5

[toc] | [next] | [standalone]

#1724501 — Re: [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases

FromAndi Kleen <ak@linux.intel.com>
Date2017-08-31 21:10 +0200
SubjectRe: [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases
Message-ID<ukD0J-1eW-9@gated-at.bofh.it>
In reply to#1724490
Acked-by: Andi Kleen <ak@linux.intel.com>

[toc] | [prev] | [next] | [standalone]

#1724985 — Re: [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases

FromPeter Zijlstra <peterz@infradead.org>
Date2017-09-01 13:30 +0200
SubjectRe: [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases
Message-ID<ukSj7-3ya-15@gated-at.bofh.it>
In reply to#1724490
On Thu, Aug 31, 2017 at 03:41:22PM -0300, Arnaldo Carvalho de Melo wrote:
> Hi Andi, Jiri,
> 
> 	Please check the patch below, would be glad to have your acks,
> 
> - Arnaldo
> 
> Peter reported that when he explicitely asked for multiple events with
> the same name on the command line it got coalesced into just one line,
> i.e.:
> 
>    # perf stat -e cycles -e cycles -e cycles usleep 1
> 
>    Performance counter stats for 'usleep 1':
> 
>          3,269,652      cycles
> 
>        0.000884123 seconds time elapsed
> 
>   #
> 
> And while there is the --no-merges option to disable that auto-merging, this is
> an blunt change in behaviour for such explicit request, so change the code so
> that this auto merging is done only when handling the multi PMU aliases with
> the same name that introduced this coalescing, restoring the previous behaviour
> for explicit case:
> 
>   # perf stat -e cycles -e cycles -e cycles usleep 1
> 
>    Performance counter stats for 'usleep 1':
> 
>          1,472,837      cycles
>          1,472,837      cycles
>          1,472,837      cycles
> 
>        0.001764870 seconds time elapsed
> 
>   #
> 
> Reported-by: Peter Zijlstra <peterz@infradead.org>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Andi Kleen <ak@linux.intel.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Wang Nan <wangnan0@huawei.com>
> Fixes: 430daf2dc7af ("perf stat: Collapse identically named events")
> Link: http://lkml.kernel.org/n/tip-phjedddz2oe8udy9co3alo7d@git.kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Thanks Arnaldo!

[toc] | [prev] | [next] | [standalone]

#1725195 — Re: [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases

FromJiri Olsa <jolsa@redhat.com>
Date2017-09-01 18:20 +0200
SubjectRe: [PATCH 1/1] perf stat: Only auto-merge events that are PMU aliases
Message-ID<ukWPL-7rC-7@gated-at.bofh.it>
In reply to#1724490
On Thu, Aug 31, 2017 at 03:41:22PM -0300, Arnaldo Carvalho de Melo wrote:
> Hi Andi, Jiri,
> 
> 	Please check the patch below, would be glad to have your acks,
> 
> - Arnaldo
> 
> Peter reported that when he explicitely asked for multiple events with
> the same name on the command line it got coalesced into just one line,
> i.e.:
> 
>    # perf stat -e cycles -e cycles -e cycles usleep 1
> 
>    Performance counter stats for 'usleep 1':
> 
>          3,269,652      cycles
> 
>        0.000884123 seconds time elapsed

looks good 

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka

[toc] | [prev] | [next] | [standalone]

#1726341 — [tip:perf/urgent] perf stat: Only auto-merge events that are PMU aliases

Fromtip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com>
Date2017-09-05 07:30 +0200
Subject[tip:perf/urgent] perf stat: Only auto-merge events that are PMU aliases
Message-ID<umeAV-70c-3@gated-at.bofh.it>
In reply to#1724490
Commit-ID:  63ce8449bc1081711eef1add68909e9bd758de62
Gitweb:     http://git.kernel.org/tip/63ce8449bc1081711eef1add68909e9bd758de62
Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Thu, 31 Aug 2017 15:32:18 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 1 Sep 2017 14:48:59 -0300

perf stat: Only auto-merge events that are PMU aliases

Peter reported that when he explicitely asked for multiple events with
the same name on the command line it got coalesced into just one line,
i.e.:

   # perf stat -e cycles -e cycles -e cycles usleep 1

   Performance counter stats for 'usleep 1':

         3,269,652      cycles

       0.000884123 seconds time elapsed

  #

And while there is the --no-merges option to disable that auto-merging,
this is a blunt change in behaviour for such explicit request, so change
the code so that this auto merging is done only when handling the multi
PMU aliases with the same name that introduced this coalescing,
restoring the previous behaviour for the explicit case:

  # perf stat -e cycles -e cycles -e cycles usleep 1

   Performance counter stats for 'usleep 1':

         1,472,837      cycles
         1,472,837      cycles
         1,472,837      cycles

       0.001764870 seconds time elapsed

  #

Reported-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 430daf2dc7af ("perf stat: Collapse identically named events")
Link: http://lkml.kernel.org/r/20170831184122.GK4831@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-stat.c      |  2 +-
 tools/perf/util/evsel.h        |  1 +
 tools/perf/util/parse-events.c | 24 ++++++++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 866da7a..85e992d 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1257,7 +1257,7 @@ static bool collect_data(struct perf_evsel *counter,
 	if (counter->merged_stat)
 		return false;
 	cb(counter, data, true);
-	if (!no_merge)
+	if (!no_merge && counter->auto_merge_stats)
 		collect_all_aliases(counter, cb, data);
 	return true;
 }
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 351d3b2..dd2c4b5 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -131,6 +131,7 @@ struct perf_evsel {
 	bool			cmdline_group_boundary;
 	struct list_head	config_terms;
 	int			bpf_fd;
+	bool			auto_merge_stats;
 	bool			merged_stat;
 	const char *		metric_expr;
 	const char *		metric_name;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index f44aeba..f6257fb 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -310,7 +310,7 @@ static struct perf_evsel *
 __add_event(struct list_head *list, int *idx,
 	    struct perf_event_attr *attr,
 	    char *name, struct cpu_map *cpus,
-	    struct list_head *config_terms)
+	    struct list_head *config_terms, bool auto_merge_stats)
 {
 	struct perf_evsel *evsel;
 
@@ -324,6 +324,7 @@ __add_event(struct list_head *list, int *idx,
 	evsel->cpus        = cpu_map__get(cpus);
 	evsel->own_cpus    = cpu_map__get(cpus);
 	evsel->system_wide = !!cpus;
+	evsel->auto_merge_stats = auto_merge_stats;
 
 	if (name)
 		evsel->name = strdup(name);
@@ -339,7 +340,7 @@ 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) ? 0 : -ENOMEM;
+	return __add_event(list, idx, attr, name, NULL, config_terms, false) ? 0 : -ENOMEM;
 }
 
 static int parse_aliases(char *str, const char *names[][PERF_EVSEL__MAX_ALIASES], int size)
@@ -1209,9 +1210,9 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
 			 get_config_name(head_config), &config_terms);
 }
 
-int parse_events_add_pmu(struct parse_events_state *parse_state,
+static 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)
 {
 	struct perf_event_attr attr;
 	struct perf_pmu_info info;
@@ -1232,7 +1233,7 @@ 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->cpus, NULL);
+		evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu->cpus, NULL, auto_merge_stats);
 		return evsel ? 0 : -ENOMEM;
 	}
 
@@ -1254,7 +1255,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
 
 	evsel = __add_event(list, &parse_state->idx, &attr,
 			    get_config_name(head_config), pmu->cpus,
-			    &config_terms);
+			    &config_terms, auto_merge_stats);
 	if (evsel) {
 		evsel->unit = info.unit;
 		evsel->scale = info.scale;
@@ -1267,6 +1268,13 @@ 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)
 {
@@ -1296,8 +1304,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)) {
+				if (!__parse_events_add_pmu(parse_state, list,
+							    pmu->name, head, true)) {
 					pr_debug("%s -> %s/%s/\n", str,
 						 pmu->name, alias->str);
 					ok++;

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web