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

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

perf report: Add processing for cycle histograms 



Call the earlier added cycle histogram infrastructure from the perf
report hist iter callback. For this we walk the branch records.

This allows to use cycle histograms when browsing perf report annotate.

v2: Rename flag

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1437233094-12844-5-git-send-email-andi@firstfloor.org


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

tools/perf/builtin-report.c

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ static int hist_iter__report_callback(struct hist_entry_iter *iter, 
	if (!ui__has_annotation())

		return 0;



	hist__account_cycles(iter->sample->branch_stack, al, iter->sample,

			     rep->nonany_branch_mode);



	if (sort__mode == SORT_MODE__BRANCH) {

		bi = he->branch_info;

		err = addr_map_symbol__inc_samples(&bi->from, evsel->idx);

tools/perf/util/hist.c

+33 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,39 @@ int hists__link(struct hists *leader, struct hists *other) 
	return 0;

}



void hist__account_cycles(struct branch_stack *bs, struct addr_location *al,

			  struct perf_sample *sample, bool nonany_branch_mode)

{

	struct branch_info *bi;



	/* If we have branch cycles always annotate them. */

	if (bs && bs->nr && bs->entries[0].flags.cycles) {

		int i;



		bi = sample__resolve_bstack(sample, al);

		if (bi) {

			struct addr_map_symbol *prev = NULL;



			/*

			 * Ignore errors, still want to process the

			 * other entries.

			 *

			 * For non standard branch modes always

			 * force no IPC (prev == NULL)

			 *

			 * Note that perf stores branches reversed from

			 * program order!

			 */

			for (i = bs->nr - 1; i >= 0; i--) {

				addr_map_symbol__account_cycles(&bi[i].from,

					nonany_branch_mode ? NULL : prev,

					bi[i].flags.cycles);

				prev = &bi[i].to;

			}

			free(bi);

		}

	}

}



size_t perf_evlist__fprintf_nr_events(struct perf_evlist *evlist, FILE *fp)

{

tools/perf/util/hist.h

+3 −0
Original line number Diff line number Diff line
@@ -350,6 +350,9 @@ static inline int script_browse(const char *script_opt __maybe_unused) 


unsigned int hists__sort_list_width(struct hists *hists);



void hist__account_cycles(struct branch_stack *bs, struct addr_location *al,

			  struct perf_sample *sample, bool nonany_branch_mode);



struct option;

int parse_filter_percentage(const struct option *opt __maybe_unused,

			    const char *arg, int unset __maybe_unused);