Merge tag 'perf-core-for-mingo' of... (20113199) · Commits · e / devices / android_kernel_oneplus_sm8150

tools/perf/Makefile.perf

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -397,7 +397,9 @@ LIB_OBJS += $(OUTPUT)tests/rdpmc.o
	LIB_OBJS += $(OUTPUT)tests/evsel-roundtrip-name.o		LIB_OBJS += $(OUTPUT)tests/evsel-roundtrip-name.o
	LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o		LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o
	LIB_OBJS += $(OUTPUT)tests/pmu.o		LIB_OBJS += $(OUTPUT)tests/pmu.o
			LIB_OBJS += $(OUTPUT)tests/hists_common.o
	LIB_OBJS += $(OUTPUT)tests/hists_link.o		LIB_OBJS += $(OUTPUT)tests/hists_link.o
			LIB_OBJS += $(OUTPUT)tests/hists_filter.o
	LIB_OBJS += $(OUTPUT)tests/python-use.o		LIB_OBJS += $(OUTPUT)tests/python-use.o
	LIB_OBJS += $(OUTPUT)tests/bp_signal.o		LIB_OBJS += $(OUTPUT)tests/bp_signal.o
	LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o		LIB_OBJS += $(OUTPUT)tests/bp_signal_overflow.o
	@@ -414,6 +416,8 @@ ifeq ($(ARCH),x86)
	LIB_OBJS += $(OUTPUT)tests/dwarf-unwind.o		LIB_OBJS += $(OUTPUT)tests/dwarf-unwind.o
	endif		endif
	endif		endif
			LIB_OBJS += $(OUTPUT)tests/mmap-thread-lookup.o
			LIB_OBJS += $(OUTPUT)tests/thread-mg-share.o

	BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o		BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
	BUILTIN_OBJS += $(OUTPUT)builtin-bench.o		BUILTIN_OBJS += $(OUTPUT)builtin-bench.o

tools/perf/arch/x86/tests/dwarf-unwind.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ static int sample_ustack(struct perf_sample *sample,

	sp = (unsigned long) regs[PERF_REG_X86_SP];		sp = (unsigned long) regs[PERF_REG_X86_SP];

	map = map_groups__find(&thread->mg, MAP__FUNCTION, (u64) sp);		map = map_groups__find(thread->mg, MAP__FUNCTION, (u64) sp);
	if (!map) {		if (!map) {
	pr_debug("failed to get stack map\n");		pr_debug("failed to get stack map\n");
	free(buf);		free(buf);

tools/perf/perf.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,9 @@
	#ifndef __NR_futex		#ifndef __NR_futex
	# define __NR_futex 240		# define __NR_futex 240
	#endif		#endif
			#ifndef __NR_gettid
			# define __NR_gettid 224
			#endif
	#endif		#endif

	#if defined(__x86_64__)		#if defined(__x86_64__)
	@@ -29,6 +32,9 @@
	#ifndef __NR_futex		#ifndef __NR_futex
	# define __NR_futex 202		# define __NR_futex 202
	#endif		#endif
			#ifndef __NR_gettid
			# define __NR_gettid 186
			#endif
	#endif		#endif

	#ifdef __powerpc__		#ifdef __powerpc__

tools/perf/tests/builtin-test.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -123,6 +123,18 @@ static struct test {
	},		},
	#endif		#endif
	#endif		#endif
			{
			.desc = "Test filtering hist entries",
			.func = test__hists_filter,
			},
			{
			.desc = "Test mmap thread lookup",
			.func = test__mmap_thread_lookup,
			},
			{
			.desc = "Test thread mg sharing",
			.func = test__thread_mg_share,
			},
	{		{
	.func = NULL,		.func = NULL,
	},		},

tools/perf/tests/hists_common.c

0 → 100644

+148 −0

Original line number	Original line	Diff line number	Diff line
			#include "perf.h"
			#include "util/debug.h"
			#include "util/symbol.h"
			#include "util/sort.h"
			#include "util/evsel.h"
			#include "util/evlist.h"
			#include "util/machine.h"
			#include "util/thread.h"
			#include "tests/hists_common.h"

			static struct {
			u32 pid;
			const char *comm;
			} fake_threads[] = {
			{ 100, "perf" },
			{ 200, "perf" },
			{ 300, "bash" },
			};

			static struct {
			u32 pid;
			u64 start;
			const char *filename;
			} fake_mmap_info[] = {
			{ 100, 0x40000, "perf" },
			{ 100, 0x50000, "libc" },
			{ 100, 0xf0000, "[kernel]" },
			{ 200, 0x40000, "perf" },
			{ 200, 0x50000, "libc" },
			{ 200, 0xf0000, "[kernel]" },
			{ 300, 0x40000, "bash" },
			{ 300, 0x50000, "libc" },
			{ 300, 0xf0000, "[kernel]" },
			};

			struct fake_sym {
			u64 start;
			u64 length;
			const char *name;
			};

			static struct fake_sym perf_syms[] = {
			{ 700, 100, "main" },
			{ 800, 100, "run_command" },
			{ 900, 100, "cmd_record" },
			};

			static struct fake_sym bash_syms[] = {
			{ 700, 100, "main" },
			{ 800, 100, "xmalloc" },
			{ 900, 100, "xfree" },
			};

			static struct fake_sym libc_syms[] = {
			{ 700, 100, "malloc" },
			{ 800, 100, "free" },
			{ 900, 100, "realloc" },
			};

			static struct fake_sym kernel_syms[] = {
			{ 700, 100, "schedule" },
			{ 800, 100, "page_fault" },
			{ 900, 100, "sys_perf_event_open" },
			};

			static struct {
			const char *dso_name;
			struct fake_sym *syms;
			size_t nr_syms;
			} fake_symbols[] = {
			{ "perf", perf_syms, ARRAY_SIZE(perf_syms) },
			{ "bash", bash_syms, ARRAY_SIZE(bash_syms) },
			{ "libc", libc_syms, ARRAY_SIZE(libc_syms) },
			{ "[kernel]", kernel_syms, ARRAY_SIZE(kernel_syms) },
			};

			struct machine setup_fake_machine(struct machines machines)
			{
			struct machine *machine = machines__find(machines, HOST_KERNEL_ID);
			size_t i;

			if (machine == NULL) {
			pr_debug("Not enough memory for machine setup\n");
			return NULL;
			}

			for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
			struct thread *thread;

			thread = machine__findnew_thread(machine, fake_threads[i].pid,
			fake_threads[i].pid);
			if (thread == NULL)
			goto out;

			thread__set_comm(thread, fake_threads[i].comm, 0);
			}

			for (i = 0; i < ARRAY_SIZE(fake_mmap_info); i++) {
			union perf_event fake_mmap_event = {
			.mmap = {
			.header = { .misc = PERF_RECORD_MISC_USER, },
			.pid = fake_mmap_info[i].pid,
			.tid = fake_mmap_info[i].pid,
			.start = fake_mmap_info[i].start,
			.len = 0x1000ULL,
			.pgoff = 0ULL,
			},
			};

			strcpy(fake_mmap_event.mmap.filename,
			fake_mmap_info[i].filename);

			machine__process_mmap_event(machine, &fake_mmap_event, NULL);
			}

			for (i = 0; i < ARRAY_SIZE(fake_symbols); i++) {
			size_t k;
			struct dso *dso;

			dso = __dsos__findnew(&machine->user_dsos,
			fake_symbols[i].dso_name);
			if (dso == NULL)
			goto out;

			/* emulate dso__load() */
			dso__set_loaded(dso, MAP__FUNCTION);

			for (k = 0; k < fake_symbols[i].nr_syms; k++) {
			struct symbol *sym;
			struct fake_sym *fsym = &fake_symbols[i].syms[k];

			sym = symbol__new(fsym->start, fsym->length,
			STB_GLOBAL, fsym->name);
			if (sym == NULL)
			goto out;

			symbols__insert(&dso->symbols[MAP__FUNCTION], sym);
			}
			}

			return machine;

			out:
			pr_debug("Not enough memory for machine setup\n");
			machine__delete_threads(machine);
			machine__delete(machine);
			return NULL;
			}