Commit 4eb06815 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Make itrace script default to all calls 



By default 'perf script' for itrace outputs sampled instructions or
branches. In my experience this is confusing to users because it's hard
to correlate with real program behavior. The sampling makes sense for
tools like 'perf report' that actually sample to reduce the run time,
but run time is normally not a problem for 'perf script'.  It's better
to give an accurate representation of the program flow.

Default 'perf script' to output all calls for itrace. That's a much saner
default. The old behavior can be still requested with 'perf script'
--itrace=ibxwpe100000

v2: Fix ETM build failure
v3: Really fix ETM build failure (Kim Phillips)

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Leo Yan <leo.yan@linaro.org>
Link: http://lkml.kernel.org/r/20180920180540.14039-3-andi@firstfloor.org


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

tools/perf/Documentation/itrace.txt

+4 −3
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ 
		l	synthesize last branch entries (use with i or x)

		s       skip initial number of events



	The default is all events i.e. the same as --itrace=ibxwpe

	The default is all events i.e. the same as --itrace=ibxwpe,

	except for perf script where it is --itrace=ce



	In addition, the period (default 100000) for instructions events

	can be specified in units of:

	In addition, the period (default 100000, except for perf script where it is 1)

	for instructions events can be specified in units of:



		i	instructions

		t	ticks

tools/perf/builtin-script.c

+4 −1
Original line number Diff line number Diff line
@@ -3131,7 +3131,10 @@ int cmd_script(int argc, const char **argv) 
	char *rec_script_path = NULL;

	char *rep_script_path = NULL;

	struct perf_session *session;

	struct itrace_synth_opts itrace_synth_opts = { .set = false, };

	struct itrace_synth_opts itrace_synth_opts = {

		.set = false,

		.default_no_sample = true,

	};

	char *script_path = NULL;

	const char **__argv;

	int i, j, err = 0;

tools/perf/util/auxtrace.c

+12 −5
Original line number Diff line number Diff line
@@ -962,16 +962,23 @@ s64 perf_event__process_auxtrace(struct perf_session *session, 
#define PERF_ITRACE_DEFAULT_LAST_BRANCH_SZ	64

#define PERF_ITRACE_MAX_LAST_BRANCH_SZ		1024



void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts)

void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts,

				    bool no_sample)

{

	synth_opts->instructions = true;

	synth_opts->branches = true;

	synth_opts->transactions = true;

	synth_opts->ptwrites = true;

	synth_opts->pwr_events = true;

	synth_opts->errors = true;

	if (no_sample) {

		synth_opts->period_type = PERF_ITRACE_PERIOD_INSTRUCTIONS;

		synth_opts->period = 1;

		synth_opts->calls = true;

	} else {

		synth_opts->instructions = true;

		synth_opts->period_type = PERF_ITRACE_DEFAULT_PERIOD_TYPE;

		synth_opts->period = PERF_ITRACE_DEFAULT_PERIOD;

	}

	synth_opts->callchain_sz = PERF_ITRACE_DEFAULT_CALLCHAIN_SZ;

	synth_opts->last_branch_sz = PERF_ITRACE_DEFAULT_LAST_BRANCH_SZ;

	synth_opts->initial_skip = 0;
@@ -999,7 +1006,7 @@ int itrace_parse_synth_opts(const struct option *opt, const char *str, 
	}



	if (!str) {

		itrace_synth_opts__set_default(synth_opts);

		itrace_synth_opts__set_default(synth_opts, false);

		return 0;

	}

tools/perf/util/auxtrace.h

+4 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ enum itrace_period_type { 
/**

 * struct itrace_synth_opts - AUX area tracing synthesis options.

 * @set: indicates whether or not options have been set

 * @default_no_sample: Default to no sampling.

 * @inject: indicates the event (not just the sample) must be fully synthesized

 *          because 'perf inject' will write it out

 * @instructions: whether to synthesize 'instructions' events
@@ -82,6 +83,7 @@ enum itrace_period_type { 
 */

struct itrace_synth_opts {

	bool			set;

	bool			default_no_sample;

	bool			inject;

	bool			instructions;

	bool			branches;
@@ -528,7 +530,8 @@ int perf_event__process_auxtrace_error(struct perf_session *session, 
				       union perf_event *event);

int itrace_parse_synth_opts(const struct option *opt, const char *str,

			    int unset);

void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts);

void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts,

				    bool no_sample);



size_t perf_event__fprintf_auxtrace_error(union perf_event *event, FILE *fp);

void perf_session__auxtrace_error_inc(struct perf_session *session,

tools/perf/util/cs-etm.c

+2 −1
Original line number Diff line number Diff line
@@ -1432,7 +1432,8 @@ int cs_etm__process_auxtrace_info(union perf_event *event, 
	if (session->itrace_synth_opts && session->itrace_synth_opts->set) {

		etm->synth_opts = *session->itrace_synth_opts;

	} else {

		itrace_synth_opts__set_default(&etm->synth_opts);

		itrace_synth_opts__set_default(&etm->synth_opts,

				session->itrace_synth_opts->default_no_sample);

		etm->synth_opts.callchain = false;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE