perf cacheline: Move cacheline related routines to separate files
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 125009026bfc9ec929975d35344bf69d2c636e95 Gitweb: https://git.kernel.org/tip/125009026bfc9ec929975d35344bf69d2c636e95 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 22 Aug 2019 16:58:29 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 26 Aug 2019 11:58:29 -03:00
perf cacheline: Move cacheline related routines to separate files
To disentangle util/sort.h a bit more.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-c2c.c | 1 + tools/perf/util/Build | 1 + tools/perf/util/cacheline.c | 26 ++++++++++++++++++++++++++ tools/perf/util/cacheline.h | 21 +++++++++++++++++++++ tools/perf/util/sort.c | 1 + tools/perf/util/sort.h | 12 ------------ tools/perf/util/util.c | 20 -------------------- tools/perf/util/util.h | 1 - 8 files changed, 50 insertions(+), 33 deletions(-) create mode 100644 tools/perf/util/cacheline.c create mode 100644 tools/perf/util/cacheline.h
tools/perf/builtin-c2c.c +1 -0
@@ -26,6 +26,7 @@#include "hist.h" #include "sort.h" #include "tool.h" +#include "cacheline.h" #include "data.h" #include "event.h" #include "evlist.h"
tools/perf/util/Build +1 -0
@@ -1,6 +1,7 @@ perf-y += annotate.o perf-y += block-range.o perf-y += build-id.o +perf-y += cacheline.o perf-y += config.o perf-y += ctype.o perf-y += db-export.o
tools/perf/util/cacheline.c new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "cacheline.h" +#include "../perf.h" +#include <unistd.h> + +#ifdef _SC_LEVEL1_DCACHE_LINESIZE +#define cache_line_size (cacheline_sizep) *cacheline_sizep = sysconf(_SC_LEVEL1_DCACHE_LINESIZE) +#else +#include <api/fs/fs.h> +#include "debug.h" +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; +}
tools/perf/util/cacheline.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef PERF_CACHELINE_H +#define PERF_CACHELINE_H + +#include <linux/compiler.h> + +int __pure cacheline_size (void ); + +static inline u64 cl_address (u64 address) +{ +/* return the cacheline of the address */ +return (address & ~(cacheline_size () -1 )); +} + +static inline u64 cl_offset (u64 address) +{ +/* return the cacheline of the address */ +return (address & (cacheline_size () -1 )); +} + +#endif // PERF_CACHELINE_H
tools/perf/util/sort.c +1 -0
@@ -6,6 +6,7 @@#include <linux/time64.h> #include "sort.h" #include "hist.h" +#include "cacheline.h" #include "comm.h" #include "map.h" #include "symbol.h"
tools/perf/util/sort.h +0 -12
@@ -204,18 +204,6 @@ static inline float hist_entry__get_percent_limit(struct hist_entry *he)return period *100.0 / total_period; } -static inline u64 cl_address (u64 address) -{ -/* return the cacheline of the address */ -return (address & ~(cacheline_size () -1 )); -} - -static inline u64 cl_offset (u64 address) -{ -/* return the cacheline of the address */ -return (address & (cacheline_size () -1 )); -} -enum sort_mode {SORT_MODE__NORMAL ,SORT_MODE__BRANCH ,
tools/perf/util/util.c +0 -20
@@ -43,26 +43,6 @@ void perf_set_multithreaded(void)unsigned int page_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_contexts_per_stack =PERF_MAX_CONTEXTS_PER_STACK ;
tools/perf/util/util.h +0 -1
@@ -34,7 +34,6 @@ int copyfile_offset(int ifd, loff_t off_in, int ofd, loff_t off_out, u64 size);size_t hex_width (u64 v);extern unsigned int page_size; -int __pure cacheline_size (void );int sysctl__max_stack (void );