Re: [PATCH 39/41] perf tools: Allow TSC conversion on any arch

[Arnaldo Carvalho de Melo]

Em Mon, Jul 14, 2014 at 01:03:03PM +0300, Adrian Hunter escreveu:
> It is possible to record a perf.data file on
> one architecture and process it on another.
> Consequently, TSC conversion functions need
> to be moved out of the arch directory.

Can you state where a TSC is stored in perf.data, and how in the !x86
arch this will be detected so that those functions will be used?

- Arnaldo
 
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
>  tools/perf/Makefile.perf            |  2 ++
>  tools/perf/arch/x86/util/tsc.c      | 22 +---------------------
>  tools/perf/arch/x86/util/tsc.h      |  3 ---
>  tools/perf/tests/perf-time-to-tsc.c |  3 +--
>  tools/perf/util/tsc.c               | 25 +++++++++++++++++++++++++
>  tools/perf/util/tsc.h               | 11 +++++++++++
>  6 files changed, 40 insertions(+), 26 deletions(-)
>  create mode 100644 tools/perf/util/tsc.c
>  create mode 100644 tools/perf/util/tsc.h
> 
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 9670a16..abca577 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -295,6 +295,7 @@ LIB_H += util/intlist.h
>  LIB_H += util/perf_regs.h
>  LIB_H += util/unwind.h
>  LIB_H += util/vdso.h
> +LIB_H += util/tsc.h
>  LIB_H += ui/helpline.h
>  LIB_H += ui/progress.h
>  LIB_H += ui/util.h
> @@ -373,6 +374,7 @@ LIB_OBJS += $(OUTPUT)util/stat.o
>  LIB_OBJS += $(OUTPUT)util/record.o
>  LIB_OBJS += $(OUTPUT)util/srcline.o
>  LIB_OBJS += $(OUTPUT)util/data.o
> +LIB_OBJS += $(OUTPUT)util/tsc.o
>  
>  LIB_OBJS += $(OUTPUT)ui/setup.o
>  LIB_OBJS += $(OUTPUT)ui/helpline.o
> diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c
> index 40021fa..3655f24 100644
> --- a/tools/perf/arch/x86/util/tsc.c
> +++ b/tools/perf/arch/x86/util/tsc.c
> @@ -6,29 +6,9 @@
>  #include "../../perf.h"
>  #include <linux/types.h>
>  #include "../../util/debug.h"
> +#include "../../util/tsc.h"
>  #include "tsc.h"
>  
> -u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc)
> -{
> -	u64 t, quot, rem;
> -
> -	t = ns - tc->time_zero;
> -	quot = t / tc->time_mult;
> -	rem  = t % tc->time_mult;
> -	return (quot << tc->time_shift) +
> -	       (rem << tc->time_shift) / tc->time_mult;
> -}
> -
> -u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc)
> -{
> -	u64 quot, rem;
> -
> -	quot = cyc >> tc->time_shift;
> -	rem  = cyc & ((1 << tc->time_shift) - 1);
> -	return tc->time_zero + quot * tc->time_mult +
> -	       ((rem * tc->time_mult) >> tc->time_shift);
> -}
> -
>  int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
>  			     struct perf_tsc_conversion *tc)
>  {
> diff --git a/tools/perf/arch/x86/util/tsc.h b/tools/perf/arch/x86/util/tsc.h
> index 2affe03..2edc4d3 100644
> --- a/tools/perf/arch/x86/util/tsc.h
> +++ b/tools/perf/arch/x86/util/tsc.h
> @@ -14,7 +14,4 @@ struct perf_event_mmap_page;
>  int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
>  			     struct perf_tsc_conversion *tc);
>  
> -u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc);
> -u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc);
> -
>  #endif /* TOOLS_PERF_ARCH_X86_UTIL_TSC_H__ */
> diff --git a/tools/perf/tests/perf-time-to-tsc.c b/tools/perf/tests/perf-time-to-tsc.c
> index 3b7cd4d..0372f6e 100644
> --- a/tools/perf/tests/perf-time-to-tsc.c
> +++ b/tools/perf/tests/perf-time-to-tsc.c
> @@ -8,10 +8,9 @@
>  #include "evsel.h"
>  #include "thread_map.h"
>  #include "cpumap.h"
> +#include "tsc.h"
>  #include "tests.h"
>  
> -#include "../arch/x86/util/tsc.h"
> -
>  #define CHECK__(x) {				\
>  	while ((x) < 0) {			\
>  		pr_debug(#x " failed!\n");	\
> diff --git a/tools/perf/util/tsc.c b/tools/perf/util/tsc.c
> new file mode 100644
> index 0000000..ef4749836
> --- /dev/null
> +++ b/tools/perf/util/tsc.c
> @@ -0,0 +1,25 @@
> +#include <linux/compiler.h>
> +#include <linux/types.h>
> +
> +#include "tsc.h"
> +
> +u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc)
> +{
> +	u64 t, quot, rem;
> +
> +	t = ns - tc->time_zero;
> +	quot = t / tc->time_mult;
> +	rem  = t % tc->time_mult;
> +	return (quot << tc->time_shift) +
> +	       (rem << tc->time_shift) / tc->time_mult;
> +}
> +
> +u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc)
> +{
> +	u64 quot, rem;
> +
> +	quot = cyc >> tc->time_shift;
> +	rem  = cyc & ((1 << tc->time_shift) - 1);
> +	return tc->time_zero + quot * tc->time_mult +
> +	       ((rem * tc->time_mult) >> tc->time_shift);
> +}
> diff --git a/tools/perf/util/tsc.h b/tools/perf/util/tsc.h
> new file mode 100644
> index 0000000..4eca848
> --- /dev/null
> +++ b/tools/perf/util/tsc.h
> @@ -0,0 +1,11 @@
> +#ifndef __PERF_TSC_H
> +#define __PERF_TSC_H
> +
> +#include <linux/types.h>
> +
> +#include "../arch/x86/util/tsc.h"
> +
> +u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc);
> +u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc);
> +
> +#endif
> -- 
> 1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/