Em Mon, Oct 19, 2020 at 03:21:24PM +0800, Peng Fan escreveu: > From: Dengcheng Zhu <dzhu@xxxxxxxxxxxx> > > Support the MIPS architecture using the ins_ops association > method. With this patch, perf-annotate can work well on MIPS. > > Testing it with a perf.data file collected on a mips machine: > $./perf annotate -i perf.data > > : Disassembly of section .text: > : > : 00000000000be6a0 <get_next_seq>: > : get_next_seq(): > 0.00 : be6a0: lw v0,0(a0) > 0.00 : be6a4: daddiu sp,sp,-128 > 0.00 : be6a8: ld a7,72(a0) > 0.00 : be6ac: gssq s5,s4,80(sp) > 0.00 : be6b0: gssq s1,s0,48(sp) > 0.00 : be6b4: gssq s8,gp,112(sp) > 0.00 : be6b8: gssq s7,s6,96(sp) > 0.00 : be6bc: gssq s3,s2,64(sp) > 0.00 : be6c0: sd a3,0(sp) > 0.00 : be6c4: move s0,a0 > 0.00 : be6c8: sd v0,32(sp) > 0.00 : be6cc: sd a5,8(sp) > 0.00 : be6d0: sd zero,8(a0) > 0.00 : be6d4: sd a6,16(sp) > 0.00 : be6d8: ld s2,48(a0) > 8.53 : be6dc: ld s1,40(a0) > 9.42 : be6e0: ld v1,32(a0) > 0.00 : be6e4: nop > 0.00 : be6e8: ld s4,24(a0) > 0.00 : be6ec: ld s5,16(a0) > 0.00 : be6f0: sd a7,40(sp) > 10.11 : be6f4: ld s6,64(a0) > > ... > > The original patch link: > https://lore.kernel.org/patchwork/patch/1180480/ Thanks, applied. - Arnaldo > Signed-off-by: Dengcheng Zhu <dzhu@xxxxxxxxxxxx> > Signed-off-by: Peng Fan <fanpeng@xxxxxxxxxxx> > > [fanpeng@xxxxxxxxxxx: Add missing "bgtzl", "bltzl", > "bgezl", "blezl", "beql" and "bnel" for pre-R6processors] > --- > tools/perf/arch/mips/Build | 2 +- > tools/perf/arch/mips/annotate/instructions.c | 46 ++++++++++++++++++++++++++++ > tools/perf/util/annotate.c | 8 +++++ > 3 files changed, 55 insertions(+), 1 deletion(-) > create mode 100644 tools/perf/arch/mips/annotate/instructions.c > > diff --git a/tools/perf/arch/mips/Build b/tools/perf/arch/mips/Build > index 1bb8bf6..e4e5f33 100644 > --- a/tools/perf/arch/mips/Build > +++ b/tools/perf/arch/mips/Build > @@ -1 +1 @@ > -# empty > +perf-y += util/ > diff --git a/tools/perf/arch/mips/annotate/instructions.c b/tools/perf/arch/mips/annotate/instructions.c > new file mode 100644 > index 0000000..340993f > --- /dev/null > +++ b/tools/perf/arch/mips/annotate/instructions.c > @@ -0,0 +1,46 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +static > +struct ins_ops *mips__associate_ins_ops(struct arch *arch, const char *name) > +{ > + struct ins_ops *ops = NULL; > + > + if (!strncmp(name, "bal", 3) || > + !strncmp(name, "bgezal", 6) || > + !strncmp(name, "bltzal", 6) || > + !strncmp(name, "bgtzal", 6) || > + !strncmp(name, "blezal", 6) || > + !strncmp(name, "beqzal", 6) || > + !strncmp(name, "bnezal", 6) || > + !strncmp(name, "bgtzl", 5) || > + !strncmp(name, "bltzl", 5) || > + !strncmp(name, "bgezl", 5) || > + !strncmp(name, "blezl", 5) || > + !strncmp(name, "jialc", 5) || > + !strncmp(name, "beql", 4) || > + !strncmp(name, "bnel", 4) || > + !strncmp(name, "jal", 3)) > + ops = &call_ops; > + else if (!strncmp(name, "jr", 2)) > + ops = &ret_ops; > + else if (name[0] == 'j' || name[0] == 'b') > + ops = &jump_ops; > + else > + return NULL; > + > + arch__associate_ins_ops(arch, name, ops); > + > + return ops; > +} > + > +static > +int mips__annotate_init(struct arch *arch, char *cpuid __maybe_unused) > +{ > + if (!arch->initialized) { > + arch->associate_instruction_ops = mips__associate_ins_ops; > + arch->initialized = true; > + arch->objdump.comment_char = '#'; > + } > + > + return 0; > +} > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c > index 6c8575e..e52053a 100644 > --- a/tools/perf/util/annotate.c > +++ b/tools/perf/util/annotate.c > @@ -152,6 +152,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i > #include "arch/arm/annotate/instructions.c" > #include "arch/arm64/annotate/instructions.c" > #include "arch/csky/annotate/instructions.c" > +#include "arch/mips/annotate/instructions.c" > #include "arch/x86/annotate/instructions.c" > #include "arch/powerpc/annotate/instructions.c" > #include "arch/s390/annotate/instructions.c" > @@ -175,6 +176,13 @@ static struct arch architectures[] = { > .init = csky__annotate_init, > }, > { > + .name = "mips", > + .init = mips__annotate_init, > + .objdump = { > + .comment_char = '#', > + }, > + }, > + { > .name = "x86", > .init = x86__annotate_init, > .instructions = x86__instructions, > -- > 2.1.0 > -- - Arnaldo
