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

Commit 0c877d75 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Introduce perf_mem__tlb_scnprintf function 



Move meminfo's tlb display function into mem-events.c object, so it
could be reused later from script code.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1456303616-26926-6-git-send-email-jolsa@kernel.org


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

tools/perf/util/mem-events.c

+47 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <api/fs/fs.h>

#include "mem-events.h"

#include "debug.h"

#include "symbol.h"



#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s }
@@ -83,3 +84,49 @@ int perf_mem_events__init(void) 


	return found ? 0 : -ENOENT;

}



static const char * const tlb_access[] = {

	"N/A",

	"HIT",

	"MISS",

	"L1",

	"L2",

	"Walker",

	"Fault",

};



void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info)

{

	size_t l = 0, i;

	u64 m = PERF_MEM_TLB_NA;

	u64 hit, miss;



	sz -= 1; /* -1 for null termination */

	out[0] = '\0';



	if (mem_info)

		m = mem_info->data_src.mem_dtlb;



	hit = m & PERF_MEM_TLB_HIT;

	miss = m & PERF_MEM_TLB_MISS;



	/* already taken care of */

	m &= ~(PERF_MEM_TLB_HIT|PERF_MEM_TLB_MISS);



	for (i = 0; m && i < ARRAY_SIZE(tlb_access); i++, m >>= 1) {

		if (!(m & 0x1))

			continue;

		if (l) {

			strcat(out, " or ");

			l += 4;

		}

		strncat(out, tlb_access[i], sz - l);

		l += strlen(tlb_access[i]);

	}

	if (*out == '\0')

		strcpy(out, "N/A");

	if (hit)

		strncat(out, " hit", sz - l);

	if (miss)

		strncat(out, " miss", sz - l);

}

tools/perf/util/mem-events.h

+3 −0
Original line number Diff line number Diff line
@@ -23,4 +23,7 @@ int perf_mem_events__parse(const char *str); 
int perf_mem_events__init(void);



char *perf_mem_events__name(int i);



struct mem_info;

void perf_mem__tlb_scnprintf(char *out, size_t sz, struct mem_info *mem_info);

#endif /* __PERF_MEM_EVENTS_H */

tools/perf/util/sort.c

+2 −42
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "evsel.h"

#include "evlist.h"

#include <traceevent/event-parse.h>

#include "mem-events.h"



regex_t		parent_regex;

const char	default_parent_pattern[] = "^sys_|^do_page_fault";
@@ -829,53 +830,12 @@ sort__tlb_cmp(struct hist_entry *left, struct hist_entry *right) 
	return (int64_t)(data_src_r.mem_dtlb - data_src_l.mem_dtlb);

}



static const char * const tlb_access[] = {

	"N/A",

	"HIT",

	"MISS",

	"L1",

	"L2",

	"Walker",

	"Fault",

};



static int hist_entry__tlb_snprintf(struct hist_entry *he, char *bf,

				    size_t size, unsigned int width)

{

	char out[64];

	size_t sz = sizeof(out) - 1; /* -1 for null termination */

	size_t l = 0, i;

	u64 m = PERF_MEM_TLB_NA;

	u64 hit, miss;



	out[0] = '\0';



	if (he->mem_info)

		m = he->mem_info->data_src.mem_dtlb;



	hit = m & PERF_MEM_TLB_HIT;

	miss = m & PERF_MEM_TLB_MISS;



	/* already taken care of */

	m &= ~(PERF_MEM_TLB_HIT|PERF_MEM_TLB_MISS);



	for (i = 0; m && i < ARRAY_SIZE(tlb_access); i++, m >>= 1) {

		if (!(m & 0x1))

			continue;

		if (l) {

			strcat(out, " or ");

			l += 4;

		}

		strncat(out, tlb_access[i], sz - l);

		l += strlen(tlb_access[i]);

	}

	if (*out == '\0')

		strcpy(out, "N/A");

	if (hit)

		strncat(out, " hit", sz - l);

	if (miss)

		strncat(out, " miss", sz - l);



	perf_mem__tlb_scnprintf(out, sizeof(out), he->mem_info);

	return repsep_snprintf(bf, size, "%-*s", width, out);

}