Commit 84cb36da authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf thread: Don't require machine to compute the e_machine 



The machine can be calculated from a thread via its maps.

Don't require the machine argument to simplify callers and also to delay
computing the machine until a little later.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Aditya Bodkhe <aditya.b1@linux.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Jones <ajones@ventanamicro.com>
Cc: Anubhav Shelat <ashelat@redhat.com>
Cc: Anup Patel <anup@brainfault.org>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Blake Jones <blakejones@google.com>
Cc: Chun-Tse Shao <ctshao@google.com>
Cc: Dapeng Mi <dapeng1.mi@linux.intel.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quan Zhou <zhouquan@iscas.ac.cn>
Cc: Shimin Guo <shimin.guo@skydio.com>
Cc: Swapnil Sapkal <swapnil.sapkal@amd.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yunseong Kim <ysk@kzalloc.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c4f43922

tools/perf/util/scripting-engines/trace-event-python.c

+3 −5
Original line number Diff line number Diff line
@@ -837,7 +837,6 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, 
					 PyObject *callchain)

{

	PyObject *dict, *dict_sample, *brstack, *brstacksym;

	struct machine *machine;

	uint16_t e_machine = EM_HOST;

	uint32_t e_flags = EF_HOST;
@@ -926,10 +925,9 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, 
			PyLong_FromUnsignedLongLong(sample->cyc_cnt));

	}



	if (al->thread) {

		machine = maps__machine(thread__maps(al->thread));

		e_machine = thread__e_machine(al->thread, machine, &e_flags);

	}

	if (al->thread)

		e_machine = thread__e_machine(al->thread, /*machine=*/NULL, &e_flags);



	if (set_regs_in_dict(dict, sample, evsel, e_machine, e_flags))

		Py_FatalError("Failed to setting regs in dict");

tools/perf/util/session.c

+1 −2
Original line number Diff line number Diff line
@@ -2972,9 +2972,8 @@ struct perf_session__e_machine_cb_args { 
static int perf_session__e_machine_cb(struct thread *thread, void *_args)

{

	struct perf_session__e_machine_cb_args *args = _args;

	struct machine *machine = maps__machine(thread__maps(thread));



	args->e_machine = thread__e_machine(thread, machine, &args->e_flags);

	args->e_machine = thread__e_machine(thread, /*machine=*/NULL, &args->e_flags);

	return args->e_machine != EM_NONE ? 1 : 0;

}

tools/perf/util/thread.c

+5 −0
Original line number Diff line number Diff line
@@ -499,6 +499,11 @@ uint16_t thread__e_machine(struct thread *thread, struct machine *machine, uint3 
		return e_machine;

	}



	if (machine == NULL) {

		struct maps *maps = thread__maps(thread);



		machine = maps__machine(maps);

	}

	tid = thread__tid(thread);

	pid = thread__pid(thread);

	if (pid != tid) {