perf list: Skip unsupported events
Some hardware events might not be supported on a system. Listing those events seems meaningless and confusing to users. Let's skip them. Before: $ perf list cache | wc -l 33 After: $ perf list cache | wc -l 27 Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1377571313-14722-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
		
							parent
							
								
									395c307089
								
							
						
					
					
						commit
						b41f1cec91
					
				| @ -15,6 +15,7 @@ | |||||||
| #define YY_EXTRA_TYPE int | #define YY_EXTRA_TYPE int | ||||||
| #include "parse-events-flex.h" | #include "parse-events-flex.h" | ||||||
| #include "pmu.h" | #include "pmu.h" | ||||||
|  | #include "thread_map.h" | ||||||
| 
 | 
 | ||||||
| #define MAX_NAME_LEN 100 | #define MAX_NAME_LEN 100 | ||||||
| 
 | 
 | ||||||
| @ -1076,6 +1077,33 @@ int is_valid_tracepoint(const char *event_string) | |||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | static bool is_event_supported(u8 type, unsigned config) | ||||||
|  | { | ||||||
|  | 	bool ret = true; | ||||||
|  | 	struct perf_evsel *evsel; | ||||||
|  | 	struct perf_event_attr attr = { | ||||||
|  | 		.type = type, | ||||||
|  | 		.config = config, | ||||||
|  | 		.disabled = 1, | ||||||
|  | 		.exclude_kernel = 1, | ||||||
|  | 	}; | ||||||
|  | 	struct { | ||||||
|  | 		struct thread_map map; | ||||||
|  | 		int threads[1]; | ||||||
|  | 	} tmap = { | ||||||
|  | 		.map.nr	 = 1, | ||||||
|  | 		.threads = { 0 }, | ||||||
|  | 	}; | ||||||
|  | 
 | ||||||
|  | 	evsel = perf_evsel__new(&attr, 0); | ||||||
|  | 	if (evsel) { | ||||||
|  | 		ret = perf_evsel__open(evsel, NULL, &tmap.map) >= 0; | ||||||
|  | 		perf_evsel__delete(evsel); | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	return ret; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| static void __print_events_type(u8 type, struct event_symbol *syms, | static void __print_events_type(u8 type, struct event_symbol *syms, | ||||||
| 				unsigned max) | 				unsigned max) | ||||||
| { | { | ||||||
| @ -1083,14 +1111,16 @@ static void __print_events_type(u8 type, struct event_symbol *syms, | |||||||
| 	unsigned i; | 	unsigned i; | ||||||
| 
 | 
 | ||||||
| 	for (i = 0; i < max ; i++, syms++) { | 	for (i = 0; i < max ; i++, syms++) { | ||||||
|  | 		if (!is_event_supported(type, i)) | ||||||
|  | 			continue; | ||||||
|  | 
 | ||||||
| 		if (strlen(syms->alias)) | 		if (strlen(syms->alias)) | ||||||
| 			snprintf(name, sizeof(name),  "%s OR %s", | 			snprintf(name, sizeof(name),  "%s OR %s", | ||||||
| 				 syms->symbol, syms->alias); | 				 syms->symbol, syms->alias); | ||||||
| 		else | 		else | ||||||
| 			snprintf(name, sizeof(name), "%s", syms->symbol); | 			snprintf(name, sizeof(name), "%s", syms->symbol); | ||||||
| 
 | 
 | ||||||
| 		printf("  %-50s [%s]\n", name, | 		printf("  %-50s [%s]\n", name, event_type_descriptors[type]); | ||||||
| 			event_type_descriptors[type]); |  | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @ -1119,6 +1149,10 @@ int print_hwcache_events(const char *event_glob, bool name_only) | |||||||
| 				if (event_glob != NULL && !strglobmatch(name, event_glob)) | 				if (event_glob != NULL && !strglobmatch(name, event_glob)) | ||||||
| 					continue; | 					continue; | ||||||
| 
 | 
 | ||||||
|  | 				if (!is_event_supported(PERF_TYPE_HW_CACHE, | ||||||
|  | 							type | (op << 8) | (i << 16))) | ||||||
|  | 					continue; | ||||||
|  | 
 | ||||||
| 				if (name_only) | 				if (name_only) | ||||||
| 					printf("%s ", name); | 					printf("%s ", name); | ||||||
| 				else | 				else | ||||||
| @ -1148,6 +1182,9 @@ static void print_symbol_events(const char *event_glob, unsigned type, | |||||||
| 		      (syms->alias && strglobmatch(syms->alias, event_glob)))) | 		      (syms->alias && strglobmatch(syms->alias, event_glob)))) | ||||||
| 			continue; | 			continue; | ||||||
| 
 | 
 | ||||||
|  | 		if (!is_event_supported(type, i)) | ||||||
|  | 			continue; | ||||||
|  | 
 | ||||||
| 		if (name_only) { | 		if (name_only) { | ||||||
| 			printf("%s ", syms->symbol); | 			printf("%s ", syms->symbol); | ||||||
| 			continue; | 			continue; | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user