[PATCH 1/1] perf annotate csky: Add perf annotate support

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/1] perf annotate csky: Add perf annotate support
       [not found] <cover.1561531557.git.han_mao@c-sky.com>
@ 2019-06-26  6:52 ` Mao Han
  2019-06-26  6:56   ` Guo Ren
  2019-07-03 14:30   ` [tip:perf/core] perf annotate: Add csky support tip-bot for Mao Han
  0 siblings, 2 replies; 5+ messages in thread
From: Mao Han @ 2019-06-26  6:52 UTC (permalink / raw)
  To: linux-kernel, linux-csky
  Cc: Mao Han, Guo Ren, Peter Zijlstra, Ingo Molnar,
	Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
	Namhyung Kim

This patch add basic arch initialization and instruction associate support
for csky.

perf annotate --stdio2
Samples: 161  of event 'cpu-clock:pppH', 4000 Hz, Event count (approx.):
40250000, [percent: local period]
test_4() /usr/lib/perf-test/callchain_test
Percent

            Disassembly of section .text:

            00008420 <test_4>:
            test_4():
              subi  sp, sp, 4
              st.w  r8, (sp, 0x0)
              mov   r8, sp
              subi  sp, sp, 8
              subi  r3, r8, 4
              movi  r2, 0
              st.w  r2, (r3, 0x0)
            ↓ br    2e
100.00  14:   subi  r3, r8, 4
              ld.w  r2, (r3, 0x0)
              subi  r3, r8, 8
              st.w  r2, (r3, 0x0)
              subi  r3, r8, 4
              ld.w  r3, (r3, 0x0)
              addi  r2, r3, 1
              subi  r3, r8, 4
              st.w  r2, (r3, 0x0)
        2e:   subi  r3, r8, 4
              ld.w  r2, (r3, 0x0)
              lrw   r3, 0x98967f    // 8598 <main+0x28>
              cmplt r3, r2
            ↑ bf    14
              mov   r0, r0
              mov   r0, r0
              mov   sp, r8
              ld.w  r8, (sp, 0x0)
              addi  sp, sp, 4
            ← rts

Signed-off-by: Mao Han <han_mao@c-sky.com>
Cc: Guo Ren <guoren@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/arch/csky/annotate/instructions.c | 48 ++++++++++++++++++++++++++++
 tools/perf/util/annotate.c                   |  5 +++
 2 files changed, 53 insertions(+)
 create mode 100644 tools/perf/arch/csky/annotate/instructions.c

diff --git a/tools/perf/arch/csky/annotate/instructions.c b/tools/perf/arch/csky/annotate/instructions.c
new file mode 100644
index 0000000..5337bfb
--- /dev/null
+++ b/tools/perf/arch/csky/annotate/instructions.c
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.
+
+#include <linux/compiler.h>
+
+static struct ins_ops *csky__associate_ins_ops(struct arch *arch,
+					       const char *name)
+{
+	struct ins_ops *ops = NULL;
+
+	/* catch all kind of jumps */
+	if (!strcmp(name, "bt") ||
+	    !strcmp(name, "bf") ||
+	    !strcmp(name, "bez") ||
+	    !strcmp(name, "bnez") ||
+	    !strcmp(name, "bnezad") ||
+	    !strcmp(name, "bhsz") ||
+	    !strcmp(name, "bhz") ||
+	    !strcmp(name, "blsz") ||
+	    !strcmp(name, "blz") ||
+	    !strcmp(name, "br") ||
+	    !strcmp(name, "jmpi") ||
+	    !strcmp(name, "jmp"))
+		ops = &jump_ops;
+
+	/* catch function call */
+	if (!strcmp(name, "bsr") ||
+	    !strcmp(name, "jsri") ||
+	    !strcmp(name, "jsr"))
+		ops = &call_ops;
+
+	/* catch function return */
+	if (!strcmp(name, "rts"))
+		ops = &ret_ops;
+
+	if (ops)
+		arch__associate_ins_ops(arch, name, ops);
+	return ops;
+}
+
+static int csky__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
+{
+	arch->initialized = true;
+	arch->objdump.comment_char = '/';
+	arch->associate_instruction_ops = csky__associate_ins_ops;
+
+	return 0;
+}
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 79db038..eb2456e 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -144,6 +144,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i
 #include "arch/arc/annotate/instructions.c"
 #include "arch/arm/annotate/instructions.c"
 #include "arch/arm64/annotate/instructions.c"
+#include "arch/csky/annotate/instructions.c"
 #include "arch/x86/annotate/instructions.c"
 #include "arch/powerpc/annotate/instructions.c"
 #include "arch/s390/annotate/instructions.c"
@@ -163,6 +164,10 @@ static struct arch architectures[] = {
 		.init = arm64__annotate_init,
 	},
 	{
+		.name = "csky",
+		.init = csky__annotate_init,
+	},
+	{
 		.name = "x86",
 		.init = x86__annotate_init,
 		.instructions = x86__instructions,
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] perf annotate csky: Add perf annotate support
  2019-06-26  6:52 ` [PATCH 1/1] perf annotate csky: Add perf annotate support Mao Han
@ 2019-06-26  6:56   ` Guo Ren
  2019-06-26 18:51     ` Arnaldo Carvalho de Melo
  2019-07-03 14:30   ` [tip:perf/core] perf annotate: Add csky support tip-bot for Mao Han
  1 sibling, 1 reply; 5+ messages in thread
From: Guo Ren @ 2019-06-26  6:56 UTC (permalink / raw)
  To: Mao Han
  Cc: linux-kernel, linux-csky, Peter Zijlstra, Ingo Molnar,
	Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
	Namhyung Kim

Thx Mao,

Approved!

Best Regards
 Guo Ren

On Wed, Jun 26, 2019 at 2:53 PM Mao Han <han_mao@c-sky.com> wrote:
>
> This patch add basic arch initialization and instruction associate support
> for csky.
>
> perf annotate --stdio2
> Samples: 161  of event 'cpu-clock:pppH', 4000 Hz, Event count (approx.):
> 40250000, [percent: local period]
> test_4() /usr/lib/perf-test/callchain_test
> Percent
>
>             Disassembly of section .text:
>
>             00008420 <test_4>:
>             test_4():
>               subi  sp, sp, 4
>               st.w  r8, (sp, 0x0)
>               mov   r8, sp
>               subi  sp, sp, 8
>               subi  r3, r8, 4
>               movi  r2, 0
>               st.w  r2, (r3, 0x0)
>             ↓ br    2e
> 100.00  14:   subi  r3, r8, 4
>               ld.w  r2, (r3, 0x0)
>               subi  r3, r8, 8
>               st.w  r2, (r3, 0x0)
>               subi  r3, r8, 4
>               ld.w  r3, (r3, 0x0)
>               addi  r2, r3, 1
>               subi  r3, r8, 4
>               st.w  r2, (r3, 0x0)
>         2e:   subi  r3, r8, 4
>               ld.w  r2, (r3, 0x0)
>               lrw   r3, 0x98967f    // 8598 <main+0x28>
>               cmplt r3, r2
>             ↑ bf    14
>               mov   r0, r0
>               mov   r0, r0
>               mov   sp, r8
>               ld.w  r8, (sp, 0x0)
>               addi  sp, sp, 4
>             ← rts
>
> Signed-off-by: Mao Han <han_mao@c-sky.com>
> Cc: Guo Ren <guoren@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Cc: Jiri Olsa <jolsa@redhat.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> ---
>  tools/perf/arch/csky/annotate/instructions.c | 48 ++++++++++++++++++++++++++++
>  tools/perf/util/annotate.c                   |  5 +++
>  2 files changed, 53 insertions(+)
>  create mode 100644 tools/perf/arch/csky/annotate/instructions.c
>
> diff --git a/tools/perf/arch/csky/annotate/instructions.c b/tools/perf/arch/csky/annotate/instructions.c
> new file mode 100644
> index 0000000..5337bfb
> --- /dev/null
> +++ b/tools/perf/arch/csky/annotate/instructions.c
> @@ -0,0 +1,48 @@
> +// SPDX-License-Identifier: GPL-2.0
> +// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.
> +
> +#include <linux/compiler.h>
> +
> +static struct ins_ops *csky__associate_ins_ops(struct arch *arch,
> +                                              const char *name)
> +{
> +       struct ins_ops *ops = NULL;
> +
> +       /* catch all kind of jumps */
> +       if (!strcmp(name, "bt") ||
> +           !strcmp(name, "bf") ||
> +           !strcmp(name, "bez") ||
> +           !strcmp(name, "bnez") ||
> +           !strcmp(name, "bnezad") ||
> +           !strcmp(name, "bhsz") ||
> +           !strcmp(name, "bhz") ||
> +           !strcmp(name, "blsz") ||
> +           !strcmp(name, "blz") ||
> +           !strcmp(name, "br") ||
> +           !strcmp(name, "jmpi") ||
> +           !strcmp(name, "jmp"))
> +               ops = &jump_ops;
> +
> +       /* catch function call */
> +       if (!strcmp(name, "bsr") ||
> +           !strcmp(name, "jsri") ||
> +           !strcmp(name, "jsr"))
> +               ops = &call_ops;
> +
> +       /* catch function return */
> +       if (!strcmp(name, "rts"))
> +               ops = &ret_ops;
> +
> +       if (ops)
> +               arch__associate_ins_ops(arch, name, ops);
> +       return ops;
> +}
> +
> +static int csky__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
> +{
> +       arch->initialized = true;
> +       arch->objdump.comment_char = '/';
> +       arch->associate_instruction_ops = csky__associate_ins_ops;
> +
> +       return 0;
> +}
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 79db038..eb2456e 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -144,6 +144,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i
>  #include "arch/arc/annotate/instructions.c"
>  #include "arch/arm/annotate/instructions.c"
>  #include "arch/arm64/annotate/instructions.c"
> +#include "arch/csky/annotate/instructions.c"
>  #include "arch/x86/annotate/instructions.c"
>  #include "arch/powerpc/annotate/instructions.c"
>  #include "arch/s390/annotate/instructions.c"
> @@ -163,6 +164,10 @@ static struct arch architectures[] = {
>                 .init = arm64__annotate_init,
>         },
>         {
> +               .name = "csky",
> +               .init = csky__annotate_init,
> +       },
> +       {
>                 .name = "x86",
>                 .init = x86__annotate_init,
>                 .instructions = x86__instructions,
> --
> 2.7.4
>


-- 
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] perf annotate csky: Add perf annotate support
  2019-06-26  6:56   ` Guo Ren
@ 2019-06-26 18:51     ` Arnaldo Carvalho de Melo
  2019-06-27  1:50       ` Guo Ren
  0 siblings, 1 reply; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-06-26 18:51 UTC (permalink / raw)
  To: Guo Ren
  Cc: Mao Han, linux-kernel, linux-csky, Peter Zijlstra, Ingo Molnar,
	Alexander Shishkin, Jiri Olsa, Namhyung Kim

Em Wed, Jun 26, 2019 at 02:56:55PM +0800, Guo Ren escreveu:
> Thx Mao,
> 
> Approved!

I guess I can take this as a:

Acked-by: Guo Ren <guoren@kernel.org>

Or would this better be:

Reviewed-by: Guo Ren <guoren@kernel.org>

?

- Arnaldo
 
> Best Regards
>  Guo Ren
> 
> On Wed, Jun 26, 2019 at 2:53 PM Mao Han <han_mao@c-sky.com> wrote:
> >
> > This patch add basic arch initialization and instruction associate support
> > for csky.
> >
> > perf annotate --stdio2
> > Samples: 161  of event 'cpu-clock:pppH', 4000 Hz, Event count (approx.):
> > 40250000, [percent: local period]
> > test_4() /usr/lib/perf-test/callchain_test
> > Percent
> >
> >             Disassembly of section .text:
> >
> >             00008420 <test_4>:
> >             test_4():
> >               subi  sp, sp, 4
> >               st.w  r8, (sp, 0x0)
> >               mov   r8, sp
> >               subi  sp, sp, 8
> >               subi  r3, r8, 4
> >               movi  r2, 0
> >               st.w  r2, (r3, 0x0)
> >             ↓ br    2e
> > 100.00  14:   subi  r3, r8, 4
> >               ld.w  r2, (r3, 0x0)
> >               subi  r3, r8, 8
> >               st.w  r2, (r3, 0x0)
> >               subi  r3, r8, 4
> >               ld.w  r3, (r3, 0x0)
> >               addi  r2, r3, 1
> >               subi  r3, r8, 4
> >               st.w  r2, (r3, 0x0)
> >         2e:   subi  r3, r8, 4
> >               ld.w  r2, (r3, 0x0)
> >               lrw   r3, 0x98967f    // 8598 <main+0x28>
> >               cmplt r3, r2
> >             ↑ bf    14
> >               mov   r0, r0
> >               mov   r0, r0
> >               mov   sp, r8
> >               ld.w  r8, (sp, 0x0)
> >               addi  sp, sp, 4
> >             ← rts
> >
> > Signed-off-by: Mao Han <han_mao@c-sky.com>
> > Cc: Guo Ren <guoren@kernel.org>
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> > Cc: Jiri Olsa <jolsa@redhat.com>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > ---
> >  tools/perf/arch/csky/annotate/instructions.c | 48 ++++++++++++++++++++++++++++
> >  tools/perf/util/annotate.c                   |  5 +++
> >  2 files changed, 53 insertions(+)
> >  create mode 100644 tools/perf/arch/csky/annotate/instructions.c
> >
> > diff --git a/tools/perf/arch/csky/annotate/instructions.c b/tools/perf/arch/csky/annotate/instructions.c
> > new file mode 100644
> > index 0000000..5337bfb
> > --- /dev/null
> > +++ b/tools/perf/arch/csky/annotate/instructions.c
> > @@ -0,0 +1,48 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.
> > +
> > +#include <linux/compiler.h>
> > +
> > +static struct ins_ops *csky__associate_ins_ops(struct arch *arch,
> > +                                              const char *name)
> > +{
> > +       struct ins_ops *ops = NULL;
> > +
> > +       /* catch all kind of jumps */
> > +       if (!strcmp(name, "bt") ||
> > +           !strcmp(name, "bf") ||
> > +           !strcmp(name, "bez") ||
> > +           !strcmp(name, "bnez") ||
> > +           !strcmp(name, "bnezad") ||
> > +           !strcmp(name, "bhsz") ||
> > +           !strcmp(name, "bhz") ||
> > +           !strcmp(name, "blsz") ||
> > +           !strcmp(name, "blz") ||
> > +           !strcmp(name, "br") ||
> > +           !strcmp(name, "jmpi") ||
> > +           !strcmp(name, "jmp"))
> > +               ops = &jump_ops;
> > +
> > +       /* catch function call */
> > +       if (!strcmp(name, "bsr") ||
> > +           !strcmp(name, "jsri") ||
> > +           !strcmp(name, "jsr"))
> > +               ops = &call_ops;
> > +
> > +       /* catch function return */
> > +       if (!strcmp(name, "rts"))
> > +               ops = &ret_ops;
> > +
> > +       if (ops)
> > +               arch__associate_ins_ops(arch, name, ops);
> > +       return ops;
> > +}
> > +
> > +static int csky__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
> > +{
> > +       arch->initialized = true;
> > +       arch->objdump.comment_char = '/';
> > +       arch->associate_instruction_ops = csky__associate_ins_ops;
> > +
> > +       return 0;
> > +}
> > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> > index 79db038..eb2456e 100644
> > --- a/tools/perf/util/annotate.c
> > +++ b/tools/perf/util/annotate.c
> > @@ -144,6 +144,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i
> >  #include "arch/arc/annotate/instructions.c"
> >  #include "arch/arm/annotate/instructions.c"
> >  #include "arch/arm64/annotate/instructions.c"
> > +#include "arch/csky/annotate/instructions.c"
> >  #include "arch/x86/annotate/instructions.c"
> >  #include "arch/powerpc/annotate/instructions.c"
> >  #include "arch/s390/annotate/instructions.c"
> > @@ -163,6 +164,10 @@ static struct arch architectures[] = {
> >                 .init = arm64__annotate_init,
> >         },
> >         {
> > +               .name = "csky",
> > +               .init = csky__annotate_init,
> > +       },
> > +       {
> >                 .name = "x86",
> >                 .init = x86__annotate_init,
> >                 .instructions = x86__instructions,
> > --
> > 2.7.4
> >
> 
> 
> -- 
> Best Regards
>  Guo Ren
> 
> ML: https://lore.kernel.org/linux-csky/

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] perf annotate csky: Add perf annotate support
  2019-06-26 18:51     ` Arnaldo Carvalho de Melo
@ 2019-06-27  1:50       ` Guo Ren
  0 siblings, 0 replies; 5+ messages in thread
From: Guo Ren @ 2019-06-27  1:50 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Mao Han, linux-kernel, linux-csky, Peter Zijlstra, Ingo Molnar,
	Alexander Shishkin, Jiri Olsa, Namhyung Kim

On Thu, Jun 27, 2019 at 2:52 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> Em Wed, Jun 26, 2019 at 02:56:55PM +0800, Guo Ren escreveu:
> > Thx Mao,
> >
> > Approved!
>
> I guess I can take this as a:
>
> Acked-by: Guo Ren <guoren@kernel.org>
>
> Or would this better be:
>
> Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by is OK.
Thx for help to merge.

Best regards
 Guo Ren

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tip:perf/core] perf annotate: Add csky support
  2019-06-26  6:52 ` [PATCH 1/1] perf annotate csky: Add perf annotate support Mao Han
  2019-06-26  6:56   ` Guo Ren
@ 2019-07-03 14:30   ` tip-bot for Mao Han
  1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Mao Han @ 2019-07-03 14:30 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, alexander.shishkin, jolsa, peterz, linux-kernel, namhyung,
	mingo, guoren, hpa, han_mao, tglx

Commit-ID:  aa23aa55166c2865ac430168c4b9d405cf8c6980
Gitweb:     https://git.kernel.org/tip/aa23aa55166c2865ac430168c4b9d405cf8c6980
Author:     Mao Han <han_mao@c-sky.com>
AuthorDate: Wed, 26 Jun 2019 14:52:19 +0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 1 Jul 2019 22:50:41 -0300

perf annotate: Add csky support

This patch add basic arch initialization and instruction associate
support for the csky CPU architecture.

E.g.:

  $ perf annotate --stdio2
  Samples: 161  of event 'cpu-clock:pppH', 4000 Hz, Event count (approx.):
  40250000, [percent: local period]
  test_4() /usr/lib/perf-test/callchain_test
  Percent

              Disassembly of section .text:

              00008420 <test_4>:
            test_4():
                subi  sp, sp, 4
                st.w  r8, (sp, 0x0)
                mov   r8, sp
                subi  sp, sp, 8
                subi  r3, r8, 4
                movi  r2, 0
                st.w  r2, (r3, 0x0)
              ↓ br    2e
  100.00  14:   subi  r3, r8, 4
                ld.w  r2, (r3, 0x0)
                subi  r3, r8, 8
                st.w  r2, (r3, 0x0)
                subi  r3, r8, 4
                ld.w  r3, (r3, 0x0)
                addi  r2, r3, 1
                subi  r3, r8, 4
                st.w  r2, (r3, 0x0)
          2e:   subi  r3, r8, 4
                ld.w  r2, (r3, 0x0)
                lrw   r3, 0x98967f    // 8598 <main+0x28>
                cmplt r3, r2
              ↑ bf    14
                mov   r0, r0
                mov   r0, r0
                mov   sp, r8
                ld.w  r8, (sp, 0x0)
                addi  sp, sp, 4
              ← rts

Signed-off-by: Mao Han <han_mao@c-sky.com>
Acked-by: Guo Ren <guoren@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-csky@vger.kernel.org
Link: http://lkml.kernel.org/r/d874d7782d9acdad5d98f2f5c4a6fb26fbe41c5d.1561531557.git.han_mao@c-sky.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/arch/csky/annotate/instructions.c | 48 ++++++++++++++++++++++++++++
 tools/perf/util/annotate.c                   |  5 +++
 2 files changed, 53 insertions(+)

diff --git a/tools/perf/arch/csky/annotate/instructions.c b/tools/perf/arch/csky/annotate/instructions.c
new file mode 100644
index 000000000000..5337bfb7d5fc
--- /dev/null
+++ b/tools/perf/arch/csky/annotate/instructions.c
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd.
+
+#include <linux/compiler.h>
+
+static struct ins_ops *csky__associate_ins_ops(struct arch *arch,
+					       const char *name)
+{
+	struct ins_ops *ops = NULL;
+
+	/* catch all kind of jumps */
+	if (!strcmp(name, "bt") ||
+	    !strcmp(name, "bf") ||
+	    !strcmp(name, "bez") ||
+	    !strcmp(name, "bnez") ||
+	    !strcmp(name, "bnezad") ||
+	    !strcmp(name, "bhsz") ||
+	    !strcmp(name, "bhz") ||
+	    !strcmp(name, "blsz") ||
+	    !strcmp(name, "blz") ||
+	    !strcmp(name, "br") ||
+	    !strcmp(name, "jmpi") ||
+	    !strcmp(name, "jmp"))
+		ops = &jump_ops;
+
+	/* catch function call */
+	if (!strcmp(name, "bsr") ||
+	    !strcmp(name, "jsri") ||
+	    !strcmp(name, "jsr"))
+		ops = &call_ops;
+
+	/* catch function return */
+	if (!strcmp(name, "rts"))
+		ops = &ret_ops;
+
+	if (ops)
+		arch__associate_ins_ops(arch, name, ops);
+	return ops;
+}
+
+static int csky__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
+{
+	arch->initialized = true;
+	arch->objdump.comment_char = '/';
+	arch->associate_instruction_ops = csky__associate_ins_ops;
+
+	return 0;
+}
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 2d08c4b62c63..ec7aaf31c2b2 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -145,6 +145,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i
 #include "arch/arc/annotate/instructions.c"
 #include "arch/arm/annotate/instructions.c"
 #include "arch/arm64/annotate/instructions.c"
+#include "arch/csky/annotate/instructions.c"
 #include "arch/x86/annotate/instructions.c"
 #include "arch/powerpc/annotate/instructions.c"
 #include "arch/s390/annotate/instructions.c"
@@ -163,6 +164,10 @@ static struct arch architectures[] = {
 		.name = "arm64",
 		.init = arm64__annotate_init,
 	},
+	{
+		.name = "csky",
+		.init = csky__annotate_init,
+	},
 	{
 		.name = "x86",
 		.init = x86__annotate_init,

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-07-03 14:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <cover.1561531557.git.han_mao@c-sky.com>
2019-06-26  6:52 ` [PATCH 1/1] perf annotate csky: Add perf annotate support Mao Han
2019-06-26  6:56   ` Guo Ren
2019-06-26 18:51     ` Arnaldo Carvalho de Melo
2019-06-27  1:50       ` Guo Ren
2019-07-03 14:30   ` [tip:perf/core] perf annotate: Add csky support tip-bot for Mao Han

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox