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

Commit 2f525d01 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Support multiple histograms in annotation 



The perf annotate tool continues aggregating everything on just one
histograms, but to support the top model add support for one histogram
perf evsel in the evlist.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 78f7defe

tools/perf/builtin-annotate.c

+21 −8
Original line number Diff line number Diff line
@@ -57,7 +57,18 @@ static int hists__add_entry(struct hists *self, struct addr_location *al) 
	if (he == NULL)

		return -ENOMEM;



	return hist_entry__inc_addr_samples(he, al->addr);

	if (he->ms.sym != NULL) {

		/*

		 * All aggregated on the first sym_hist.

		 */

		struct annotation *notes = symbol__annotation(he->ms.sym);

		if (notes->histograms == NULL && symbol__alloc_hist(he->ms.sym, 1) < 0)

			return -ENOMEM;



		return hist_entry__inc_addr_samples(he, 0, al->addr);

	}



	return 0;

}



static int process_sample_event(union perf_event *event,
@@ -81,9 +92,9 @@ static int process_sample_event(union perf_event *event, 
	return 0;

}



static int hist_entry__tty_annotate(struct hist_entry *he)

static int hist_entry__tty_annotate(struct hist_entry *he, int evidx)

{

	return symbol__tty_annotate(he->ms.sym, he->ms.map,

	return symbol__tty_annotate(he->ms.sym, he->ms.map, evidx,

				    print_line, full_paths);

}
@@ -100,7 +111,7 @@ static void hists__find_annotations(struct hists *self) 
			goto find_next;



		notes = symbol__annotation(he->ms.sym);

		if (notes->histogram == NULL) {

		if (notes->histograms == NULL) {

find_next:

			if (key == KEY_LEFT)

				nd = rb_prev(nd);
@@ -110,7 +121,8 @@ find_next: 
		}



		if (use_browser > 0) {

			key = hist_entry__tui_annotate(he);

			/* For now all is aggregated on the first */

			key = hist_entry__tui_annotate(he, 0);

			switch (key) {

			case KEY_RIGHT:

				next = rb_next(nd);
@@ -125,15 +137,16 @@ find_next: 
			if (next != NULL)

				nd = next;

		} else {

			hist_entry__tty_annotate(he);

			/* For now all is aggregated on the first */

			hist_entry__tty_annotate(he, 0);

			nd = rb_next(nd);

			/*

			 * Since we have a hist_entry per IP for the same

			 * symbol, free he->ms.sym->histogram to signal we already

			 * processed this symbol.

			 */

			free(notes->histogram);

			notes->histogram = NULL;

			free(notes->histograms);

			notes->histograms = NULL;

		}

	}

}

tools/perf/builtin-report.c

+12 −3
Original line number Diff line number Diff line
@@ -118,8 +118,17 @@ static int perf_session__add_hist_entry(struct perf_session *session, 
	 * so we don't allocated the extra space needed because the stdio

	 * code will not use it.

	 */

	if (use_browser > 0)

		err = hist_entry__inc_addr_samples(he, al->addr);

	if (al->sym != NULL && use_browser > 0) {

		/*

		 * All aggregated on the first sym_hist.

		 */

		struct annotation *notes = symbol__annotation(he->ms.sym);

		if (notes->histograms == NULL &&

		    symbol__alloc_hist(he->ms.sym, 1) < 0)

			err = -ENOMEM;

		else

			err = hist_entry__inc_addr_samples(he, 0, al->addr);

	}



	return err;

}
@@ -349,7 +358,7 @@ static int __cmd_report(void) 
	}



	if (use_browser > 0)

		hists__tui_browse_tree(&session->hists_tree, help);

		hists__tui_browse_tree(&session->hists_tree, help, 0);

	else

		hists__tty_browse_tree(&session->hists_tree, help);

tools/perf/util/annotate.c

+27 −30
Original line number Diff line number Diff line
@@ -15,44 +15,40 @@ 
#include "debug.h"

#include "annotate.h"



static int symbol__alloc_hist(struct symbol *sym)

int symbol__alloc_hist(struct symbol *sym, int nevents)

{

	struct annotation *notes = symbol__annotation(sym);

	const int size = (sizeof(*notes->histogram) +

			  (sym->end - sym->start) * sizeof(u64));



	notes->histogram = zalloc(size);

	return notes->histogram == NULL ? -1 : 0;

	notes->sizeof_sym_hist = (sizeof(*notes->histograms) +

				  (sym->end - sym->start) * sizeof(u64));

	notes->histograms = calloc(nevents, notes->sizeof_sym_hist);

	return notes->histograms == NULL ? -1 : 0;

}



int symbol__inc_addr_samples(struct symbol *sym, struct map *map, u64 addr)

int symbol__inc_addr_samples(struct symbol *sym, struct map *map,

			     int evidx, u64 addr)

{

	unsigned int sym_size, offset;

	unsigned offset;

	struct annotation *notes;

	struct sym_hist *h;



	if (!sym || !map)

		return 0;



	notes = symbol__annotation(sym);

	if (notes->histogram == NULL && symbol__alloc_hist(sym) < 0)

	if (notes->histograms == NULL)

		return -ENOMEM;



	sym_size = sym->end - sym->start;

	offset = addr - sym->start;



	pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr));



	if (offset >= sym_size)

	if (addr >= sym->end)

		return 0;



	h = notes->histogram;

	offset = addr - sym->start;

	h = annotation__histogram(notes, evidx);

	h->sum++;

	h->addr[offset]++;



	pr_debug3("%#" PRIx64 " %s: period++ [addr: %#" PRIx64 ", %#" PRIx64

		  "] => %" PRIu64 "\n", sym->start, sym->name,

		  addr, addr - sym->start, h->addr[offset]);

		  ", evidx=%d] => %" PRIu64 "\n", sym->start, sym->name,

		  addr, addr - sym->start, evidx, h->addr[offset]);

	return 0;

}
@@ -90,8 +86,8 @@ struct objdump_line *objdump__get_next_ip_line(struct list_head *head, 
}



static void objdump_line__print(struct objdump_line *oline,

				struct list_head *head,

				struct symbol *sym, u64 len)

				struct list_head *head, struct symbol *sym,

				int evidx, u64 len)

{

	static const char *prev_line;

	static const char *prev_color;
@@ -103,7 +99,7 @@ static void objdump_line__print(struct objdump_line *oline, 
		const char *color;

		struct annotation *notes = symbol__annotation(sym);

		struct source_line *src_line = notes->src_line;

		struct sym_hist *h = notes->histogram;

		struct sym_hist *h = annotation__histogram(notes, evidx);

		s64 offset = oline->offset;

		struct objdump_line *next = objdump__get_next_ip_line(head, oline);
@@ -328,7 +324,7 @@ static void symbol__free_source_line(struct symbol *sym, int len) 


/* Get the filename:line for the colored entries */

static int symbol__get_source_line(struct symbol *sym, struct map *map,

				   struct rb_root *root, int len,

				   int evidx, struct rb_root *root, int len,

				   const char *filename)

{

	u64 start;
@@ -336,7 +332,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, 
	char cmd[PATH_MAX * 2];

	struct source_line *src_line;

	struct annotation *notes = symbol__annotation(sym);

	struct sym_hist *h = notes->histogram;

	struct sym_hist *h = annotation__histogram(notes, evidx);



	if (!h->sum)

		return 0;
@@ -409,10 +405,10 @@ static void print_summary(struct rb_root *root, const char *filename) 
	}

}



static void symbol__annotate_hits(struct symbol *sym)

static void symbol__annotate_hits(struct symbol *sym, int evidx)

{

	struct annotation *notes = symbol__annotation(sym);

	struct sym_hist *h = notes->histogram;

	struct sym_hist *h = annotation__histogram(notes, evidx);

	u64 len = sym->end - sym->start, offset;



	for (offset = 0; offset < len; ++offset)
@@ -422,8 +418,8 @@ static void symbol__annotate_hits(struct symbol *sym) 
	printf("%*s: %" PRIu64 "\n", BITS_PER_LONG / 2, "h->sum", h->sum);

}



int symbol__tty_annotate(struct symbol *sym, struct map *map, bool print_lines,

			 bool full_paths)

int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx,

			 bool print_lines, bool full_paths)

{

	struct dso *dso = map->dso;

	const char *filename = dso->long_name, *d_filename;
@@ -443,7 +439,8 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, bool print_lines, 
	len = sym->end - sym->start;



	if (print_lines) {

		symbol__get_source_line(sym, map, &source_line, len, filename);

		symbol__get_source_line(sym, map, evidx, &source_line,

					len, filename);

		print_summary(&source_line, filename);

	}
@@ -452,10 +449,10 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, bool print_lines, 
	printf("------------------------------------------------\n");



	if (verbose)

		symbol__annotate_hits(sym);

		symbol__annotate_hits(sym, evidx);



	list_for_each_entry_safe(pos, n, &head, node) {

		objdump_line__print(pos, &head, sym, len);

		objdump_line__print(pos, &head, sym, evidx, len);

		list_del(&pos->node);

		objdump_line__free(pos);

	}

tools/perf/util/annotate.h

+24 −5
Original line number Diff line number Diff line
@@ -28,9 +28,21 @@ struct source_line { 
	char		*path;

};



/** struct annotation - symbols with hits have this attached as in sannotation

 *

 * @histogram: Array of addr hit histograms per event being monitored

 * @src_line: If 'print_lines' is specified, per source code line percentages

 *

 * src_line is allocated, percentages calculated and all sorted by percentage

 * when the annotation is about to be presented, so the percentages are for

 * one of the entries in the histogram array, i.e. for the event/counter being

 * presented. It is deallocated right after symbol__{tui,tty,etc}_annotate

 * returns.

 */

struct annotation {

	struct sym_hist	   *histogram;

	struct source_line *src_line;

	struct sym_hist	   *histograms;

	int    		   sizeof_sym_hist;

};



struct sannotation {
@@ -38,28 +50,35 @@ struct sannotation { 
	struct symbol	  symbol;

};



static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)

{

	return ((void *)notes->histograms) + (notes->sizeof_sym_hist * idx);

}



static inline struct annotation *symbol__annotation(struct symbol *sym)

{

	struct sannotation *a = container_of(sym, struct sannotation, symbol);

	return &a->annotation;

}



int symbol__inc_addr_samples(struct symbol *sym, struct map *map, u64 addr);

int symbol__inc_addr_samples(struct symbol *sym, struct map *map,

			     int evidx, u64 addr);

int symbol__alloc_hist(struct symbol *sym, int nevents);



int symbol__annotate(struct symbol *sym, struct map *map,

		     struct list_head *head, size_t privsize);



int symbol__tty_annotate(struct symbol *sym, struct map *map,

int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx,

			 bool print_lines, bool full_paths);



#ifdef NO_NEWT_SUPPORT

static inline int symbol__tui_annotate(symbol *sym __used,

				       struct map *map __used)

				       struct map *map __used, int evidx __used)

{

	return 0;

}

#else

int symbol__tui_annotate(struct symbol *sym, struct map *map);

int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx);

#endif



#endif	/* __PERF_ANNOTATE_H */

tools/perf/util/hist.c

+2 −2
Original line number Diff line number Diff line
@@ -950,9 +950,9 @@ void hists__filter_by_thread(struct hists *self, const struct thread *thread) 
	}

}



int hist_entry__inc_addr_samples(struct hist_entry *he, u64 ip)

int hist_entry__inc_addr_samples(struct hist_entry *he, int evidx, u64 ip)

{

	return symbol__inc_addr_samples(he->ms.sym, he->ms.map, ip);

	return symbol__inc_addr_samples(he->ms.sym, he->ms.map, evidx, ip);

}



int hist_entry__annotate(struct hist_entry *he, struct list_head *head,