Commit 7384083b authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Make perf config effective 



perf default config set by user in [annotate] section is totally ignored
by annotate code. Fix it.

Before:

  $ ./perf config
  annotate.hide_src_code=true
  annotate.show_nr_jumps=true
  annotate.show_nr_samples=true

  $ ./perf annotate shash
         │    unsigned h = 0;
         │      movl   $0x0,-0xc(%rbp)
         │    while (*s)
         │    ↓ jmp    44
         │    h = 65599 * h + *s++;
   11.33 │24:   mov    -0xc(%rbp),%eax
   43.50 │      imul   $0x1003f,%eax,%ecx
         │      mov    -0x18(%rbp),%rax

After:

         │        movl   $0x0,-0xc(%rbp)
         │      ↓ jmp    44
       1 │1 24:   mov    -0xc(%rbp),%eax
       4 │        imul   $0x1003f,%eax,%ecx
         │        mov    -0x18(%rbp),%rax

Note that we have removed show_nr_samples and show_total_period from
annotation_options because they are not used. Instead of them we use
symbol_conf.show_nr_samples and symbol_conf.show_total_period.

Committer testing:

Using 'perf annotate --stdio2' to use the TUI rendering but emitting the output to stdio:

  # perf config
  #
  # perf config annotate.hide_src_code=true
  # perf config
  annotate.hide_src_code=true
  #
  # perf config annotate.show_nr_jumps=true
  # perf config annotate.show_nr_samples=true
  # perf config
  annotate.hide_src_code=true
  annotate.show_nr_jumps=true
  annotate.show_nr_samples=true
  #
  #

Before:

  # perf annotate --stdio2 ObjectInstance::weak_pointer_was_finalized
  Samples: 1  of event 'cycles', 4000 Hz, Event count (approx.): 830873, [percent: local period]
  ObjectInstance::weak_pointer_was_finalized() /usr/lib64/libgjs.so.0.0.0
  Percent
              00000000000609f0 <ObjectInstance::weak_pointer_was_finalized()@@Base>:
                endbr64
                cmpq    $0x0,0x20(%rdi)
              ↓ je      10
                xor     %eax,%eax
              ← retq
                xchg    %ax,%ax
  100.00  10:   push    %rbp
                cmpq    $0x0,0x18(%rdi)
                mov     %rdi,%rbp
              ↓ jne     20
          1b:   xor     %eax,%eax
                pop     %rbp
              ← retq
                nop
          20:   lea     0x18(%rdi),%rdi
              → callq   JS_UpdateWeakPointerAfterGC(JS::Heap<JSObject*
                cmpq    $0x0,0x18(%rbp)
              ↑ jne     1b
                mov     %rbp,%rdi
              → callq   ObjectBase::jsobj_addr() const@plt
                mov     $0x1,%eax
                pop     %rbp
              ← retq
  #

After:

  # perf annotate --stdio2 ObjectInstance::weak_pointer_was_finalized 2> /dev/null
  Samples: 1  of event 'cycles', 4000 Hz, Event count (approx.): 830873, [percent: local period]
  ObjectInstance::weak_pointer_was_finalized() /usr/lib64/libgjs.so.0.0.0
  Samples       endbr64
                cmpq    $0x0,0x20(%rdi)
              ↓ je      10
                xor     %eax,%eax
              ← retq
                xchg    %ax,%ax
     1  1 10:   push    %rbp
                cmpq    $0x0,0x18(%rdi)
                mov     %rdi,%rbp
              ↓ jne     20
        1 1b:   xor     %eax,%eax
                pop     %rbp
              ← retq
                nop
        1 20:   lea     0x18(%rdi),%rdi
              → callq   JS_UpdateWeakPointerAfterGC(JS::Heap<JSObject*
                cmpq    $0x0,0x18(%rbp)
              ↑ jne     1b
                mov     %rbp,%rdi
              → callq   ObjectBase::jsobj_addr() const@plt
                mov     $0x1,%eax
                pop     %rbp
              ← retq
  #
  # perf config annotate.show_nr_jumps
  annotate.show_nr_jumps=true
  # perf config annotate.show_nr_jumps=false
  # perf config annotate.show_nr_jumps
  annotate.show_nr_jumps=false
  #
  # perf annotate --stdio2 ObjectInstance::weak_pointer_was_finalized 2> /dev/null
  Samples: 1  of event 'cycles', 4000 Hz, Event count (approx.): 830873, [percent: local period]
  ObjectInstance::weak_pointer_was_finalized() /usr/lib64/libgjs.so.0.0.0
  Samples       endbr64
                cmpq    $0x0,0x20(%rdi)
              ↓ je      10
                xor     %eax,%eax
              ← retq
                xchg    %ax,%ax
       1  10:   push    %rbp
                cmpq    $0x0,0x18(%rdi)
                mov     %rdi,%rbp
              ↓ jne     20
          1b:   xor     %eax,%eax
                pop     %rbp
              ← retq
                nop
          20:   lea     0x18(%rdi),%rdi
              → callq   JS_UpdateWeakPointerAfterGC(JS::Heap<JSObject*
                cmpq    $0x0,0x18(%rbp)
              ↑ jne     1b
                mov     %rbp,%rdi
              → callq   ObjectBase::jsobj_addr() const@plt
                mov     $0x1,%eax
                pop     %rbp
              ← retq
  #

Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yisheng Xie <xieyisheng1@huawei.com>
Link: http://lore.kernel.org/lkml/20200213064306.160480-6-ravi.bangoria@linux.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7b43b697

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ int cmd_annotate(int argc, const char **argv) 
	if (ret < 0)

		goto out_delete;



	annotation_config__init();

	annotation_config__init(&annotate.opts);



	symbol_conf.try_vmlinux_path = true;

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -1507,7 +1507,7 @@ repeat: 
			symbol_conf.priv_size += sizeof(u32);

			symbol_conf.sort_by_name = true;

		}

		annotation_config__init();

		annotation_config__init(&report.annotation_opts);

	}



	if (symbol__init(&session->header.env) < 0)

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -1683,7 +1683,7 @@ int cmd_top(int argc, const char **argv) 
	if (status < 0)

		goto out_delete_evlist;



	annotation_config__init();

	annotation_config__init(&top.annotation_opts);



	symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);

	status = symbol__init(NULL);

tools/perf/util/annotate.c

+29 −49
Original line number Diff line number Diff line
@@ -3094,66 +3094,46 @@ out_free_offsets: 
	return err;

}



#define ANNOTATION__CFG(n) \

	{ .name = #n, .value = &annotation__default_options.n, }



/*

 * Keep the entries sorted, they are bsearch'ed

 */

static struct annotation_config {

	const char *name;

	void *value;

} annotation__configs[] = {

	ANNOTATION__CFG(hide_src_code),

	ANNOTATION__CFG(jump_arrows),

	ANNOTATION__CFG(offset_level),

	ANNOTATION__CFG(show_linenr),

	ANNOTATION__CFG(show_nr_jumps),

	ANNOTATION__CFG(show_nr_samples),

	ANNOTATION__CFG(show_total_period),

	ANNOTATION__CFG(use_offset),

};



#undef ANNOTATION__CFG



static int annotation_config__cmp(const void *name, const void *cfgp)

static int annotation__config(const char *var, const char *value, void *data)

{

	const struct annotation_config *cfg = cfgp;



	return strcmp(name, cfg->name);

}



static int annotation__config(const char *var, const char *value,

			    void *data __maybe_unused)

{

	struct annotation_config *cfg;

	const char *name;

	struct annotation_options *opt = data;



	if (!strstarts(var, "annotate."))

		return 0;



	name = var + 9;

	cfg = bsearch(name, annotation__configs, ARRAY_SIZE(annotation__configs),

		      sizeof(struct annotation_config), annotation_config__cmp);



	if (cfg == NULL)

		pr_debug("%s variable unknown, ignoring...", var);

	else if (strcmp(var, "annotate.offset_level") == 0) {

		perf_config_int(cfg->value, name, value);



		if (*(int *)cfg->value > ANNOTATION__MAX_OFFSET_LEVEL)

			*(int *)cfg->value = ANNOTATION__MAX_OFFSET_LEVEL;

		else if (*(int *)cfg->value < ANNOTATION__MIN_OFFSET_LEVEL)

			*(int *)cfg->value = ANNOTATION__MIN_OFFSET_LEVEL;

	if (!strcmp(var, "annotate.offset_level")) {

		perf_config_u8(&opt->offset_level, "offset_level", value);



		if (opt->offset_level > ANNOTATION__MAX_OFFSET_LEVEL)

			opt->offset_level = ANNOTATION__MAX_OFFSET_LEVEL;

		else if (opt->offset_level < ANNOTATION__MIN_OFFSET_LEVEL)

			opt->offset_level = ANNOTATION__MIN_OFFSET_LEVEL;

	} else if (!strcmp(var, "annotate.hide_src_code")) {

		opt->hide_src_code = perf_config_bool("hide_src_code", value);

	} else if (!strcmp(var, "annotate.jump_arrows")) {

		opt->jump_arrows = perf_config_bool("jump_arrows", value);

	} else if (!strcmp(var, "annotate.show_linenr")) {

		opt->show_linenr = perf_config_bool("show_linenr", value);

	} else if (!strcmp(var, "annotate.show_nr_jumps")) {

		opt->show_nr_jumps = perf_config_bool("show_nr_jumps", value);

	} else if (!strcmp(var, "annotate.show_nr_samples")) {

		symbol_conf.show_nr_samples = perf_config_bool("show_nr_samples",

								value);

	} else if (!strcmp(var, "annotate.show_total_period")) {

		symbol_conf.show_total_period = perf_config_bool("show_total_period",

								value);

	} else if (!strcmp(var, "annotate.use_offset")) {

		opt->use_offset = perf_config_bool("use_offset", value);

	} else {

		*(bool *)cfg->value = perf_config_bool(name, value);

		pr_debug("%s variable unknown, ignoring...", var);

	}



	return 0;

}



void annotation_config__init(void)

void annotation_config__init(struct annotation_options *opt)

{

	perf_config(annotation__config, NULL);

	perf_config(annotation__config, opt);

}



static unsigned int parse_percent_type(char *str1, char *str2)

tools/perf/util/annotate.h

+1 −3
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ struct annotation_options { 
	     full_path,

	     show_linenr,

	     show_nr_jumps,

	     show_nr_samples,

	     show_total_period,

	     show_minmax_cycle,

	     show_asm_raw,

	     annotate_src;
@@ -413,7 +411,7 @@ static inline int symbol__tui_annotate(struct map_symbol *ms __maybe_unused, 
}

#endif



void annotation_config__init(void);

void annotation_config__init(struct annotation_options *opt);



int annotate_parse_percent_type(const struct option *opt, const char *_str,

				int unset);

CRA Git | Maintained and supported by SUSTech CRA and CCSE