Commit 0669729e authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Factor out evsel__get_arch() 



The evsel__get_arch() is to get architecture info from the environment.

It'll be used by other places later so let's factor it out.

Also add arch__is() to check the arch info by name.

Committer notes:

"get" is usually associated with refcounting, so we better rename this
at some point to a better name.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: linux-toolchains@vger.kernel.org
Cc: linux-trace-devel@vger.kernel.org
Link: https://lore.kernel.org/r/20231213001323.718046-6-namhyung@kernel.org


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

tools/perf/util/annotate.c

+31 −13
Original line number Diff line number Diff line
@@ -843,6 +843,11 @@ static struct arch *arch__find(const char *name) 
	return bsearch(name, architectures, nmemb, sizeof(struct arch), arch__key_cmp);

}



bool arch__is(struct arch *arch, const char *name)

{

	return !strcmp(arch->name, name);

}



static struct annotated_source *annotated_source__new(void)

{

	struct annotated_source *src = zalloc(sizeof(*src));
@@ -2378,15 +2383,8 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel) 
	annotation__calc_percent(notes, evsel, symbol__size(sym));

}



int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,

		     struct arch **parch)

static int evsel__get_arch(struct evsel *evsel, struct arch **parch)

{

	struct symbol *sym = ms->sym;

	struct annotation *notes = symbol__annotation(sym);

	struct annotate_args args = {

		.evsel		= evsel,

		.options	= &annotate_opts,

	};

	struct perf_env *env = evsel__env(evsel);

	const char *arch_name = perf_env__arch(env);

	struct arch *arch;
@@ -2395,23 +2393,43 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel, 
	if (!arch_name)

		return errno;



	args.arch = arch = arch__find(arch_name);

	*parch = arch = arch__find(arch_name);

	if (arch == NULL) {

		pr_err("%s: unsupported arch %s\n", __func__, arch_name);

		return ENOTSUP;

	}



	if (parch)

		*parch = arch;



	if (arch->init) {

		err = arch->init(arch, env ? env->cpuid : NULL);

		if (err) {

			pr_err("%s: failed to initialize %s arch priv area\n", __func__, arch->name);

			pr_err("%s: failed to initialize %s arch priv area\n",

			       __func__, arch->name);

			return err;

		}

	}

	return 0;

}



int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,

		     struct arch **parch)

{

	struct symbol *sym = ms->sym;

	struct annotation *notes = symbol__annotation(sym);

	struct annotate_args args = {

		.evsel		= evsel,

		.options	= &annotate_opts,

	};

	struct arch *arch = NULL;

	int err;



	err = evsel__get_arch(evsel, &arch);

	if (err < 0)

		return err;



	if (parch)

		*parch = arch;



	args.arch = arch;

	args.ms = *ms;

	if (annotate_opts.full_addr)

		notes->start = map__objdump_2mem(ms->map, ms->sym->start);

tools/perf/util/annotate.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ struct ins_operands { 


struct arch;



bool arch__is(struct arch *arch, const char *name);



struct ins_ops {

	void (*free)(struct ins_operands *ops);

	int (*parse)(struct arch *arch, struct ins_operands *ops, struct map_symbol *ms);