Commit e3a6a624 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.12-20170324' of... 

Merge tag 'perf-core-for-mingo-4.12-20170324' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

 - Allow suppressing 'uncore_' when specifying PMU events (Andi Kleen)

 - Collapse identically named PMU events in 'perf stat', allow
   not merging it via --no-merge (Andi Kleen)

Fixes:

 - Use more precise 'grep -v' to suppress unwanted 'objdump -dS'
   disassembly output to not ditch line:number lines needed by
   'perf annotate --print-lines' logic (Taeung Song)

Infrastructure changes:

 - SDT (Statically Defined Tracing)/uprobes_events arguments improvements
   (Alexis Berlemont, Ravi Bangoria)

 - Improvements for the handling of JSON described vendor events,
   including having an expression parser to calculate metrics
   from multiple vendor events (Andi Kleen)

 - Update Intel JSON vendor event files (Andi Kleen)

 - Restore error reporting in 'perf probe -d' when none of the events
   requested to be deleted exist. (Kefeng Wang)

 - Bump MAX_CMDLEN in 'perf probe' to match what the kernel accepts
   (Ravi Bangoria)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 267dd0a0 bf874fcf

tools/perf/Documentation/perf-list.txt

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ Don't print descriptions. 
--long-desc::

Print longer event descriptions.



--details::

Print how named events are resolved internally into perf events, and also

any extra expressions computed by perf stat.





[[EVENT_MODIFIERS]]

EVENT MODIFIERS

tools/perf/Documentation/perf-stat.txt

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ To interpret the results it is usually needed to know on which 
CPUs the workload runs on. If needed the CPUs can be forced using

taskset.



--no-merge::

Do not merge results from same PMUs.



EXAMPLES

--------

tools/perf/arch/x86/util/perf_regs.c

+103 −0
Original line number Diff line number Diff line 
#include <string.h>



#include "../../perf.h"

#include "../../util/util.h"

#include "../../util/perf_regs.h"



const struct sample_reg sample_reg_masks[] = {
@@ -26,3 +29,103 @@ const struct sample_reg sample_reg_masks[] = { 
#endif

	SMPL_REG_END

};



struct sdt_name_reg {

	const char *sdt_name;

	const char *uprobe_name;

};

#define SDT_NAME_REG(n, m) {.sdt_name = "%" #n, .uprobe_name = "%" #m}

#define SDT_NAME_REG_END {.sdt_name = NULL, .uprobe_name = NULL}



static const struct sdt_name_reg sdt_reg_renamings[] = {

	SDT_NAME_REG(eax, ax),

	SDT_NAME_REG(rax, ax),

	SDT_NAME_REG(ebx, bx),

	SDT_NAME_REG(rbx, bx),

	SDT_NAME_REG(ecx, cx),

	SDT_NAME_REG(rcx, cx),

	SDT_NAME_REG(edx, dx),

	SDT_NAME_REG(rdx, dx),

	SDT_NAME_REG(esi, si),

	SDT_NAME_REG(rsi, si),

	SDT_NAME_REG(sil, si),

	SDT_NAME_REG(edi, di),

	SDT_NAME_REG(rdi, di),

	SDT_NAME_REG(dil, di),

	SDT_NAME_REG(ebp, bp),

	SDT_NAME_REG(rbp, bp),

	SDT_NAME_REG(bpl, bp),

	SDT_NAME_REG(rsp, sp),

	SDT_NAME_REG(esp, sp),

	SDT_NAME_REG(spl, sp),



	/* rNN registers */

	SDT_NAME_REG(r8b,  r8),

	SDT_NAME_REG(r8w,  r8),

	SDT_NAME_REG(r8d,  r8),

	SDT_NAME_REG(r9b,  r9),

	SDT_NAME_REG(r9w,  r9),

	SDT_NAME_REG(r9d,  r9),

	SDT_NAME_REG(r10b, r10),

	SDT_NAME_REG(r10w, r10),

	SDT_NAME_REG(r10d, r10),

	SDT_NAME_REG(r11b, r11),

	SDT_NAME_REG(r11w, r11),

	SDT_NAME_REG(r11d, r11),

	SDT_NAME_REG(r12b, r12),

	SDT_NAME_REG(r12w, r12),

	SDT_NAME_REG(r12d, r12),

	SDT_NAME_REG(r13b, r13),

	SDT_NAME_REG(r13w, r13),

	SDT_NAME_REG(r13d, r13),

	SDT_NAME_REG(r14b, r14),

	SDT_NAME_REG(r14w, r14),

	SDT_NAME_REG(r14d, r14),

	SDT_NAME_REG(r15b, r15),

	SDT_NAME_REG(r15w, r15),

	SDT_NAME_REG(r15d, r15),

	SDT_NAME_REG_END,

};



int sdt_rename_register(char **pdesc, char *old_name)

{

	const struct sdt_name_reg *rnames = sdt_reg_renamings;

	char *new_desc, *old_desc = *pdesc;

	size_t prefix_len, sdt_len, uprobe_len, old_desc_len, offset;

	int ret = -1;



	while (ret != 0 && rnames->sdt_name != NULL) {

		sdt_len = strlen(rnames->sdt_name);

		ret = strncmp(old_name, rnames->sdt_name, sdt_len);

		rnames += !!ret;

	}



	if (rnames->sdt_name == NULL)

		return 0;



	sdt_len = strlen(rnames->sdt_name);

	uprobe_len = strlen(rnames->uprobe_name);

	old_desc_len = strlen(old_desc) + 1;



	new_desc = zalloc(old_desc_len + uprobe_len - sdt_len);

	if (new_desc == NULL)

		return -1;



	/* Copy the chars before the register name (at least '%') */

	prefix_len = old_name - old_desc;

	memcpy(new_desc, old_desc, prefix_len);



	/* Copy the new register name */

	memcpy(new_desc + prefix_len, rnames->uprobe_name, uprobe_len);



	/* Copy the chars after the register name (if need be) */

	offset = prefix_len + sdt_len;

	if (offset < old_desc_len)

		memcpy(new_desc + prefix_len + uprobe_len,

			old_desc + offset, old_desc_len - offset);



	free(old_desc);

	*pdesc = new_desc;



	return 0;

}

tools/perf/builtin-list.c

+10 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <subcmd/parse-options.h>



static bool desc_flag = true;

static bool details_flag;



int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)

{
@@ -30,6 +31,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 
			    "Print extra event descriptions. --no-desc to not print."),

		OPT_BOOLEAN('v', "long-desc", &long_desc_flag,

			    "Print longer event descriptions."),

		OPT_BOOLEAN(0, "details", &details_flag,

			    "Print information on the perf event names and expressions used internally by events."),

		OPT_INCR(0, "debug", &verbose,

			     "Enable debugging output"),

		OPT_END()
@@ -50,7 +53,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 
		printf("\nList of pre-defined events (to be used in -e):\n\n");



	if (argc == 0) {

		print_events(NULL, raw_dump, !desc_flag, long_desc_flag);

		print_events(NULL, raw_dump, !desc_flag, long_desc_flag,

				details_flag);

		return 0;

	}
@@ -72,7 +76,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 
			print_hwcache_events(NULL, raw_dump);

		else if (strcmp(argv[i], "pmu") == 0)

			print_pmu_events(NULL, raw_dump, !desc_flag,

						long_desc_flag);

						long_desc_flag, details_flag);

		else if (strcmp(argv[i], "sdt") == 0)

			print_sdt_events(NULL, NULL, raw_dump);

		else if ((sep = strchr(argv[i], ':')) != NULL) {
@@ -80,7 +84,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 


			if (sep == NULL) {

				print_events(argv[i], raw_dump, !desc_flag,

							long_desc_flag);

							long_desc_flag,

							details_flag);

				continue;

			}

			sep_idx = sep - argv[i];
@@ -103,7 +108,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 
					    event_symbols_sw, PERF_COUNT_SW_MAX, raw_dump);

			print_hwcache_events(s, raw_dump);

			print_pmu_events(s, raw_dump, !desc_flag,

						long_desc_flag);

						long_desc_flag,

						details_flag);

			print_tracepoint_events(NULL, s, raw_dump);

			print_sdt_events(NULL, s, raw_dump);

			free(s);

tools/perf/builtin-probe.c

+3 −3
Original line number Diff line number Diff line
@@ -442,8 +442,8 @@ static int perf_del_probe_events(struct strfilter *filter) 
	}



	if (ret == -ENOENT && ret2 == -ENOENT)

		pr_debug("\"%s\" does not hit any event.\n", str);

		/* Note that this is silently ignored */

		pr_warning("\"%s\" does not hit any event.\n", str);

	else

		ret = 0;



error:

CRA Git | Maintained and supported by SUSTech CRA and CCSE