Re: [PATCH -tip v2 4/6] perf script: print DSOs and symbols for BTS branch_from addr

[David Ahern <dsahern@gmail.com>]

On 07/17/2011 03:31 AM, Akihiro Nagai wrote:
> Print DSOs and symbols for branch_from address of BTS.
> BTS records branch_from address in 'addr' fields,
> and branch_to address in 'ip' field. Latest perf-script
> resolves DSOs and symbols only for 'ip' field.
> This patch resolves them for 'addr' field too.

Description does not match code change. What you are doing is enhancing
the detection of when a sample address should correlate to a symbol. In
this case you are adding HW_BRANCH_INSTRUCTIONS event.

David


> 
> # perf script -f ip,addr,dso,sym
> 3f03e016b0 (unknown) ([kernel.kallsyms]) ffffffff814675d2 irq_return ([kernel.kallsyms])
> 3f03e016b0    _start (/lib64/ld-2.14.so) ffffffff814675d2 irq_return ([kernel.kallsyms])
> 3f03e04b80 _dl_start (/lib64/ld-2.14.so)       3f03e016b3 _start (/lib64/ld-2.14.so)
> 3f03e04b80 _dl_start (/lib64/ld-2.14.so) ffffffff814675d2 irq_return ([kernel.kallsyms])
> 3f03e04ba6 _dl_start (/lib64/ld-2.14.so) ffffffff814675d2 irq_return ([kernel.kallsyms])
> 3f03e04bad _dl_start (/lib64/ld-2.14.so) ffffffff814675d2 irq_return ([kernel.kallsyms])
> 3f03e04c1d _dl_start (/lib64/ld-2.14.so)       3f03e04bfb _dl_start (/lib64/ld-2.14.so)
> [snip]
> 
> Signed-off-by: Akihiro Nagai <akihiro.nagai.hw@hitachi.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
> 
>  tools/perf/builtin-script.c |    8 +++++++-
>  tools/perf/util/event.c     |    2 +-
>  2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
> index 2356198..7708d89 100644
> --- a/tools/perf/builtin-script.c
> +++ b/tools/perf/builtin-script.c
> @@ -309,6 +309,12 @@ static bool sample_addr_correlates_sym(struct perf_event_attr *attr)
>  	     (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MAJ)))
>  		return true;
>  
> +	/* BTS Events */
> +	if ((attr->type == PERF_TYPE_HARDWARE) &&
> +	    (attr->config & PERF_COUNT_HW_BRANCH_INSTRUCTIONS) &&
> +	    (attr->sample_period == 1))
> +		return true;
> +
>  	return false;
>  }
>  
> @@ -328,7 +334,7 @@ static void print_sample_addr(union perf_event *event,
>  
>  	thread__find_addr_map(thread, session, cpumode, MAP__FUNCTION,
>  			      event->ip.pid, sample->addr, &al);
> -	/* try to resolve for user space */
> +	/* try to resolve addr_location for user space */
>  	if (!al.map)
>  		thread__find_addr_map(thread, session, PERF_RECORD_MISC_USER,
>  			MAP__FUNCTION, event->ip.pid, sample->addr, &al);
> diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
> index 49a9315..c541d02 100644
> --- a/tools/perf/util/event.c
> +++ b/tools/perf/util/event.c
> @@ -771,7 +771,7 @@ int perf_event__preprocess_sample(const union perf_event *event,
>  
>  	thread__find_addr_map(thread, session, cpumode, MAP__FUNCTION,
>  			      event->ip.pid, event->ip.ip, al);
> -	/* try to resolve for user space */
> +	/* try to resolve addr_location for user space */
>  	if (!al->map)
>  		thread__find_addr_map(thread, session, PERF_RECORD_MISC_USER,
>  				MAP__FUNCTION, event->ip.pid, event->ip.ip, al);
>