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

Commit 992c7e92 authored by Jin Yao's avatar Jin Yao Committed by Arnaldo Carvalho de Melo
Browse files

perf util: Create branch.c/.h for common branch functions 



Create new util/branch.c and util/branch.h to contain the common branch
functions. Such as:

branch_type_count(): Count the numbers of branch types
branch_type_name() : Return the name of branch type
branch_type_stat_display(): Display branch type statistics info
branch_type_str(): Construct the branch type string.

The branch type is saved in branch_flags.

Change log:

v8: Change PERF_BR_NONE to PERF_BR_UNKNOWN.

v7: Since the common branch type name is changed (e.g. JCC->COND),
    this patch is performed the modification accordingly.

v6: Move that multiline conditional code inside {} brackets.
    Move branch_type_stat_display() from builtin-report.c to
      branch.c.
    Move branch_type_str() from callchain.c to branch.c.

v5: It's a new patch in v5 patch series.

Signed-off-by: default avatarYao Jin <yao.jin@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1500379995-6449-6-git-send-email-yao.jin@linux.intel.com


[ Don't use 'index' and 'stat' as names for variables, it shadows global decls in older distros ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8d51735f

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ libperf-y += drv_configs.o 
libperf-y += units.o

libperf-y += time-utils.o

libperf-y += expr-bison.o

libperf-y += branch.o



libperf-$(CONFIG_LIBBPF) += bpf-loader.o

libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o

tools/perf/util/branch.c

0 → 100644
+147 −0
Original line number Diff line number Diff line 
#include "perf.h"

#include "util/util.h"

#include "util/debug.h"

#include "util/branch.h"



static bool cross_area(u64 addr1, u64 addr2, int size)

{

	u64 align1, align2;



	align1 = addr1 & ~(size - 1);

	align2 = addr2 & ~(size - 1);



	return (align1 != align2) ? true : false;

}



#define AREA_4K		4096

#define AREA_2M		(2 * 1024 * 1024)



void branch_type_count(struct branch_type_stat *st, struct branch_flags *flags,

		       u64 from, u64 to)

{

	if (flags->type == PERF_BR_UNKNOWN || from == 0)

		return;



	st->counts[flags->type]++;



	if (flags->type == PERF_BR_COND) {

		if (to > from)

			st->cond_fwd++;

		else

			st->cond_bwd++;

	}



	if (cross_area(from, to, AREA_2M))

		st->cross_2m++;

	else if (cross_area(from, to, AREA_4K))

		st->cross_4k++;

}



const char *branch_type_name(int type)

{

	const char *branch_names[PERF_BR_MAX] = {

		"N/A",

		"COND",

		"UNCOND",

		"IND",

		"CALL",

		"IND_CALL",

		"RET",

		"SYSCALL",

		"SYSRET",

		"COND_CALL",

		"COND_RET"

	};



	if (type >= 0 && type < PERF_BR_MAX)

		return branch_names[type];



	return NULL;

}



void branch_type_stat_display(FILE *fp, struct branch_type_stat *st)

{

	u64 total = 0;

	int i;



	for (i = 0; i < PERF_BR_MAX; i++)

		total += st->counts[i];



	if (total == 0)

		return;



	fprintf(fp, "\n#");

	fprintf(fp, "\n# Branch Statistics:");

	fprintf(fp, "\n#");



	if (st->cond_fwd > 0) {

		fprintf(fp, "\n%8s: %5.1f%%",

			"COND_FWD",

			100.0 * (double)st->cond_fwd / (double)total);

	}



	if (st->cond_bwd > 0) {

		fprintf(fp, "\n%8s: %5.1f%%",

			"COND_BWD",

			100.0 * (double)st->cond_bwd / (double)total);

	}



	if (st->cross_4k > 0) {

		fprintf(fp, "\n%8s: %5.1f%%",

			"CROSS_4K",

			100.0 * (double)st->cross_4k / (double)total);

	}



	if (st->cross_2m > 0) {

		fprintf(fp, "\n%8s: %5.1f%%",

			"CROSS_2M",

			100.0 * (double)st->cross_2m / (double)total);

	}



	for (i = 0; i < PERF_BR_MAX; i++) {

		if (st->counts[i] > 0)

			fprintf(fp, "\n%8s: %5.1f%%",

				branch_type_name(i),

				100.0 *

				(double)st->counts[i] / (double)total);

	}

}



static int count_str_scnprintf(int idx, const char *str, char *bf, int size)

{

	return scnprintf(bf, size, "%s%s", (idx) ? " " : " (", str);

}



int branch_type_str(struct branch_type_stat *st, char *bf, int size)

{

	int i, j = 0, printed = 0;

	u64 total = 0;



	for (i = 0; i < PERF_BR_MAX; i++)

		total += st->counts[i];



	if (total == 0)

		return 0;



	if (st->cond_fwd > 0)

		printed += count_str_scnprintf(j++, "COND_FWD", bf + printed, size - printed);



	if (st->cond_bwd > 0)

		printed += count_str_scnprintf(j++, "COND_BWD", bf + printed, size - printed);



	for (i = 0; i < PERF_BR_MAX; i++) {

		if (i == PERF_BR_COND)

			continue;



		if (st->counts[i] > 0)

			printed += count_str_scnprintf(j++, branch_type_name(i), bf + printed, size - printed);

	}



	if (st->cross_4k > 0)

		printed += count_str_scnprintf(j++, "CROSS_4K", bf + printed, size - printed);



	if (st->cross_2m > 0)

		printed += count_str_scnprintf(j++, "CROSS_2M", bf + printed, size - printed);



	return printed;

}

tools/perf/util/branch.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#ifndef _PERF_BRANCH_H

#define _PERF_BRANCH_H 1



#include <stdint.h>

#include "../perf.h"



struct branch_type_stat {

	u64 counts[PERF_BR_MAX];

	u64 cond_fwd;

	u64 cond_bwd;

	u64 cross_4k;

	u64 cross_2m;

};



struct branch_flags;



void branch_type_count(struct branch_type_stat *st, struct branch_flags *flags,

		       u64 from, u64 to);



const char *branch_type_name(int type);

void branch_type_stat_display(FILE *fp, struct branch_type_stat *st);

int branch_type_str(struct branch_type_stat *st, char *bf, int bfsize);



#endif /* _PERF_BRANCH_H */

tools/perf/util/event.h

+2 −1
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ struct branch_flags { 
	u64 in_tx:1;

	u64 abort:1;

	u64 cycles:16;

	u64 reserved:44;

	u64 type:4;

	u64 reserved:40;

};



struct branch_entry {