Commit ec90e42c authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf auxtrace: Add option to synthesize branch stack for regular events 



There is an existing option to synthesize branch stacks for synthesized
events. Add a new option to synthesize branch stacks for regular events.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20200429150751.12570-5-adrian.hunter@intel.com


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

tools/perf/Documentation/itrace.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
		g	synthesize a call chain (use with i or x)

		G	synthesize a call chain on existing event records

		l	synthesize last branch entries (use with i or x)

		L	synthesize last branch entries on existing event records

		s       skip initial number of events



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

tools/perf/builtin-inject.c

+2 −1
Original line number Diff line number Diff line
@@ -684,7 +684,8 @@ static int __cmd_inject(struct perf_inject *inject) 


			perf_header__clear_feat(&session->header,

						HEADER_AUXTRACE);

			if (inject->itrace_synth_opts.last_branch)

			if (inject->itrace_synth_opts.last_branch ||

			    inject->itrace_synth_opts.add_last_branch)

				perf_header__set_feat(&session->header,

						      HEADER_BRANCH_STACK);

			evsel = perf_evlist__id2evsel_strict(session->evlist,

tools/perf/builtin-report.c

+3 −2
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ static int report__setup_sample_type(struct report *rep) 
	     !session->itrace_synth_opts->set))

		sample_type |= PERF_SAMPLE_CALLCHAIN;



	if (session->itrace_synth_opts->last_branch)

	if (session->itrace_synth_opts->last_branch ||

	    session->itrace_synth_opts->add_last_branch)

		sample_type |= PERF_SAMPLE_BRANCH_STACK;



	if (!is_pipe && !(sample_type & PERF_SAMPLE_CALLCHAIN)) {
@@ -1393,7 +1394,7 @@ int cmd_report(int argc, const char **argv) 
		goto error;

	}



	if (itrace_synth_opts.last_branch)

	if (itrace_synth_opts.last_branch || itrace_synth_opts.add_last_branch)

		has_br_stack = true;



	if (has_br_stack && branch_call_mode)

tools/perf/util/auxtrace.c

+5 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,11 @@ int itrace_parse_synth_opts(const struct option *opt, const char *str, 
				synth_opts->callchain_sz = val;

			}

			break;

		case 'L':

		case 'l':

			if (p[-1] == 'L')

				synth_opts->add_last_branch = true;

			else

				synth_opts->last_branch = true;

			synth_opts->last_branch_sz =

					PERF_ITRACE_DEFAULT_LAST_BRANCH_SZ;

tools/perf/util/auxtrace.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ enum itrace_period_type { 
 * @add_callchain: add callchain to existing event records

 * @thread_stack: feed branches to the thread_stack

 * @last_branch: add branch context to 'instruction' events

 * @add_last_branch: add branch context to existing event records

 * @callchain_sz: maximum callchain size

 * @last_branch_sz: branch context size

 * @period: 'instructions' events period
@@ -105,6 +106,7 @@ struct itrace_synth_opts { 
	bool			add_callchain;

	bool			thread_stack;

	bool			last_branch;

	bool			add_last_branch;

	unsigned int		callchain_sz;

	unsigned int		last_branch_sz;

	unsigned long long	period;