Re: [PATCH] perf: Add Sparc annotate support.

[Arnaldo Carvalho de Melo]

Em Tue, Oct 16, 2018 at 08:55:55PM -0700, David Miller escreveu:

Great!

Could you try something like:

# perf record some_workload
# perf annotate --stdio2 hot_function

So that we can see this thing in action, i.e. sparc assembly annotated?
:-)

With 'perf annotate --tui hot_function' or 'perf top' 'A' you can
navigate, but for showing it in action in a git changelog comment
example --stdio is more convenient :-)

- Arnaldo
 
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> ---
>  tools/perf/arch/sparc/annotate/instructions.c | 169 ++++++++++++++++++
>  tools/perf/util/annotate.c                    |   8 +
>  2 files changed, 177 insertions(+)
>  create mode 100644 tools/perf/arch/sparc/annotate/instructions.c
> 
> diff --git a/tools/perf/arch/sparc/annotate/instructions.c b/tools/perf/arch/sparc/annotate/instructions.c
> new file mode 100644
> index 000000000000..2614c010c235
> --- /dev/null
> +++ b/tools/perf/arch/sparc/annotate/instructions.c
> @@ -0,0 +1,169 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +static int is_branch_cond(const char *cond)
> +{
> +	if (cond[0] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'a' && cond[1] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'c' &&
> +	    (cond[1] == 'c' || cond[1] == 's') &&
> +	    cond[2] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'e' &&
> +	    (cond[1] == '\0' ||
> +	     (cond[1] == 'q' && cond[2] == '\0')))
> +		return 1;
> +
> +	if (cond[0] == 'g' &&
> +	    (cond[1] == '\0' ||
> +	     (cond[1] == 't' && cond[2] == '\0') ||
> +	     (cond[1] == 'e' && cond[2] == '\0') ||
> +	     (cond[1] == 'e' && cond[2] == 'u' && cond[3] == '\0')))
> +		return 1;
> +
> +	if (cond[0] == 'l' &&
> +	    (cond[1] == '\0' ||
> +	     (cond[1] == 't' && cond[2] == '\0') ||
> +	     (cond[1] == 'u' && cond[2] == '\0') ||
> +	     (cond[1] == 'e' && cond[2] == '\0') ||
> +	     (cond[1] == 'e' && cond[2] == 'u' && cond[3] == '\0')))
> +		return 1;
> +
> +	if (cond[0] == 'n' &&
> +	    (cond[1] == '\0' ||
> +	     (cond[1] == 'e' && cond[2] == '\0') ||
> +	     (cond[1] == 'z' && cond[2] == '\0') ||
> +	     (cond[1] == 'e' && cond[2] == 'g' && cond[3] == '\0')))
> +		return 1;
> +
> +	if (cond[0] == 'b' &&
> +	    cond[1] == 'p' &&
> +	    cond[2] == 'o' &&
> +	    cond[3] == 's' &&
> +	    cond[4] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'v' &&
> +	    (cond[1] == 'c' || cond[1] == 's') &&
> +	    cond[2] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'b' &&
> +	    cond[1] == 'z' &&
> +	    cond[2] == '\0')
> +		return 1;
> +
> +	return 0;
> +}
> +
> +static int is_branch_reg_cond(const char *cond)
> +{
> +	if ((cond[0] == 'n' || cond[0] == 'l') &&
> +	    cond[1] == 'z' &&
> +	    cond[2] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'z' &&
> +	    cond[1] == '\0')
> +		return 1;
> +
> +	if ((cond[0] == 'g' || cond[0] == 'l') &&
> +	    cond[1] == 'e' &&
> +	    cond[2] == 'z' &&
> +	    cond[3] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'g' &&
> +	    cond[1] == 'z' &&
> +	    cond[2] == '\0')
> +		return 1;
> +
> +	return 0;
> +}
> +
> +static int is_branch_float_cond(const char *cond)
> +{
> +	if (cond[0] == '\0')
> +		return 1;
> +
> +	if ((cond[0] == 'a' || cond[0] == 'e' ||
> +	     cond[0] == 'z' || cond[0] == 'g' ||
> +	     cond[0] == 'l' || cond[0] == 'n' ||
> +	     cond[0] == 'o' || cond[0] == 'u') &&
> +	    cond[1] == '\0')
> +		return 1;
> +
> +	if (((cond[0] == 'g' && cond[1] == 'e') ||
> +	     (cond[0] == 'l' && (cond[1] == 'e' ||
> +				 cond[1] == 'g')) ||
> +	     (cond[0] == 'n' && (cond[1] == 'e' ||
> +				 cond[1] == 'z')) ||
> +	     (cond[0] == 'u' && (cond[1] == 'e' ||
> +				 cond[1] == 'g' ||
> +				 cond[1] == 'l'))) &&
> +	    cond[2] == '\0')
> +		return 1;
> +
> +	if (cond[0] == 'u' &&
> +	    (cond[1] == 'g' || cond[1] == 'l') &&
> +	    cond[2] == 'e' &&
> +	    cond[3] == '\0')
> +		return 1;
> +
> +	return 0;
> +}
> +
> +static struct ins_ops *sparc__associate_instruction_ops(struct arch *arch, const char *name)
> +{
> +	struct ins_ops *ops = NULL;
> +
> +	if (!strcmp(name, "call") ||
> +	    !strcmp(name, "jmp") ||
> +	    !strcmp(name, "jmpl")) {
> +		ops = &call_ops;
> +	} else if (!strcmp(name, "ret") ||
> +		   !strcmp(name, "retl") ||
> +		   !strcmp(name, "return")) {
> +		ops = &ret_ops;
> +	} else if (!strcmp(name, "mov")) {
> +		ops = &mov_ops;
> +	} else {
> +		if (name[0] == 'c' &&
> +		    (name[1] == 'w' || name[1] == 'x'))
> +			name += 2;
> +
> +		if (name[0] == 'b') {
> +			const char *cond = name + 1;
> +
> +			if (cond[0] == 'r') {
> +				if (is_branch_reg_cond(cond + 1))
> +					ops = &jump_ops;
> +			} else if (is_branch_cond(cond)) {
> +				ops = &jump_ops;
> +			}
> +		} else if (name[0] == 'f' && name[1] == 'b') {
> +			if (is_branch_float_cond(name + 2))
> +				ops = &jump_ops;
> +		}
> +	}
> +
> +	if (ops)
> +		arch__associate_ins_ops(arch, name, ops);
> +
> +	return ops;
> +}
> +
> +static int sparc__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
> +{
> +	if (!arch->initialized) {
> +		arch->initialized = true;
> +		arch->associate_instruction_ops = sparc__associate_instruction_ops;
> +		arch->objdump.comment_char = '#';
> +	}
> +
> +	return 0;
> +}
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 28cd6a17491b..6936daf89ddd 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -139,6 +139,7 @@ static int arch__associate_ins_ops(struct arch* arch, const char *name, struct i
>  #include "arch/x86/annotate/instructions.c"
>  #include "arch/powerpc/annotate/instructions.c"
>  #include "arch/s390/annotate/instructions.c"
> +#include "arch/sparc/annotate/instructions.c"
>  
>  static struct arch architectures[] = {
>  	{
> @@ -170,6 +171,13 @@ static struct arch architectures[] = {
>  			.comment_char = '#',
>  		},
>  	},
> +	{
> +		.name = "sparc",
> +		.init = sparc__annotate_init,
> +		.objdump = {
> +			.comment_char = '#',
> +		},
> +	},
>  };
>  
>  static void ins__delete(struct ins_operands *ops)
> -- 
> 2.19.1.328.g5a0cc8aca