Skip to contentSkip to conversation

perf annotate: ARM support

tip:perf/core tip-bot for Russell King 1 participant 1 message Dec 8, 2015 perf events

lore
Share & tools
lore

tip-bot for Russell King

author merge bot
#0 lore raw
Commit-ID:  cfef25b8daf7e4b49c84e174a904af9d89dc7c46
Gitweb:     http://git.kernel.org/tip/cfef25b8daf7e4b49c84e174a904af9d89dc7c46
Author:     Russell King <[email protected]>
AuthorDate: Sun, 6 Dec 2015 23:07:13 +0000
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 7 Dec 2015 18:13:00 -0300

perf annotate: ARM support

Add basic support to parse ARM assembly.

This:

* enables perf to correctly show the disassembly, rather than chopping some constants off at the '#' (which is not a comment character on ARM).

* allows perf to identify ARM instructions that branch to other parts within the same function, thereby properly annotating them.

* allows perf to identify function calls, allowing called functions to be followed in the annotated view.

Signed-off-by Russell King <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Will Deacon <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/annotate.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
tools/perf/util/annotate.c +23 -0
index 1dd1949..b795b69 100644
@@ -65,6 +65,11 @@ static int call__parse(struct ins_operands *ops)
 
 	name++;
 
+#ifdef __arm__
+	if (strchr(name, '+'))
+		return -1;
+#endif
+
 	tok = strchr(name, '>');
 	if (tok == NULL)
 		return -1;

@@ -246,7 +251,11 @@ static int mov__parse(struct ins_operands *ops)
 		return -1;
 
 	target = ++s;
+#ifdef __arm__
+	comment = strchr(s, ';');
+#else
 	comment = strchr(s, '#');
+#endif
 
 	if (comment != NULL)
 		s = comment - 1;

@@ -354,6 +363,20 @@ static struct ins instructions[] = {
 	{ .name = "addq",  .ops  = &mov_ops, },
 	{ .name = "addw",  .ops  = &mov_ops, },
 	{ .name = "and",   .ops  = &mov_ops, },
+#ifdef __arm__
+	{ .name = "b",     .ops  = &jump_ops, }, // might also be a call
+	{ .name = "bcc",   .ops  = &jump_ops, },
+	{ .name = "bcs",   .ops  = &jump_ops, },
+	{ .name = "beq",   .ops  = &jump_ops, },
+	{ .name = "bge",   .ops  = &jump_ops, },
+	{ .name = "bgt",   .ops  = &jump_ops, },
+	{ .name = "bhi",   .ops  = &jump_ops, },
+	{ .name = "bl",    .ops  = &call_ops, },
+	{ .name = "blt",   .ops  = &jump_ops, },
+	{ .name = "bls",   .ops  = &jump_ops, },
+	{ .name = "blx",   .ops  = &call_ops, },
+	{ .name = "bne",   .ops  = &jump_ops, },
+#endif
 	{ .name = "bts",   .ops  = &mov_ops, },
 	{ .name = "call",  .ops  = &call_ops, },
 	{ .name = "callq", .ops  = &call_ops, },