perf annotate: Handle s390 pc relative load and store instruction.

PATCH Applied Thomas Richter 3 participants 3 messages Mar 8, 2018 – Mar 9, 2018 perf events

Share & tools

Thomas Richter

author

2018-03-08 12:09 UTC #0 lore raw

PATCH 1/1 perf annotate: Handle s390 pc relative load and store instruction.

S390 has several load and store instructions with target operand addressing relative to the program counter, for example lrl, lgrl, strl, stgrl.

These instructions are handled similar to x86. Objdump output displays those instructions as:
9595c: c4 2d 00 09 9c 54 lgrl %r7,1c8540 <mp_+0x60>
This output is parsed (like on x86) and perf annotate shows those lines as:
lgrl %r7,mp_+0x60

This patch handles the s390 specific instruction parsing for pc relative load and store instructions.

Signed-off-by Thomas Richter <[email protected]>

---
 tools/perf/arch/s390/annotate/instructions.c | 63 ++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

tools/perf/arch/s390/annotate/instructions.c +63 -0

index 0a3e39b5143d..0c54f1b33ac0 100644
@@ -52,6 +52,61 @@ static struct ins_ops s390_call_ops = {
 	.scnprintf = call__scnprintf,
 };
 
+static int s390_mov__parse(struct arch *arch __maybe_unused,
+			   struct ins_operands *ops,
+			   struct map *map __maybe_unused)
+{
+	char *s = strchr(ops->raw, ','), *target, *endptr;
+
+	if (s == NULL)
+		return -1;
+
+	*s = '\0';
+	ops->source.raw = strdup(ops->raw);
+	*s = ',';
+
+	if (ops->source.raw == NULL)
+		return -1;
+
+	target = ++s;
+	ops->target.raw = strdup(target);
+	if (ops->target.raw == NULL)
+		goto out_free_source;
+
+	ops->target.addr = strtoull(target, &endptr, 16);
+	if (endptr == target)
+		goto out_free_target;
+
+	s = strchr(endptr, '<');
+	if (s == NULL)
+		goto out_free_target;
+	endptr = strchr(s + 1, '>');
+	if (endptr == NULL)
+		goto out_free_target;
+
+	*endptr = '\0';
+	ops->target.name = strdup(s + 1);
+	*endptr = '>';
+	if (ops->target.name == NULL)
+		goto out_free_target;
+
+	return 0;
+
+out_free_target:
+	zfree(&ops->target.raw);
+out_free_source:
+	zfree(&ops->source.raw);
+	return -1;
+}
+
+static int mov__scnprintf(struct ins *ins, char *bf, size_t size,
+			  struct ins_operands *ops);
+
+static struct ins_ops s390_mov_ops = {
+	.parse	   = s390_mov__parse,
+	.scnprintf = mov__scnprintf,
+};
+
 static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)
 {
 	struct ins_ops *ops = NULL;

@@ -68,6 +123,14 @@ static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *na
 		ops = &s390_call_ops;
 	if (!strcmp(name, "br"))
 		ops = &ret_ops;
+	/* override load/store relative to PC */
+	if (!strcmp(name, "lrl") ||
+	    !strcmp(name, "lgrl") ||
+	    !strcmp(name, "lgfrl") ||
+	    !strcmp(name, "llgfrl") ||
+	    !strcmp(name, "strl") ||
+	    !strcmp(name, "stgrl"))
+		ops = &s390_mov_ops;
 
 	if (ops)
 		arch__associate_ins_ops(arch, name, ops);

Signature · 1 line

2.14.3

Arnaldo Carvalho de Melo

maintainer Applied

2018-03-08 12:52 UTC #1 lore raw

Em Thu, Mar 08, 2018 at 01:09:13PM +0100, Thomas Richter escreveu:

Quoted 3 lines

S390 has several load and store instructions with target operand addressing relative to the program counter, for example lrl, lgrl, strl, stgrl.

Thanks, applied.

- Arnaldo

tip-bot for Thomas Richter

merge bot

2018-03-09 08:58 UTC #2 lore raw

[tip:perf/core] perf annotate: Handle s390 PC relative load and store instruction.

In reply to Thomas Richter

perf annotate: Handle s390 PC relative load and store instruction.

Commit-ID:  0b4b6b78a3ce07023052e44b967f5d42fa3d802c
Gitweb:     https://git.kernel.org/tip/0b4b6b78a3ce07023052e44b967f5d42fa3d802c
Author:     Thomas Richter <[email protected]>
AuthorDate: Thu, 8 Mar 2018 13:09:13 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 8 Mar 2018 11:30:53 -0300

perf annotate: Handle s390 PC relative load and store instruction.

S390 has several load and store instructions with target operand addressing relative to the program counter, for example lrl, lgrl, strl, stgrl.

These instructions are handled similar to x86. Objdump output displays those instructions as:

9595c: c4 2d 00 09 9c 54 lgrl %r7,1c8540 <mp_+0x60>

This output is parsed (like on x86) and perf annotate shows those lines as:

lgrl %r7,mp_+0x60

This patch handles the s390 specific instruction parsing for PC relative load and store instructions.

Signed-off-by Thomas Richter <[email protected]>

Cc Heiko Carstens <[email protected]>

Cc Hendrik Brueckner <[email protected]>

Cc Martin Schwidefsky <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/arch/s390/annotate/instructions.c | 63 ++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

tools/perf/arch/s390/annotate/instructions.c +63 -0

index e80589fc5b58..46c21831f2ac 100644
@@ -52,6 +52,61 @@ static struct ins_ops s390_call_ops = {
 	.scnprintf = call__scnprintf,
 };
 
+static int s390_mov__parse(struct arch *arch __maybe_unused,
+			   struct ins_operands *ops,
+			   struct map *map __maybe_unused)
+{
+	char *s = strchr(ops->raw, ','), *target, *endptr;
+
+	if (s == NULL)
+		return -1;
+
+	*s = '\0';
+	ops->source.raw = strdup(ops->raw);
+	*s = ',';
+
+	if (ops->source.raw == NULL)
+		return -1;
+
+	target = ++s;
+	ops->target.raw = strdup(target);
+	if (ops->target.raw == NULL)
+		goto out_free_source;
+
+	ops->target.addr = strtoull(target, &endptr, 16);
+	if (endptr == target)
+		goto out_free_target;
+
+	s = strchr(endptr, '<');
+	if (s == NULL)
+		goto out_free_target;
+	endptr = strchr(s + 1, '>');
+	if (endptr == NULL)
+		goto out_free_target;
+
+	*endptr = '\0';
+	ops->target.name = strdup(s + 1);
+	*endptr = '>';
+	if (ops->target.name == NULL)
+		goto out_free_target;
+
+	return 0;
+
+out_free_target:
+	zfree(&ops->target.raw);
+out_free_source:
+	zfree(&ops->source.raw);
+	return -1;
+}
+
+static int mov__scnprintf(struct ins *ins, char *bf, size_t size,
+			  struct ins_operands *ops);
+
+static struct ins_ops s390_mov_ops = {
+	.parse	   = s390_mov__parse,
+	.scnprintf = mov__scnprintf,
+};
+
 static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)
 {
 	struct ins_ops *ops = NULL;

@@ -68,6 +123,14 @@ static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *na
 		ops = &s390_call_ops;
 	if (!strcmp(name, "br"))
 		ops = &ret_ops;
+	/* override load/store relative to PC */
+	if (!strcmp(name, "lrl") ||
+	    !strcmp(name, "lgrl") ||
+	    !strcmp(name, "lgfrl") ||
+	    !strcmp(name, "llgfrl") ||
+	    !strcmp(name, "strl") ||
+	    !strcmp(name, "stgrl"))
+		ops = &s390_mov_ops;
 
 	if (ops)
 		arch__associate_ins_ops(arch, name, ops);