Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61949b21 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf diff: Add -p option to display period values for hist entries 



Adding -p option to show period values for both compared hist entries.
Showing hist column PERF_HPP__PERIOD and newly added hist column
PERF_HPP__PERIOD_BASELINE.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1349448287-18919-6-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 81d5f958

tools/perf/Documentation/perf-diff.txt

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ OPTIONS 
        on the computation results.

        See COMPARISON METHODS section for more info.



-p::

--period::

        Show period values for both compared hist entries.



COMPARISON METHODS

------------------

delta

tools/perf/builtin-diff.c

+9 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ static char const *input_old = "perf.data.old", 
static char	  diff__default_sort_order[] = "dso,symbol";

static bool  force;

static bool show_displacement;

static bool show_period;

static bool show_baseline_only;

static bool sort_compute;
@@ -540,6 +541,8 @@ static const struct option options[] = { 
		     "delta,ratio,wdiff:w1,w2 (default delta)",

		     "Entries differential computation selection",

		     setup_compute),

	OPT_BOOLEAN('p', "period", &show_period,

		    "Show period values."),

	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,

		    "dump raw trace in ASCII"),

	OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
@@ -568,7 +571,7 @@ static void ui_init(void) 
	/* No overhead column. */

	perf_hpp__column_enable(PERF_HPP__OVERHEAD, false);



	/* Display baseline/delta/ratio/displacement columns. */

	/* Display baseline/delta/ratio/displacement/periods columns. */

	perf_hpp__column_enable(PERF_HPP__BASELINE, true);



	switch (compute) {
@@ -587,6 +590,11 @@ static void ui_init(void) 


	if (show_displacement)

		perf_hpp__column_enable(PERF_HPP__DISPL, true);



	if (show_period) {

		perf_hpp__column_enable(PERF_HPP__PERIOD, true);

		perf_hpp__column_enable(PERF_HPP__PERIOD_BASELINE, true);

	}

}



int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)

tools/perf/ui/hist.c

+21 −0
Original line number Diff line number Diff line
@@ -228,6 +228,26 @@ static int hpp__entry_period(struct perf_hpp *hpp, struct hist_entry *he) 
	return scnprintf(hpp->buf, hpp->size, fmt, he->stat.period);

}



static int hpp__header_period_baseline(struct perf_hpp *hpp)

{

	const char *fmt = symbol_conf.field_sep ? "%s" : "%12s";



	return scnprintf(hpp->buf, hpp->size, fmt, "Period Base");

}



static int hpp__width_period_baseline(struct perf_hpp *hpp __maybe_unused)

{

	return 12;

}



static int hpp__entry_period_baseline(struct perf_hpp *hpp, struct hist_entry *he)

{

	struct hist_entry *pair = he->pair;

	u64 period = pair ? pair->stat.period : 0;

	const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%12" PRIu64;



	return scnprintf(hpp->buf, hpp->size, fmt, period);

}

static int hpp__header_delta(struct perf_hpp *hpp)

{

	const char *fmt = symbol_conf.field_sep ? "%s" : "%7s";
@@ -359,6 +379,7 @@ struct perf_hpp_fmt perf_hpp__format[] = { 
	{ .cond = false, HPP__COLOR_PRINT_FNS(overhead_guest_us) },

	{ .cond = false, HPP__PRINT_FNS(samples) },

	{ .cond = false, HPP__PRINT_FNS(period) },

	{ .cond = false, HPP__PRINT_FNS(period_baseline) },

	{ .cond = false, HPP__PRINT_FNS(delta) },

	{ .cond = false, HPP__PRINT_FNS(ratio) },

	{ .cond = false, HPP__PRINT_FNS(wdiff) },

tools/perf/util/hist.h

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ enum { 
	PERF_HPP__OVERHEAD_GUEST_US,

	PERF_HPP__SAMPLES,

	PERF_HPP__PERIOD,

	PERF_HPP__PERIOD_BASELINE,

	PERF_HPP__DELTA,

	PERF_HPP__RATIO,

	PERF_HPP__WEIGHTED_DIFF,