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

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

perf tools: Read the cache line size lazily 

It is not read as commonly as 'page_size', so it makes sense to read it
lazily, caching its value when it is first read.

Less files open unconditionally at startup.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-35xhrq91u94uc1djtclek1ie@git.kernel.org


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

tools/perf/perf.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -421,16 +421,6 @@ void pthread__unblock_sigwinch(void) 
	pthread_sigmask(SIG_UNBLOCK, &set, NULL);

	pthread_sigmask(SIG_UNBLOCK, &set, NULL);

}

}





#ifdef _SC_LEVEL1_DCACHE_LINESIZE

#define cache_line_size(cacheline_sizep) *cacheline_sizep = sysconf(_SC_LEVEL1_DCACHE_LINESIZE)

#else

static void cache_line_size(int *cacheline_sizep)

{

	if (sysfs__read_int("devices/system/cpu/cpu0/cache/index0/coherency_line_size", cacheline_sizep))

		pr_debug("cannot determine cache line size");

}

#endif



int main(int argc, const char **argv)

int main(int argc, const char **argv)

{

{

	int err;

	int err;
@@ -444,7 +434,6 @@ int main(int argc, const char **argv) 




	/* The page_size is placed in util object. */

	/* The page_size is placed in util object. */

	page_size = sysconf(_SC_PAGE_SIZE);

	page_size = sysconf(_SC_PAGE_SIZE);

	cache_line_size(&cacheline_size);





	if (sysctl__read_int("kernel/perf_event_max_stack", &value) == 0)

	if (sysctl__read_int("kernel/perf_event_max_stack", &value) == 0)

		sysctl_perf_event_max_stack = value;

		sysctl_perf_event_max_stack = value;

tools/perf/util/sort.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2582,7 +2582,7 @@ int sort_dimension__add(struct perf_hpp_list *list, const char *tok, 
		if (sort__mode != SORT_MODE__MEMORY)

		if (sort__mode != SORT_MODE__MEMORY)

			return -EINVAL;

			return -EINVAL;





		if (sd->entry == &sort_mem_dcacheline && cacheline_size == 0)

		if (sd->entry == &sort_mem_dcacheline && cacheline_size() == 0)

			return -EINVAL;

			return -EINVAL;





		if (sd->entry == &sort_mem_daddr_sym)

		if (sd->entry == &sort_mem_daddr_sym)
@@ -2628,7 +2628,7 @@ static int setup_sort_list(struct perf_hpp_list *list, char *str, 
		if (*tok) {

		if (*tok) {

			ret = sort_dimension__add(list, tok, evlist, level);

			ret = sort_dimension__add(list, tok, evlist, level);

			if (ret == -EINVAL) {

			if (ret == -EINVAL) {

				if (!cacheline_size && !strncasecmp(tok, "dcacheline", strlen(tok)))

				if (!cacheline_size() && !strncasecmp(tok, "dcacheline", strlen(tok)))

					pr_err("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");

					pr_err("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");

				else

				else

					pr_err("Invalid --sort key: `%s'", tok);

					pr_err("Invalid --sort key: `%s'", tok);

tools/perf/util/sort.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -186,13 +186,13 @@ static inline float hist_entry__get_percent_limit(struct hist_entry *he) 
static inline u64 cl_address(u64 address)

static inline u64 cl_address(u64 address)

{

{

	/* return the cacheline of the address */

	/* return the cacheline of the address */

	return (address & ~(cacheline_size - 1));

	return (address & ~(cacheline_size() - 1));

}

}





static inline u64 cl_offset(u64 address)

static inline u64 cl_offset(u64 address)

{

{

	/* return the cacheline of the address */

	/* return the cacheline of the address */

	return (address & (cacheline_size - 1));

	return (address & (cacheline_size() - 1));

}

}





enum sort_mode {

enum sort_mode {

tools/perf/util/util.c

+20 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,26 @@ void perf_set_multithreaded(void) 
}

}





unsigned int page_size;

unsigned int page_size;

int cacheline_size;



#ifdef _SC_LEVEL1_DCACHE_LINESIZE

#define cache_line_size(cacheline_sizep) *cacheline_sizep = sysconf(_SC_LEVEL1_DCACHE_LINESIZE)

#else

static void cache_line_size(int *cacheline_sizep)

{

	if (sysfs__read_int("devices/system/cpu/cpu0/cache/index0/coherency_line_size", cacheline_sizep))

		pr_debug("cannot determine cache line size");

}

#endif



int cacheline_size(void)

{

	static int size;



	if (!size)

		cache_line_size(&size);



	return size;

}





int sysctl_perf_event_max_stack = PERF_MAX_STACK_DEPTH;

int sysctl_perf_event_max_stack = PERF_MAX_STACK_DEPTH;

int sysctl_perf_event_max_contexts_per_stack = PERF_MAX_CONTEXTS_PER_STACK;

int sysctl_perf_event_max_contexts_per_stack = PERF_MAX_CONTEXTS_PER_STACK;

tools/perf/util/util.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ size_t hex_width(u64 v); 
int hex2u64(const char *ptr, u64 *val);

int hex2u64(const char *ptr, u64 *val);





extern unsigned int page_size;

extern unsigned int page_size;

extern int cacheline_size;

int __pure cacheline_size(void);





int fetch_kernel_version(unsigned int *puint,

int fetch_kernel_version(unsigned int *puint,

			 char *str, size_t str_sz);

			 char *str, size_t str_sz);