Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 287e74aa authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Handle hw breakpoints event names in perf_evsel__name() 



Adding hw breakpoint events hook in the perf_evsel__name function, to
display event names properly all over the perf tools.

Updated hw breakpoints events tests.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Jovi Zhang <bookjovi@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1340918329-3012-3-git-send-email-jolsa@redhat.com


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

tools/perf/util/evsel.c

+30 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "cpumap.h"

#include "thread_map.h"

#include "target.h"

#include "../../../include/linux/hw_breakpoint.h"



#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))

#define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))
@@ -152,6 +153,31 @@ static int perf_evsel__sw_name(struct perf_evsel *evsel, char *bf, size_t size) 
	return r + perf_evsel__add_modifiers(evsel, bf + r, size - r);

}



static int __perf_evsel__bp_name(char *bf, size_t size, u64 addr, u64 type)

{

	int r;



	r = scnprintf(bf, size, "mem:0x%" PRIx64 ":", addr);



	if (type & HW_BREAKPOINT_R)

		r += scnprintf(bf + r, size - r, "r");



	if (type & HW_BREAKPOINT_W)

		r += scnprintf(bf + r, size - r, "w");



	if (type & HW_BREAKPOINT_X)

		r += scnprintf(bf + r, size - r, "x");



	return r;

}



static int perf_evsel__bp_name(struct perf_evsel *evsel, char *bf, size_t size)

{

	struct perf_event_attr *attr = &evsel->attr;

	int r = __perf_evsel__bp_name(bf, size, attr->bp_addr, attr->bp_type);

	return r + perf_evsel__add_modifiers(evsel, bf + r, size - r);

}



const char *perf_evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX]

				[PERF_EVSEL__MAX_ALIASES] = {

 { "L1-dcache",	"l1-d",		"l1d",		"L1-data",		},
@@ -285,6 +311,10 @@ const char *perf_evsel__name(struct perf_evsel *evsel) 
		scnprintf(bf, sizeof(bf), "%s", "unknown tracepoint");

		break;



	case PERF_TYPE_BREAKPOINT:

		perf_evsel__bp_name(evsel, bf, sizeof(bf));

		break;



	default:

		scnprintf(bf, sizeof(bf), "%s", "unknown attr type");

		break;

tools/perf/util/parse-events-test.c

+10 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ static int test__checkevent_breakpoint_modifier(struct perf_evlist *evlist) 
	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);

	TEST_ASSERT_VAL("wrong name",

			!strcmp(perf_evsel__name(evsel), "mem:0x0:rw:u"));



	return test__checkevent_breakpoint(evlist);

}
@@ -338,6 +340,8 @@ static int test__checkevent_breakpoint_x_modifier(struct perf_evlist *evlist) 
	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);

	TEST_ASSERT_VAL("wrong name",

			!strcmp(perf_evsel__name(evsel), "mem:0x0:x:k"));



	return test__checkevent_breakpoint_x(evlist);

}
@@ -351,6 +355,8 @@ static int test__checkevent_breakpoint_r_modifier(struct perf_evlist *evlist) 
	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);

	TEST_ASSERT_VAL("wrong name",

			!strcmp(perf_evsel__name(evsel), "mem:0x0:r:hp"));



	return test__checkevent_breakpoint_r(evlist);

}
@@ -364,6 +370,8 @@ static int test__checkevent_breakpoint_w_modifier(struct perf_evlist *evlist) 
	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);

	TEST_ASSERT_VAL("wrong name",

			!strcmp(perf_evsel__name(evsel), "mem:0x0:w:up"));



	return test__checkevent_breakpoint_w(evlist);

}
@@ -377,6 +385,8 @@ static int test__checkevent_breakpoint_rw_modifier(struct perf_evlist *evlist) 
	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);

	TEST_ASSERT_VAL("wrong name",

			!strcmp(perf_evsel__name(evsel), "mem:0x0:rw:kp"));



	return test__checkevent_breakpoint_rw(evlist);

}

tools/perf/util/parse-events.c

+1 −3
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ int parse_events_add_breakpoint(struct list_head **list, int *idx, 
				void *ptr, char *type)

{

	struct perf_event_attr attr;

	char name[MAX_NAME_LEN];



	memset(&attr, 0, sizeof(attr));

	attr.bp_addr = (unsigned long) ptr;
@@ -437,8 +436,7 @@ int parse_events_add_breakpoint(struct list_head **list, int *idx, 


	attr.type = PERF_TYPE_BREAKPOINT;



	snprintf(name, MAX_NAME_LEN, "mem:%p:%s", ptr, type ? type : "rw");

	return add_event(list, idx, &attr, name);

	return add_event(list, idx, &attr, NULL);

}



static int config_term(struct perf_event_attr *attr,