perf annotate s390: Implement jump types for perf annotate

BugLink: http://bugs.launchpad.net/bugs/1692898
commit d9f8dfa9baf9b6ae1f2f84f887176558ecde5268 upstream.

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>
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/tools/perf/arch/s390/annotate/instructions.c b/tools/perf/arch/s390/annotate/instructions.c
new file mode 100644 (file)
index 0000000..745b4b1
--- /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 b7c8c7cf6744e1529ad47625f8721f9aee19dc89..bd58651d6040db31e870efc43d78cefe5b4af58d 100644 (file)
--- 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 = '#',
                },