Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1621726

[PATCH 10/18] perf annotate s390: Implement jump types for perf annotate

Show all headers | View raw

From: Christian Borntraeger <borntraeger@de.ibm.com>

Implement simple detection for all kind of jumps and branches.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-s390 <linux-s390@vger.kernel.org>
Cc: stable@kernel.org # v4.10+
Link: http://lkml.kernel.org/r/1491465112-45819-3-git-send-email-borntraeger@de.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/arch/s390/annotate/instructions.c | 30 ++++++++++++++++++++++++++++
 tools/perf/util/annotate.c                   |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 tools/perf/arch/s390/annotate/instructions.c

diff --git a/tools/perf/arch/s390/annotate/instructions.c b/tools/perf/arch/s390/annotate/instructions.c
new file mode 100644
index 000000000000..745b4b1b8b21
--- /dev/null
+++ b/tools/perf/arch/s390/annotate/instructions.c
@@ -0,0 +1,30 @@
+static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)
+{
+	struct ins_ops *ops = NULL;
+
+	/* catch all kind of jumps */
+	if (strchr(name, 'j') ||
+	    !strncmp(name, "bct", 3) ||
+	    !strncmp(name, "br", 2))
+		ops = &jump_ops;
+	/* override call/returns */
+	if (!strcmp(name, "bras") ||
+	    !strcmp(name, "brasl") ||
+	    !strcmp(name, "basr"))
+		ops = &call_ops;
+	if (!strcmp(name, "br"))
+		ops = &ret_ops;
+
+	arch__associate_ins_ops(arch, name, ops);
+	return ops;
+}
+
+static int s390__annotate_init(struct arch *arch)
+{
+	if (!arch->initialized) {
+		arch->initialized = true;
+		arch->associate_instruction_ops = s390__associate_ins_ops;
+	}
+
+	return 0;
+}
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index bfb2f1d393d5..44ed6652b02f 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -108,6 +108,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i
 #include "arch/arm64/annotate/instructions.c"
 #include "arch/x86/annotate/instructions.c"
 #include "arch/powerpc/annotate/instructions.c"
+#include "arch/s390/annotate/instructions.c"
 
 static struct arch architectures[] = {
 	{
@@ -132,6 +133,7 @@ static struct arch architectures[] = {
 	},
 	{
 		.name = "s390",
+		.init = s390__annotate_init,
 		.objdump =  {
 			.comment_char = '#',
 		},
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 09/18] perf annotate s390: Fix perf annotate error -95 (4.10 regression) Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 03/18] perf evsel: Return exact sub event which failed with EPERM for wildcards Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 14/18] perf annotate: Process attr and build_id records Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 16/18] perf tools: Do not print missing features in pipe-mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 07/18] perf tools: Refactor the code to strip command name with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 12/18] perf inject: Copy events when reordering events in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 08/18] perf string: Simplify ltrim() implementation Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 01/18] perf callchains: Switch from strtok() to strtok_r() when parsing options Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 17/18] perf annotate: Refactor the code to parse disassemble lines with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 10/18] perf annotate s390: Implement jump types for perf annotate Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 06/18] perf pmu: Refactor wordwrap() with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 13/18] perf tools: Describe pipe mode in perf.data-file-fomat.txt Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 15/18] perf session: Don't rely on evlist in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 18/18] perf annotate: Use stripped line instead of raw disassemble line Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 05/18] perf ui browser: Refactor the code to parse color configs with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  [PATCH 02/18] perf script: Use strtok_r() when parsing output field list Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
  Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 07:40 +0200
    Re: [GIT PULL 00/18] perf/core improvements and fixes Christian Borntraeger <borntraeger@de.ibm.com> - 2017-04-12 09:20 +0200
      Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 09:30 +0200

csiph-web