Skip to content

Commit

Permalink
Merge tag 'perf-core-for-mingo-4.15-20171025' of git://git.kernel.org…
Browse files Browse the repository at this point in the history 
…/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core inline improvements from Arnaldo Carvalho de Melo:

From Milian's cover letter: (Milian Wolff)

"This series of patches completely reworks the way inline frames are
 handled.  Instead of querying for the inline nodes on-demand in the
 individual tools, we now create proper callchain nodes for inlined
 frames. The advantages this approach brings are numerous:

 - Less duplicated code in the individual browser

 - Aggregated cost for inlined frames for the --children top-down list

 - Various bug fixes that arose from querying for a srcline/symbol based on
   the IP of a sample, which will always point to the last inlined frame
   instead of the corresponding non-inlined frame

 - Overall much better support for visualizing cost for heavily-inlined C++
   code, which simply was confusing and unreliably before

 - srcline honors the global setting as to whether full paths or basenames
   should be shown

 - Caches for inlined frames and srcline information, which allow us to
   enable inline frame handling by default"

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Ingo Molnar committed Oct 25, 2017
2 parents 9b7c854 + d8a88dd commit 57646b6
Show file tree
Hide file tree
Showing 18 changed files with 443 additions and 423 deletions.
3 changes: 2 additions & 1 deletion tools/perf/Documentation/perf-report.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,8 @@ include::itrace.txt[]

--inline::
If a callgraph address belongs to an inlined function, the inline stack
will be printed. Each entry is function name or file/line.
will be printed. Each entry is function name or file/line. Enabled by
default, disable with --no-inline.

include::callchain-overhead-calculation.txt[]

Expand Down
3 changes: 2 additions & 1 deletion tools/perf/Documentation/perf-script.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ include::itrace.txt[]

--inline::
If a callgraph address belongs to an inlined function, the inline stack
will be printed. Each entry has function name and file/line.
will be printed. Each entry has function name and file/line. Enabled by
default, disable with --no-inline.

SEE ALSO
--------
Expand Down
180 changes: 12 additions & 168 deletions tools/perf/ui/browsers/hists.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,57 +154,9 @@ static void callchain_list__set_folding(struct callchain_list *cl, bool unfold)
cl->unfolded = unfold ? cl->has_children : false;
}

static struct inline_node *inline_node__create(struct map *map, u64 ip)
{
struct dso *dso;
struct inline_node *node;

if (map == NULL)
return NULL;

dso = map->dso;
if (dso == NULL)
return NULL;

node = dso__parse_addr_inlines(dso,
map__rip_2objdump(map, ip));

return node;
}

static int inline__count_rows(struct inline_node *node)
{
struct inline_list *ilist;
int i = 0;

if (node == NULL)
return 0;

list_for_each_entry(ilist, &node->val, list) {
if ((ilist->filename != NULL) || (ilist->funcname != NULL))
i++;
}

return i;
}

static int callchain_list__inline_rows(struct callchain_list *chain)
{
struct inline_node *node;
int rows;

node = inline_node__create(chain->ms.map, chain->ip);
if (node == NULL)
return 0;

rows = inline__count_rows(node);
inline_node__delete(node);
return rows;
}

static int callchain_node__count_rows_rb_tree(struct callchain_node *node)
{
int n = 0, inline_rows;
int n = 0;
struct rb_node *nd;

for (nd = rb_first(&node->rb_root); nd; nd = rb_next(nd)) {
Expand All @@ -215,12 +167,6 @@ static int callchain_node__count_rows_rb_tree(struct callchain_node *node)
list_for_each_entry(chain, &child->val, list) {
++n;

if (symbol_conf.inline_name) {
inline_rows =
callchain_list__inline_rows(chain);
n += inline_rows;
}

/* We need this because we may not have children */
folded_sign = callchain_list__folded(chain);
if (folded_sign == '+')
Expand Down Expand Up @@ -272,7 +218,7 @@ static int callchain_node__count_rows(struct callchain_node *node)
{
struct callchain_list *chain;
bool unfolded = false;
int n = 0, inline_rows;
int n = 0;

if (callchain_param.mode == CHAIN_FLAT)
return callchain_node__count_flat_rows(node);
Expand All @@ -281,10 +227,6 @@ static int callchain_node__count_rows(struct callchain_node *node)

list_for_each_entry(chain, &node->val, list) {
++n;
if (symbol_conf.inline_name) {
inline_rows = callchain_list__inline_rows(chain);
n += inline_rows;
}

unfolded = chain->unfolded;
}
Expand Down Expand Up @@ -432,19 +374,6 @@ static void hist_entry__init_have_children(struct hist_entry *he)
he->init_have_children = true;
}

static void hist_entry_init_inline_node(struct hist_entry *he)
{
if (he->inline_node)
return;

he->inline_node = inline_node__create(he->ms.map, he->ip);

if (he->inline_node == NULL)
return;

he->has_children = true;
}

static bool hist_browser__toggle_fold(struct hist_browser *browser)
{
struct hist_entry *he = browser->he_selection;
Expand Down Expand Up @@ -476,12 +405,8 @@ static bool hist_browser__toggle_fold(struct hist_browser *browser)

if (he->unfolded) {
if (he->leaf)
if (he->inline_node)
he->nr_rows = inline__count_rows(
he->inline_node);
else
he->nr_rows = callchain__count_rows(
&he->sorted_chain);
he->nr_rows = callchain__count_rows(
&he->sorted_chain);
else
he->nr_rows = hierarchy_count_rows(browser, he, false);

Expand Down Expand Up @@ -841,71 +766,6 @@ static bool hist_browser__check_dump_full(struct hist_browser *browser __maybe_u

#define LEVEL_OFFSET_STEP 3

static int hist_browser__show_inline(struct hist_browser *browser,
struct inline_node *node,
unsigned short row,
int offset)
{
struct inline_list *ilist;
char buf[1024];
int color, width, first_row;

first_row = row;
width = browser->b.width - (LEVEL_OFFSET_STEP + 2);
list_for_each_entry(ilist, &node->val, list) {
if ((ilist->filename != NULL) || (ilist->funcname != NULL)) {
color = HE_COLORSET_NORMAL;
if (ui_browser__is_current_entry(&browser->b, row))
color = HE_COLORSET_SELECTED;

if (callchain_param.key == CCKEY_ADDRESS ||
callchain_param.key == CCKEY_SRCLINE) {
if (ilist->filename != NULL)
scnprintf(buf, sizeof(buf),
"%s:%d (inline)",
ilist->filename,
ilist->line_nr);
else
scnprintf(buf, sizeof(buf), "??");
} else if (ilist->funcname != NULL)
scnprintf(buf, sizeof(buf), "%s (inline)",
ilist->funcname);
else if (ilist->filename != NULL)
scnprintf(buf, sizeof(buf),
"%s:%d (inline)",
ilist->filename,
ilist->line_nr);
else
scnprintf(buf, sizeof(buf), "??");

ui_browser__set_color(&browser->b, color);
hist_browser__gotorc(browser, row, 0);
ui_browser__write_nstring(&browser->b, " ",
LEVEL_OFFSET_STEP + offset);
ui_browser__write_nstring(&browser->b, buf, width);
row++;
}
}

return row - first_row;
}

static size_t show_inline_list(struct hist_browser *browser, struct map *map,
u64 ip, int row, int offset)
{
struct inline_node *node;
int ret;

node = inline_node__create(map, ip);
if (node == NULL)
return 0;

ret = hist_browser__show_inline(browser, node, row, offset);

inline_node__delete(node);
return ret;
}

static int hist_browser__show_callchain_list(struct hist_browser *browser,
struct callchain_node *node,
struct callchain_list *chain,
Expand All @@ -917,7 +777,7 @@ static int hist_browser__show_callchain_list(struct hist_browser *browser,
char bf[1024], *alloc_str;
char buf[64], *alloc_str2;
const char *str;
int inline_rows = 0, ret = 1;
int ret = 1;

if (arg->row_offset != 0) {
arg->row_offset--;
Expand Down Expand Up @@ -954,12 +814,7 @@ static int hist_browser__show_callchain_list(struct hist_browser *browser,
free(alloc_str);
free(alloc_str2);

if (symbol_conf.inline_name) {
inline_rows = show_inline_list(browser, chain->ms.map,
chain->ip, row + 1, offset);
}

return ret + inline_rows;
return ret;
}

static bool check_percent_display(struct rb_node *node, u64 parent_total)
Expand Down Expand Up @@ -1383,12 +1238,6 @@ static int hist_browser__show_entry(struct hist_browser *browser,
folded_sign = hist_entry__folded(entry);
}

if (symbol_conf.inline_name &&
(!entry->has_children)) {
hist_entry_init_inline_node(entry);
folded_sign = hist_entry__folded(entry);
}

if (row_offset == 0) {
struct hpp_arg arg = {
.b = &browser->b,
Expand Down Expand Up @@ -1420,8 +1269,7 @@ static int hist_browser__show_entry(struct hist_browser *browser,
}

if (first) {
if (symbol_conf.use_callchain ||
symbol_conf.inline_name) {
if (symbol_conf.use_callchain) {
ui_browser__printf(&browser->b, "%c ", folded_sign);
width -= 2;
}
Expand Down Expand Up @@ -1463,15 +1311,11 @@ static int hist_browser__show_entry(struct hist_browser *browser,
.is_current_entry = current_entry,
};

if (entry->inline_node)
printed += hist_browser__show_inline(browser,
entry->inline_node, row, 0);
else
printed += hist_browser__show_callchain(browser,
entry, 1, row,
hist_browser__show_callchain_entry,
&arg,
hist_browser__check_output_full);
printed += hist_browser__show_callchain(browser,
entry, 1, row,
hist_browser__show_callchain_entry,
&arg,
hist_browser__check_output_full);
}

return printed;
Expand Down
77 changes: 1 addition & 76 deletions tools/perf/ui/stdio/hist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,64 +21,6 @@ static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
return ret;
}

static size_t inline__fprintf(struct map *map, u64 ip, int left_margin,
int depth, int depth_mask, FILE *fp)
{
struct dso *dso;
struct inline_node *node;
struct inline_list *ilist;
int ret = 0, i;

if (map == NULL)
return 0;

dso = map->dso;
if (dso == NULL)
return 0;

node = dso__parse_addr_inlines(dso,
map__rip_2objdump(map, ip));
if (node == NULL)
return 0;

list_for_each_entry(ilist, &node->val, list) {
if ((ilist->filename != NULL) || (ilist->funcname != NULL)) {
ret += callchain__fprintf_left_margin(fp, left_margin);

for (i = 0; i < depth; i++) {
if (depth_mask & (1 << i))
ret += fprintf(fp, "|");
else
ret += fprintf(fp, " ");
ret += fprintf(fp, " ");
}

if (callchain_param.key == CCKEY_ADDRESS ||
callchain_param.key == CCKEY_SRCLINE) {
if (ilist->filename != NULL)
ret += fprintf(fp, "%s:%d (inline)",
ilist->filename,
ilist->line_nr);
else
ret += fprintf(fp, "??");
} else if (ilist->funcname != NULL)
ret += fprintf(fp, "%s (inline)",
ilist->funcname);
else if (ilist->filename != NULL)
ret += fprintf(fp, "%s:%d (inline)",
ilist->filename,
ilist->line_nr);
else
ret += fprintf(fp, "??");

ret += fprintf(fp, "\n");
}
}

inline_node__delete(node);
return ret;
}

static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
int left_margin)
{
Expand Down Expand Up @@ -137,9 +79,6 @@ static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_node *node,
fputc('\n', fp);
free(alloc_str);

if (symbol_conf.inline_name)
ret += inline__fprintf(chain->ms.map, chain->ip,
left_margin, depth, depth_mask, fp);
return ret;
}

Expand Down Expand Up @@ -314,13 +253,6 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,

if (++entries_printed == callchain_param.print_limit)
break;

if (symbol_conf.inline_name)
ret += inline__fprintf(chain->ms.map,
chain->ip,
left_margin,
0, 0,
fp);
}
root = &cnode->rb_root;
}
Expand Down Expand Up @@ -600,7 +532,6 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
{
int ret;
int callchain_ret = 0;
int inline_ret = 0;
struct perf_hpp hpp = {
.buf = bf,
.size = size,
Expand All @@ -622,13 +553,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
callchain_ret = hist_entry_callchain__fprintf(he, total_period,
0, fp);

if (callchain_ret == 0 && symbol_conf.inline_name) {
inline_ret = inline__fprintf(he->ms.map, he->ip, 0, 0, 0, fp);
ret += inline_ret;
if (inline_ret > 0)
ret += fprintf(fp, "\n");
} else
ret += callchain_ret;
ret += callchain_ret;

return ret;
}
Expand Down
Loading

0 comments on commit 57646b6

Please sign in to comment.