Skip to content

Commit b38775c

Browse files
milianwacmel
authored andcommitted
perf report: Cache failed lookups of inlined frames
When no inlined frames could be found for a given address, we did not store this information anywhere. That means we potentially do the costly inliner lookup repeatedly for cases where we know it can never succeed. This patch makes dso__parse_addr_inlines always return a valid inline_node. It will be empty when no inliners are found. This enables us to cache the empty list in the DSO, thereby improving the performance when many addresses fail to find the inliners. For my trivial example, the performance impact is already quite significant: Before: ~~~~~ Performance counter stats for 'perf report --stdio --inline -g srcline -s srcline' (5 runs): 594.804032 task-clock (msec) # 0.998 CPUs utilized ( +- 0.07% ) 53 context-switches # 0.089 K/sec ( +- 4.09% ) 0 cpu-migrations # 0.000 K/sec ( +-100.00% ) 5,687 page-faults # 0.010 M/sec ( +- 0.02% ) 2,300,918,213 cycles # 3.868 GHz ( +- 0.09% ) 4,395,839,080 instructions # 1.91 insn per cycle ( +- 0.00% ) 939,177,205 branches # 1578.969 M/sec ( +- 0.00% ) 11,824,633 branch-misses # 1.26% of all branches ( +- 0.10% ) 0.596246531 seconds time elapsed ( +- 0.07% ) ~~~~~ After: ~~~~~ Performance counter stats for 'perf report --stdio --inline -g srcline -s srcline' (5 runs): 113.111405 task-clock (msec) # 0.990 CPUs utilized ( +- 0.89% ) 29 context-switches # 0.255 K/sec ( +- 54.25% ) 0 cpu-migrations # 0.000 K/sec 5,380 page-faults # 0.048 M/sec ( +- 0.01% ) 432,378,779 cycles # 3.823 GHz ( +- 0.75% ) 670,057,633 instructions # 1.55 insn per cycle ( +- 0.01% ) 141,001,247 branches # 1246.570 M/sec ( +- 0.01% ) 2,346,845 branch-misses # 1.66% of all branches ( +- 0.19% ) 0.114222393 seconds time elapsed ( +- 1.19% ) ~~~~~ Signed-off-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Andi Kleen <ak@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20171019113836.5548-3-milian.wolff@kdab.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent bf36eb5 commit b38775c

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

tools/perf/util/machine.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2115,32 +2115,31 @@ static int append_inlines(struct callchain_cursor *cursor,
21152115
struct inline_node *inline_node;
21162116
struct inline_list *ilist;
21172117
u64 addr;
2118+
int ret = 1;
21182119

21192120
if (!symbol_conf.inline_name || !map || !sym)
2120-
return 1;
2121+
return ret;
21212122

21222123
addr = map__rip_2objdump(map, ip);
21232124

21242125
inline_node = inlines__tree_find(&map->dso->inlined_nodes, addr);
21252126
if (!inline_node) {
21262127
inline_node = dso__parse_addr_inlines(map->dso, addr, sym);
21272128
if (!inline_node)
2128-
return 1;
2129-
2129+
return ret;
21302130
inlines__tree_insert(&map->dso->inlined_nodes, inline_node);
21312131
}
21322132

21332133
list_for_each_entry(ilist, &inline_node->val, list) {
2134-
int ret = callchain_cursor_append(cursor, ip, map,
2135-
ilist->symbol, false,
2136-
NULL, 0, 0, 0,
2137-
ilist->srcline);
2134+
ret = callchain_cursor_append(cursor, ip, map,
2135+
ilist->symbol, false,
2136+
NULL, 0, 0, 0, ilist->srcline);
21382137

21392138
if (ret != 0)
21402139
return ret;
21412140
}
21422141

2143-
return 0;
2142+
return ret;
21442143
}
21452144

21462145
static int unwind_entry(struct unwind_entry *entry, void *arg)

tools/perf/util/srcline.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -353,17 +353,8 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
353353
INIT_LIST_HEAD(&node->val);
354354
node->addr = addr;
355355

356-
if (!addr2line(dso_name, addr, NULL, NULL, dso, TRUE, node, sym))
357-
goto out_free_inline_node;
358-
359-
if (list_empty(&node->val))
360-
goto out_free_inline_node;
361-
356+
addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
362357
return node;
363-
364-
out_free_inline_node:
365-
inline_node__delete(node);
366-
return NULL;
367358
}
368359

369360
#else /* HAVE_LIBBFD_SUPPORT */
@@ -480,11 +471,6 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
480471
out:
481472
pclose(fp);
482473

483-
if (list_empty(&node->val)) {
484-
inline_node__delete(node);
485-
return NULL;
486-
}
487-
488474
return node;
489475
}
490476

0 commit comments

Comments
 (0)