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

Commit 0b437860 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Allow TSC conversion on any arch 



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.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1405332185-4050-40-git-send-email-adrian.hunter@intel.com


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

tools/perf/Makefile.perf

+2 −0
Original line number Diff line number Diff line
@@ -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
@@ -374,6 +375,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

tools/perf/arch/x86/util/tsc.c

+1 −21
Original line number Diff line number Diff line
@@ -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)

{

tools/perf/arch/x86/util/tsc.h

+0 −3
Original line number Diff line number Diff line
@@ -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__ */

tools/perf/tests/perf-time-to-tsc.c

+1 −2
Original line number Diff line number Diff line
@@ -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");	\

tools/perf/util/tsc.c

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#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);

}