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

Commit daec78a0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evsel: Adopt MATCH_EVENT macro from 'stat' 



Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 69aad6f1

tools/perf/builtin-stat.c

+16 −21
Original line number Original line Diff line number Diff line
@@ -170,10 +170,6 @@ struct stats runtime_cycles_stats[MAX_NR_CPUS]; 
struct stats			runtime_branches_stats[MAX_NR_CPUS];

struct stats			runtime_branches_stats[MAX_NR_CPUS];

struct stats			walltime_nsecs_stats;

struct stats			walltime_nsecs_stats;





#define MATCH_EVENT(t, c, evsel)			\

	(evsel->attr.type == PERF_TYPE_##t &&	\

	 evsel->attr.config == PERF_COUNT_##c)



#define ERR_PERF_OPEN \

#define ERR_PERF_OPEN \

"counter %d, sys_perf_event_open() syscall returned with %d (%s).  /bin/dmesg may provide additional information."

"counter %d, sys_perf_event_open() syscall returned with %d (%s).  /bin/dmesg may provide additional information."
@@ -229,10 +225,10 @@ static int create_perf_stat_counter(struct perf_evsel *evsel, bool *perm_err) 
/*

/*

 * Does the counter have nsecs as a unit?

 * Does the counter have nsecs as a unit?

 */

 */

static inline int nsec_counter(struct perf_evsel *counter)

static inline int nsec_counter(struct perf_evsel *evsel)

{

{

	if (MATCH_EVENT(SOFTWARE, SW_CPU_CLOCK, counter) ||

	if (perf_evsel__match(evsel, SOFTWARE, SW_CPU_CLOCK) ||

	    MATCH_EVENT(SOFTWARE, SW_TASK_CLOCK, counter))

	    perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK))

		return 1;

		return 1;





	return 0;

	return 0;
@@ -300,11 +296,11 @@ static void read_counter_aggr(struct perf_evsel *counter) 
	/*

	/*

	 * Save the full runtime - to allow normalization during printout:

	 * Save the full runtime - to allow normalization during printout:

	 */

	 */

	if (MATCH_EVENT(SOFTWARE, SW_TASK_CLOCK, counter))

	if (perf_evsel__match(counter, SOFTWARE, SW_TASK_CLOCK))

		update_stats(&runtime_nsecs_stats[0], count[0]);

		update_stats(&runtime_nsecs_stats[0], count[0]);

	if (MATCH_EVENT(HARDWARE, HW_CPU_CYCLES, counter))

	if (perf_evsel__match(counter, HARDWARE, HW_CPU_CYCLES))

		update_stats(&runtime_cycles_stats[0], count[0]);

		update_stats(&runtime_cycles_stats[0], count[0]);

	if (MATCH_EVENT(HARDWARE, HW_BRANCH_INSTRUCTIONS, counter))

	if (perf_evsel__match(counter, HARDWARE, HW_BRANCH_INSTRUCTIONS))

		update_stats(&runtime_branches_stats[0], count[0]);

		update_stats(&runtime_branches_stats[0], count[0]);

}

}
@@ -347,11 +343,11 @@ static void read_counter(struct perf_evsel *counter) 
		cpu_counts[cpu].ena = count[1];

		cpu_counts[cpu].ena = count[1];

		cpu_counts[cpu].run = count[2];

		cpu_counts[cpu].run = count[2];





		if (MATCH_EVENT(SOFTWARE, SW_TASK_CLOCK, counter))

		if (perf_evsel__match(counter, SOFTWARE, SW_TASK_CLOCK))

			update_stats(&runtime_nsecs_stats[cpu], count[0]);

			update_stats(&runtime_nsecs_stats[cpu], count[0]);

		if (MATCH_EVENT(HARDWARE, HW_CPU_CYCLES, counter))

		if (perf_evsel__match(counter, HARDWARE, HW_CPU_CYCLES))

			update_stats(&runtime_cycles_stats[cpu], count[0]);

			update_stats(&runtime_cycles_stats[cpu], count[0]);

		if (MATCH_EVENT(HARDWARE, HW_BRANCH_INSTRUCTIONS, counter))

		if (perf_evsel__match(counter, HARDWARE, HW_BRANCH_INSTRUCTIONS))

			update_stats(&runtime_branches_stats[cpu], count[0]);

			update_stats(&runtime_branches_stats[cpu], count[0]);

	}

	}

}

}
@@ -474,7 +470,7 @@ static void print_noise(struct perf_evsel *evsel, double avg) 
			100 * stddev_stats(&ps->res_stats[0]) / avg);

			100 * stddev_stats(&ps->res_stats[0]) / avg);

}

}





static void nsec_printout(int cpu, struct perf_evsel *counter, double avg)

static void nsec_printout(int cpu, struct perf_evsel *evsel, double avg)

{

{

	double msecs = avg / 1e6;

	double msecs = avg / 1e6;

	char cpustr[16] = { '\0', };

	char cpustr[16] = { '\0', };
@@ -485,18 +481,17 @@ static void nsec_printout(int cpu, struct perf_evsel *counter, double avg) 
			csv_output ? 0 : -4,

			csv_output ? 0 : -4,

			cpumap[cpu], csv_sep);

			cpumap[cpu], csv_sep);





	fprintf(stderr, fmt, cpustr, msecs, csv_sep, event_name(counter));

	fprintf(stderr, fmt, cpustr, msecs, csv_sep, event_name(evsel));





	if (csv_output)

	if (csv_output)

		return;

		return;





	if (MATCH_EVENT(SOFTWARE, SW_TASK_CLOCK, counter)) {

	if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK))

		fprintf(stderr, " # %10.3f CPUs ",

		fprintf(stderr, " # %10.3f CPUs ",

				avg / avg_stats(&walltime_nsecs_stats));

				avg / avg_stats(&walltime_nsecs_stats));

}

}

}





static void abs_printout(int cpu, struct perf_evsel *counter, double avg)

static void abs_printout(int cpu, struct perf_evsel *evsel, double avg)

{

{

	double total, ratio = 0.0;

	double total, ratio = 0.0;

	char cpustr[16] = { '\0', };

	char cpustr[16] = { '\0', };
@@ -516,19 +511,19 @@ static void abs_printout(int cpu, struct perf_evsel *counter, double avg) 
	else

	else

		cpu = 0;

		cpu = 0;





	fprintf(stderr, fmt, cpustr, avg, csv_sep, event_name(counter));

	fprintf(stderr, fmt, cpustr, avg, csv_sep, event_name(evsel));





	if (csv_output)

	if (csv_output)

		return;

		return;





	if (MATCH_EVENT(HARDWARE, HW_INSTRUCTIONS, counter)) {

	if (perf_evsel__match(evsel, HARDWARE, HW_INSTRUCTIONS)) {

		total = avg_stats(&runtime_cycles_stats[cpu]);

		total = avg_stats(&runtime_cycles_stats[cpu]);





		if (total)

		if (total)

			ratio = avg / total;

			ratio = avg / total;





		fprintf(stderr, " # %10.3f IPC  ", ratio);

		fprintf(stderr, " # %10.3f IPC  ", ratio);

	} else if (MATCH_EVENT(HARDWARE, HW_BRANCH_MISSES, counter) &&

	} else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES) &&

			runtime_branches_stats[cpu].n != 0) {

			runtime_branches_stats[cpu].n != 0) {

		total = avg_stats(&runtime_branches_stats[cpu]);

		total = avg_stats(&runtime_branches_stats[cpu]);

tools/perf/util/evsel.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -21,4 +21,8 @@ void perf_evsel__delete(struct perf_evsel *evsel); 
int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);

int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);

void perf_evsel__free_fd(struct perf_evsel *evsel);

void perf_evsel__free_fd(struct perf_evsel *evsel);





#define perf_evsel__match(evsel, t, c)		\

	(evsel->attr.type == PERF_TYPE_##t &&	\

	 evsel->attr.config == PERF_COUNT_##c)



#endif /* __PERF_EVSEL_H */
 
#endif /* __PERF_EVSEL_H */