Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core (d9e24427) · Commits · e / devices / android_kernel_oneplus_sm8150

tools/perf/Documentation/perf-report.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -80,9 +80,10 @@ OPTIONS
		--dump-raw-trace::
		Dump raw trace in ASCII.

		-g [type,min,order]::
		-g [type,min[,limit],order]::
		--call-graph::
		Display call chains using type, min percent threshold and order.
		Display call chains using type, min percent threshold, optional print
		limit and order.
		type can be either:
		- flat: single column, linear exposure of call chains.
		- graph: use a graph tree, displaying absolute overhead rates.

tools/perf/builtin-record.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -700,6 +700,7 @@ const struct option record_options[] = {
		OPT_BOOLEAN('d', "data", &record.opts.sample_address,
		"Sample addresses"),
		OPT_BOOLEAN('T', "timestamp", &record.opts.sample_time, "Sample timestamps"),
		OPT_BOOLEAN('P', "period", &record.opts.period, "Sample period"),
		OPT_BOOLEAN('n', "no-samples", &record.opts.no_samples,
		"don't sample"),
		OPT_BOOLEAN('N', "no-buildid-cache", &record.no_buildid_cache,

tools/perf/builtin-report.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -407,7 +407,7 @@ parse_callchain_opt(const struct option opt, const char arg, int unset)
		goto setup;

		if (tok2[0] != 'c') {
		callchain_param.print_limit = strtod(tok2, &endptr);
		callchain_param.print_limit = strtoul(tok2, &endptr, 0);
		tok2 = strtok(NULL, ",");
		if (!tok2)
		goto setup;
		@@ -485,8 +485,8 @@ int cmd_report(int argc, const char *argv, const char prefix __used)
		"regex filter to identify parent, see: '--sort parent'"),
		OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,
		"Only display entries with parent-match"),
		OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent, call_order",
		"Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold and callchain order. "
		OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order",
		"Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit and callchain order. "
		"Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt),
		OPT_BOOLEAN('G', "inverted", &report.inverted_callchain,
		"alias for inverted call graph"),

tools/perf/builtin-test.c

+126 −1

Original line number	Diff line number	Diff line
		@@ -603,7 +603,7 @@ static int test__basic_mmap(void)

		#define TEST_ASSERT_VAL(text, cond) \
		do { \
		if (!cond) { \
		if (!(cond)) { \
		pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
		return -1; \
		} \
		@@ -759,6 +759,103 @@ static int test__checkevent_breakpoint_w(struct perf_evlist *evlist)
		return 0;
		}

		static int test__checkevent_tracepoint_modifier(struct perf_evlist *evlist)
		{
		struct perf_evsel *evsel = list_entry(evlist->entries.next,
		struct perf_evsel, node);

		TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
		TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
		TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
		TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);

		return test__checkevent_tracepoint(evlist);
		}

		static int
		test__checkevent_tracepoint_multi_modifier(struct perf_evlist *evlist)
		{
		struct perf_evsel *evsel;

		TEST_ASSERT_VAL("wrong number of entries", evlist->nr_entries > 1);

		list_for_each_entry(evsel, &evlist->entries, node) {
		TEST_ASSERT_VAL("wrong exclude_user",
		!evsel->attr.exclude_user);
		TEST_ASSERT_VAL("wrong exclude_kernel",
		evsel->attr.exclude_kernel);
		TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
		TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
		}

		return test__checkevent_tracepoint_multi(evlist);
		}

		static int test__checkevent_raw_modifier(struct perf_evlist *evlist)
		{
		struct perf_evsel *evsel = list_entry(evlist->entries.next,
		struct perf_evsel, node);

		TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
		TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
		TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
		TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);

		return test__checkevent_raw(evlist);
		}

		static int test__checkevent_numeric_modifier(struct perf_evlist *evlist)
		{
		struct perf_evsel *evsel = list_entry(evlist->entries.next,
		struct perf_evsel, node);

		TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
		TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
		TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
		TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);

		return test__checkevent_numeric(evlist);
		}

		static int test__checkevent_symbolic_name_modifier(struct perf_evlist *evlist)
		{
		struct perf_evsel *evsel = list_entry(evlist->entries.next,
		struct perf_evsel, node);

		TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
		TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
		TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
		TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);

		return test__checkevent_symbolic_name(evlist);
		}

		static int test__checkevent_symbolic_alias_modifier(struct perf_evlist *evlist)
		{
		struct perf_evsel *evsel = list_entry(evlist->entries.next,
		struct perf_evsel, node);

		TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
		TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
		TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
		TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);

		return test__checkevent_symbolic_alias(evlist);
		}

		static int test__checkevent_genhw_modifier(struct perf_evlist *evlist)
		{
		struct perf_evsel *evsel = list_entry(evlist->entries.next,
		struct perf_evsel, node);

		TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
		TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
		TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
		TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);

		return test__checkevent_genhw(evlist);
		}

		static struct test__event_st {
		const char *name;
		__u32 type;
		@@ -808,6 +905,34 @@ static struct test__event_st {
		.name = "mem:0:w",
		.check = test__checkevent_breakpoint_w,
		},
		{
		.name = "syscalls:sys_enter_open:k",
		.check = test__checkevent_tracepoint_modifier,
		},
		{
		.name = "syscalls:*:u",
		.check = test__checkevent_tracepoint_multi_modifier,
		},
		{
		.name = "r1:kp",
		.check = test__checkevent_raw_modifier,
		},
		{
		.name = "1:1:hp",
		.check = test__checkevent_numeric_modifier,
		},
		{
		.name = "instructions:h",
		.check = test__checkevent_symbolic_name_modifier,
		},
		{
		.name = "faults:u",
		.check = test__checkevent_symbolic_alias_modifier,
		},
		{
		.name = "L1-dcache-load-miss:kp",
		.check = test__checkevent_genhw_modifier,
		},
		};

		#define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))

tools/perf/perf.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -200,6 +200,7 @@ struct perf_record_opts {
		bool sample_time;
		bool sample_id_all_avail;
		bool system_wide;
		bool period;
		unsigned int freq;
		unsigned int mmap_pages;
		unsigned int user_freq;