Commit 6de783b6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Resolve symbols using objdump comment 



This:

     mov    0x95bbb6(%rip),%ecx        # ffffffff81ae8d04 <d_hash_shift>

Becomes:

     mov    d_hash_shift,%ecx

Ditto for many more instructions that take two operands.

Requested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-i5opbyai2x6mn9e5yjmhx9k6@git.kernel.org


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

tools/perf/util/annotate.c

+112 −0
Original line number Diff line number Diff line
@@ -122,6 +122,89 @@ bool ins__is_jump(const struct ins *ins) 
	return ins->ops == &jump_ops;

}



static int comment__symbol(char *raw, char *comment, u64 *addrp, char **namep)

{

	char *endptr, *name, *t;



	if (strstr(raw, "(%rip)") == NULL)

		return 0;



	*addrp = strtoull(comment, &endptr, 16);

	name = strchr(endptr, '<');

	if (name == NULL)

		return -1;



	name++;



	t = strchr(name, '>');

	if (t == NULL)

		return 0;



	*t = '\0';

	*namep = strdup(name);

	*t = '>';



	return 0;

}



static int mov__parse(struct ins_operands *ops)

{

	char *s = strchr(ops->raw, ','), *target, *comment, prev;



	if (s == NULL)

		return -1;



	*s = '\0';

	ops->source.raw = strdup(ops->raw);

	*s = ',';

	

	if (ops->source.raw == NULL)

		return -1;



	target = ++s;



	while (s[0] != '\0' && !isspace(s[0]))

		++s;

	prev = *s;

	*s = '\0';



	ops->target.raw = strdup(target);

	*s = prev;



	if (ops->target.raw == NULL)

		goto out_free_source;



	comment = strchr(s, '#');

	if (comment == NULL)

		return 0;



	while (comment[0] != '\0' && isspace(comment[0]))

		++comment;



	comment__symbol(ops->source.raw, comment, &ops->source.addr, &ops->source.name);

	comment__symbol(ops->target.raw, comment, &ops->target.addr, &ops->target.name);



	return 0;



out_free_source:

	free(ops->source.raw);

	ops->source.raw = NULL;

	return -1;

}



static int mov__scnprintf(struct ins *ins, char *bf, size_t size,

			   struct ins_operands *ops)

{

	return scnprintf(bf, size, "%-6.6s %s,%s", ins->name,

			 ops->source.name ?: ops->source.raw,

			 ops->target.name ?: ops->target.raw);

}



static struct ins_ops mov_ops = {

	.parse	   = mov__parse,

	.scnprintf = mov__scnprintf,

};



static int nop__scnprintf(struct ins *ins __used, char *bf, size_t size,

			  struct ins_operands *ops __used)

{
@@ -136,8 +219,20 @@ static struct ins_ops nop_ops = { 
 * Must be sorted by name!

 */

static struct ins instructions[] = {

	{ .name = "add",   .ops  = &mov_ops, },

	{ .name = "addl",  .ops  = &mov_ops, },

	{ .name = "addq",  .ops  = &mov_ops, },

	{ .name = "addw",  .ops  = &mov_ops, },

	{ .name = "and",   .ops  = &mov_ops, },

	{ .name = "call",  .ops  = &call_ops, },

	{ .name = "callq", .ops  = &call_ops, },

	{ .name = "cmp",   .ops  = &mov_ops, },

	{ .name = "cmpb",  .ops  = &mov_ops, },

	{ .name = "cmpl",  .ops  = &mov_ops, },

	{ .name = "cmpq",  .ops  = &mov_ops, },

	{ .name = "cmpw",  .ops  = &mov_ops, },

	{ .name = "cmpxch", .ops  = &mov_ops, },

	{ .name = "imul",  .ops  = &mov_ops, },

	{ .name = "ja",	   .ops  = &jump_ops, },

	{ .name = "jae",   .ops  = &jump_ops, },

	{ .name = "jb",	   .ops  = &jump_ops, },
@@ -173,9 +268,23 @@ static struct ins instructions[] = { 
	{ .name = "jrcxz", .ops  = &jump_ops, },

	{ .name = "js",	   .ops  = &jump_ops, },

	{ .name = "jz",	   .ops  = &jump_ops, },

	{ .name = "lea",   .ops  = &mov_ops, },

	{ .name = "mov",   .ops  = &mov_ops, },

	{ .name = "movb",  .ops  = &mov_ops, },

	{ .name = "movdqa",.ops  = &mov_ops, },

	{ .name = "movl",  .ops  = &mov_ops, },

	{ .name = "movq",  .ops  = &mov_ops, },

	{ .name = "movslq", .ops  = &mov_ops, },

	{ .name = "movzbl", .ops  = &mov_ops, },

	{ .name = "movzwl", .ops  = &mov_ops, },

	{ .name = "nop",   .ops  = &nop_ops, },

	{ .name = "nopl",  .ops  = &nop_ops, },

	{ .name = "nopw",  .ops  = &nop_ops, },

	{ .name = "or",    .ops  = &mov_ops, },

	{ .name = "orl",   .ops  = &mov_ops, },

	{ .name = "test",  .ops  = &mov_ops, },

	{ .name = "testb", .ops  = &mov_ops, },

	{ .name = "testl", .ops  = &mov_ops, },

};



static int ins__cmp(const void *name, const void *insp)
@@ -323,6 +432,9 @@ void disasm_line__free(struct disasm_line *dl) 
{

	free(dl->line);

	free(dl->name);

	free(dl->ops.source.raw);

	free(dl->ops.source.name);

	free(dl->ops.target.raw);

	free(dl->ops.target.name);

	free(dl);

}

tools/perf/util/annotate.h

+7 −1
Original line number Diff line number Diff line
@@ -13,10 +13,16 @@ struct ins; 
struct ins_operands {

	char	*raw;

	struct {

		char	*raw;

		char	*name;

		u64	offset;

		u64	addr;

		u64	offset;

	} target;

	struct {

		char	*raw;

		char	*name;

		u64	addr;

	} source;

};



struct ins_ops {

CRA Git | Maintained and supported by SUSTech CRA and CCSE