Skip to contentSkip to conversation

perf diff: Add new filter options

PATCH Superseded Jin Yao 2 participants 8 messages Feb 25, 2019 perf events

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Jin Yao

author
#0 lore raw

cover perf diff: Add new filter options

This patch series creates following new filter options for perf diff.

--time:
It supports time percent with multipe time ranges. Time string is 'a%/n,b%/m,...' or 'a%-b%,c%-%d,...'.

For example:

Select the second 10% time slice to diff:
perf diff --time 10%/2

Select from 0% to 10% time slice to diff:
perf diff --time 0%-10%

Select the first and the second 10% time slices to diff:
perf diff --time 10%/1,10%/2

Select from 0% to 10% and 30% to 40% slices to diff:
perf diff --time 0%-10%,30%-40%

It also supports to analyze samples within given time window as:
<start>,<stop>. Times have the format seconds.microseconds. If start is not given (i.e., time string is ',x.y') then analysis starts at the beginning of the file. If stop time is not given (i.e, time string is 'x.y,') then analysis goes to end of file. Time string is 'a1.b1,c1.d1:a2.b2,c2.d2'. Use ':' to separate timestamps for different perf.data files.

For example, we get the timestamp information from perf script.

perf script -i perf.data.old
mgen 13940 [000] 3946.361400: ...

perf script -i perf.data
mgen 13940 [000] 3971.150589 ...

perf diff --time 3946.361400,:3971.150589,

It analyzes the perf.data.old from the timestamp 3946.361400 to the end of perf.data.old and analyzes the perf.data from the timestamp 3971.150589 to the end of perf.data.

--cpu:
Only diff samples for the list of CPUs provided. Multiple CPUs can be provided as a comma-separated list with no space: 0,1. Ranges of CPUs are specified with -: 0-2. Default is to report samples on all CPUs.

For example:
perf diff --cpu 0,1

It only diff the samples for CPU0 and CPU1.

--pid:
Only diff samples for given process ID (comma separated list).

--tid:
Only diff samples for given thread ID (comma separated list).

For example,
perf diff --tid 13965

It only diff the samples for thread 13965.

Jin Yao (3):
perf diff: Support --time filter option
perf diff: Support --cpu filter option
perf diff: Support --pid/--tid filter options

 tools/perf/Documentation/perf-diff.txt |  52 ++++++++++
 tools/perf/builtin-diff.c              | 174 ++++++++++++++++++++++++++++++---
 2 files changed, 213 insertions(+), 13 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/3 perf diff: Support --time filter option

For better support for perf diff, it would be useful to add --time filter option to diff the samples within given time window.

It supports time percent with multipe time ranges. Time string is 'a%/n,b%/m,...' or 'a%-b%,c%-%d,...'.

For example:

Select the second 10% time slice to diff:
perf diff --time 10%/2

Select from 0% to 10% time slice to diff:
perf diff --time 0%-10%

Select the first and the second 10% time slices to diff:
perf diff --time 10%/1,10%/2

Select from 0% to 10% and 30% to 40% slices to diff:
perf diff --time 0%-10%,30%-40%

It also supports to analyze samples within given time window as:
<start>,<stop>. Times have the format seconds.microseconds. If start is not given (i.e., time string is ',x.y') then analysis starts at the beginning of the file. If stop time is not given (i.e, time string is 'x.y,') then analysis goes to end of file. Time string is 'a1.b1,c1.d1:a2.b2,c2.d2'. Use ':' to separate timestamps for different perf.data files.

For example, we get the timestamp information from perf script.

perf script -i perf.data.old
mgen 13940 [000] 3946.361400: ...

perf script -i perf.data
mgen 13940 [000] 3971.150589 ...

perf diff --time 3946.361400,:3971.150589,

It analyzes the perf.data.old from the timestamp 3946.361400 to the end of perf.data.old and analyzes the perf.data from the timestamp 3971.150589 to the end of perf.data.

---
 tools/perf/Documentation/perf-diff.txt |  41 +++++++++
 tools/perf/builtin-diff.c              | 154 ++++++++++++++++++++++++++++++---
 2 files changed, 182 insertions(+), 13 deletions(-)
tools/perf/Documentation/perf-diff.txt +41 -0
index a79c84a..5bfe876 100644
@@ -118,6 +118,47 @@ OPTIONS
 	sum of shown entries will be always 100%.  "absolute" means it retains
 	the original value before and after the filter is applied.
 
+--time::
+	Analyze samples within given time window. It supports time
+	percent with multipe time ranges. Time string is 'a%/n,b%/m,...'
+	or 'a%-b%,c%-%d,...'.
+
+	For example:
+
+	Select the second 10% time slice to diff:
+	perf diff --time 10%/2
+
+	Select from 0% to 10% time slice to diff:
+	perf diff --time 0%-10%
+
+	Select the first and the second 10% time slices to diff:
+	perf diff --time 10%/1,10%/2
+
+	Select from 0% to 10% and 30% to 40% slices to diff:
+	perf diff --time 0%-10%,30%-40%
+
+	It also supports to analyze samples within given time window:
+	<start>,<stop>. Times have the format seconds.microseconds. If start
+	is not given (i.e., time string is ',x.y') then analysis starts at
+	the beginning of the file. If stop time is not given (i.e, time
+	string is 'x.y,') then analysis goes to end of file. Time string is
+	'a1.b1,c1.d1:a2.b2,c2.d2'. Use ':' to separate timestamps for different
+	perf.data files.
+
+	For example, we get the timestamp information from perf script.
+
+	perf script -i perf.data.old
+	  mgen 13940 [000]  3946.361400: ...
+
+	perf script -i perf.data
+	  mgen 13940 [000]  3971.150589 ...
+
+	perf diff --time 3946.361400,:3971.150589,
+
+	It analyzes the perf.data.old from the timestamp 3946.361400 to
+	the end of perf.data.old and analyzes the perf.data from the
+	timestamp 3971.150589 to the end of perf.data.
+
 COMPARISON
 ----------
 The comparison is governed by the baseline file. The baseline perf.data
tools/perf/builtin-diff.c +141 -13

217 lines not on this page · raw message

Signature · 1 line
2.7.4
#2 lore raw

Re: [PATCH v1 1/3] perf diff: Support --time filter option

On Mon, Feb 25, 2019 at 09:42:42PM +0800, Jin Yao wrote:

SNIP

Quoted 14 lines

COMPARISON
----------
The comparison is governed by the baseline file. The baseline perf.data

tools/perf/builtin-diff.c +1 -0
index 751e197..ddc41e7 100644
@@ -19,12 +19,21 @@
 #include "util/util.h"
 #include "util/data.h"
 #include "util/config.h"
+#include "util/time-utils.h"
 
 #include <errno.h>

tools/perf/builtin-diff.c line 34

Quoted 10 lines
tools/perf/builtin-diff.c +6 -0
 #include <inttypes.h>
 #include <stdlib.h>
 #include <math.h>
 
+struct perf_diff {
+	struct perf_tool	tool;
+	const char		*time_str;
+	struct perf_time_interval *ptime_range;
+	int			range_size;
+	int			range_num;

please align the members

Quoted 17 lines
tools/perf/builtin-diff.c +13 -0
 static int __cmd_diff(void)
 {
 	struct data__file *d;
 	int ret = -EINVAL, i;
+	char *abstime_ostr = NULL, *abstime_tmp = NULL;
+	bool abstime = false;
+
+	if (pdiff.time_str && strchr(pdiff.time_str, ':')) {
+		abstime = true;
+		pdiff.ptime_range = perf_time__range_alloc(NULL,
+							   &pdiff.range_size);
+	} else {
+		pdiff.ptime_range = perf_time__range_alloc(pdiff.time_str,
+							   &pdiff.range_size);
+	}
+
+	if (!pdiff.ptime_range)

tools/perf/builtin-diff.c static void data__free(struct data__file *d) · line 886

Quoted 10 lines
tools/perf/builtin-diff.c +10 -0
+		return -ENOMEM;
+
+	if (abstime) {
+		abstime_ostr = strdup(pdiff.time_str);
+		if (!abstime_ostr) {
+			zfree(&pdiff.ptime_range);
+			return -ENOMEM;
+		}
+		abstime_tmp = abstime_ostr;
+	}

could you please put this in separate function?

Quoted 12 lines
tools/perf/builtin-diff.c +3 -1
 	data__for_each_file(i, d) {
-		d->session = perf_session__new(&d->data, false, &tool);
+		d->session = perf_session__new(&d->data, false, &pdiff.tool);
 		if (!d->session) {
 			pr_err("Failed to open %s\n", d->data.file.path);
 			ret = -1;
 			goto out_delete;
 		}
 
+		if (abstime) {
+			ret = parse_absolute_time(d, &abstime_tmp);

tools/perf/builtin-diff.c static void data__free(struct data__file *d) · line 907

Quoted 10 lines
tools/perf/builtin-diff.c +10 -0
+			if (ret < 0)
+				goto out_delete;
+		} else if (pdiff.time_str) {
+			ret = parse_percent_time(d);
+			if (ret < 0)
+				goto out_delete;
+		} else {
+			pdiff.range_num = 1;
+		}
+

and this as well

thanks,
jirka

author
#3 lore raw

Re: [PATCH v1 1/3] perf diff: Support --time filter option

Quoted 22 lines · Jiri Olsa

On Mon, Feb 25, 2019 at 09:42:42PM +0800, Jin Yao wrote:

SNIP

Quoted 18 lines

COMPARISON
----------
The comparison is governed by the baseline file. The baseline perf.data

tools/perf/builtin-diff.c +1 -0
index 751e197..ddc41e7 100644
@@ -19,12 +19,21 @@
  #include "util/util.h"
  #include "util/data.h"
  #include "util/config.h"
+#include "util/time-utils.h"
 
  #include <errno.h>
  #include <inttypes.h>
  #include <stdlib.h>
  #include <math.h>
 
Quoted 9 lines

tools/perf/builtin-diff.c line 34

Quoted 6 lines
tools/perf/builtin-diff.c +6 -0
+struct perf_diff {
+	struct perf_tool	tool;
+	const char		*time_str;
+	struct perf_time_interval *ptime_range;
+	int			range_size;
+	int			range_num;

please align the members

Not aligned? Sorry, could you give me an example?

Quoted 21 lines
Quoted 21 lines
tools/perf/builtin-diff.c +17 -0
  static int __cmd_diff(void)
  {
  	struct data__file *d;
  	int ret = -EINVAL, i;
+	char *abstime_ostr = NULL, *abstime_tmp = NULL;
+	bool abstime = false;
+
+	if (pdiff.time_str && strchr(pdiff.time_str, ':')) {
+		abstime = true;
+		pdiff.ptime_range = perf_time__range_alloc(NULL,
+							   &pdiff.range_size);
+	} else {
+		pdiff.ptime_range = perf_time__range_alloc(pdiff.time_str,
+							   &pdiff.range_size);
+	}
+
+	if (!pdiff.ptime_range)
+		return -ENOMEM;
+
+	if (abstime) {
+		abstime_ostr = strdup(pdiff.time_str);
Quoted 10 lines

tools/perf/builtin-diff.c static void data__free(struct data__file *d) · line 886

Quoted 6 lines
tools/perf/builtin-diff.c +6 -0
+		if (!abstime_ostr) {
+			zfree(&pdiff.ptime_range);
+			return -ENOMEM;
+		}
+		abstime_tmp = abstime_ostr;
+	}

could you please put this in separate function?

Sure, I will put this in a separate function.

Quoted 10 lines
Quoted 10 lines
  
  	data__for_each_file(i, d) {
tools/perf/builtin-diff.c +1 -1
-		d->session = perf_session__new(&d->data, false, &tool);
+		d->session = perf_session__new(&d->data, false, &pdiff.tool);
  		if (!d->session) {
  			pr_err("Failed to open %s\n", d->data.file.path);
  			ret = -1;
  			goto out_delete;
  		}
Quoted 15 lines

tools/perf/builtin-diff.c static void data__free(struct data__file *d) · line 907

Quoted 12 lines
tools/perf/builtin-diff.c +12 -0
+		if (abstime) {
+			ret = parse_absolute_time(d, &abstime_tmp);
+			if (ret < 0)
+				goto out_delete;
+		} else if (pdiff.time_str) {
+			ret = parse_percent_time(d);
+			if (ret < 0)
+				goto out_delete;
+		} else {
+			pdiff.range_num = 1;
+		}
+

and this as well

OK.

Thanks
Jin Yao

Quoted 3 lines

thanks,
jirka

#4 lore raw

Re: [PATCH v1 1/3] perf diff: Support --time filter option

Quoted 33 lines · Yao
Quoted 20 lines · Jiri Olsa

On Mon, Feb 25, 2019 at 09:42:42PM +0800, Jin Yao wrote:

SNIP

Quoted 16 lines

COMPARISON
----------
The comparison is governed by the baseline file. The baseline perf.data

tools/perf/builtin-diff.c +1 -0
index 751e197..ddc41e7 100644
@@ -19,12 +19,21 @@
  #include "util/util.h"
  #include "util/data.h"
  #include "util/config.h"
+#include "util/time-utils.h"
  #include <errno.h>
  #include <inttypes.h>
  #include <stdlib.h>
  #include <math.h>
Quoted 9 lines

tools/perf/builtin-diff.c line 34

Quoted 6 lines
tools/perf/builtin-diff.c +6 -0
+struct perf_diff {
+	struct perf_tool	tool;
+	const char		*time_str;
+	struct perf_time_interval *ptime_range;
+	int			range_size;
+	int			range_num;

please align the members

Quoted 1 line

Not aligned? Sorry, could you give me an example?

one extra tab before the name:

	struct perf_tool		 tool;
	const char			*time_str;
	struct perf_time_interval	*ptime_range;
	int				 range_size;
	int				 range_num;

jirka

author
#5 lore raw

Re: [PATCH v1 1/3] perf diff: Support --time filter option

Quoted 38 lines · Jiri Olsa
Quoted 33 lines · Yao
Quoted 20 lines · Jiri Olsa

On Mon, Feb 25, 2019 at 09:42:42PM +0800, Jin Yao wrote:

SNIP

Quoted 16 lines

COMPARISON
----------
The comparison is governed by the baseline file. The baseline perf.data

tools/perf/builtin-diff.c +1 -0
index 751e197..ddc41e7 100644
@@ -19,12 +19,21 @@
   #include "util/util.h"
   #include "util/data.h"
   #include "util/config.h"
+#include "util/time-utils.h"
   #include <errno.h>
   #include <inttypes.h>
   #include <stdlib.h>
   #include <math.h>
Quoted 9 lines

tools/perf/builtin-diff.c line 34

Quoted 6 lines
tools/perf/builtin-diff.c +6 -0
+struct perf_diff {
+	struct perf_tool	tool;
+	const char		*time_str;
+	struct perf_time_interval *ptime_range;
+	int			range_size;
+	int			range_num;

please align the members

Quoted 1 line

Not aligned? Sorry, could you give me an example?

one extra tab before the name:

Quoted 8 lines
	struct perf_tool		 tool;
	const char			*time_str;
	struct perf_time_interval	*ptime_range;
	int				 range_size;
	int				 range_num;

jirka

Oh, I see, thanks so much!

Thanks
Jin Yao

author
#6 lore raw

PATCH 2/3 perf diff: Support --cpu filter option

In reply to Jin Yao

For better support for perf diff, it would be useful to add --cpu filter option.

Multiple CPUs can be provided as a comma-separated list with no space: 0,1. Ranges of CPUs are specified with -: 0-2. Default is to report samples on all CPUs.

For example,

perf diff --cpu 0,1

It only diff the samples for CPU0 and CPU1.

---
 tools/perf/Documentation/perf-diff.txt |  5 +++++
 tools/perf/builtin-diff.c              | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)
tools/perf/Documentation/perf-diff.txt +5 -0
index 5bfe876..ed13b3f 100644
@@ -159,6 +159,11 @@ OPTIONS
 	the end of perf.data.old and analyzes the perf.data from the
 	timestamp 3971.150589 to the end of perf.data.
 
+--cpu:: Only diff samples for the list of CPUs provided. Multiple CPUs can
+	be provided as a comma-separated list with no space: 0,1. Ranges of
+	CPUs are specified with -: 0-2. Default is to report samples on all
+	CPUs.
+
 COMPARISON
 ----------
 The comparison is governed by the baseline file. The baseline perf.data
tools/perf/builtin-diff.c +16 -0
index ddc41e7..319fbc9 100644
@@ -83,6 +83,9 @@ static unsigned int sort_compute = 1;
 static s64 compute_wdiff_w1;
 static s64 compute_wdiff_w2;
 
+static const char		*cpu_list;
+static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
+
 enum {
 	COMPUTE_DELTA,
 	COMPUTE_RATIO,
@@ -354,6 +357,11 @@ static int diff__process_sample_event(struct perf_tool *tool,
 		return -1;
 	}
 
+	if (cpu_list && !test_bit(sample->cpu, cpu_bitmap)) {
+		ret = 0;
+		goto out_put;
+	}
+
 	if (!hists__add_entry(hists, &al, NULL, NULL, NULL, sample, true)) {
 		pr_warning("problem incrementing symbol period, skipping event\n");
 		goto out_put;
@@ -905,6 +913,13 @@ static int __cmd_diff(void)
 			pdiff.range_num = 1;
 		}
 
+		if (cpu_list) {
+			ret = perf_session__cpu_bitmap(d->session, cpu_list,
+						       cpu_bitmap);
+			if (ret < 0)
+				goto out_delete;
+		}
+
 		ret = perf_session__process_events(d->session);
 		if (ret) {
 			pr_err("Failed to process %s\n", d->data.file.path);
@@ -977,6 +992,7 @@ static const struct option options[] = {
 		     "How to display percentage of filtered entries", parse_filter_percentage),
 	OPT_STRING(0, "time", &pdiff.time_str, "str",
 		   "Time span (time percent or absolute timestamp)"),
+	OPT_STRING(0, "cpu", &cpu_list, "cpu", "list of cpus to profile"),
 	OPT_END()
 };
 
Signature · 1 line
2.7.4
author
#7 lore raw

PATCH 3/3 perf diff: Support --pid/--tid filter options

In reply to Jin Yao

For better filtering support for perf diff, it would be useful to add --pid and --tid filter options.

For example,
perf diff --tid 13965

It only diff the samples for thread 13965.

---
 tools/perf/Documentation/perf-diff.txt | 6 ++++++
 tools/perf/builtin-diff.c              | 4 ++++
 2 files changed, 10 insertions(+)
tools/perf/Documentation/perf-diff.txt +6 -0
index ed13b3f..83c9496 100644
@@ -164,6 +164,12 @@ OPTIONS
 	CPUs are specified with -: 0-2. Default is to report samples on all
 	CPUs.
 
+--pid=::
+	Only diff samples for given process ID (comma separated list).
+
+--tid=::
+	Only diff samples for given thread ID (comma separated list).
+
 COMPARISON
 ----------
 The comparison is governed by the baseline file. The baseline perf.data
tools/perf/builtin-diff.c +4 -0
index 319fbc9..9053eda 100644
@@ -993,6 +993,10 @@ static const struct option options[] = {
 	OPT_STRING(0, "time", &pdiff.time_str, "str",
 		   "Time span (time percent or absolute timestamp)"),
 	OPT_STRING(0, "cpu", &cpu_list, "cpu", "list of cpus to profile"),
+	OPT_STRING(0, "pid", &symbol_conf.pid_list_str, "pid[,pid...]",
+		   "only consider symbols in these pids"),
+	OPT_STRING(0, "tid", &symbol_conf.tid_list_str, "tid[,tid...]",
+		   "only consider symbols in these tids"),
 	OPT_END()
 };
 
Signature · 1 line
2.7.4