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

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

perf tools: Move rdtsc() function 



Move the rdtsc() function so it can be reusued.

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/1406035081-14301-24-git-send-email-adrian.hunter@intel.com


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

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

+9 −0
Original line number Diff line number Diff line
@@ -37,3 +37,12 @@ int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc, 


	return 0;

}



u64 rdtsc(void)

{

	unsigned int low, high;



	asm volatile("rdtsc" : "=a" (low), "=d" (high));



	return low | ((u64)high) << 32;

}

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

+0 −9
Original line number Diff line number Diff line
@@ -25,15 +25,6 @@ 
	}					\

}



static u64 rdtsc(void)

{

	unsigned int low, high;



	asm volatile("rdtsc" : "=a" (low), "=d" (high));



	return low | ((u64)high) << 32;

}



/**

 * test__perf_time_to_tsc - test converting perf time to TSC.

 *

tools/perf/util/tsc.c

+5 −0
Original line number Diff line number Diff line
@@ -23,3 +23,8 @@ u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc) 
	return tc->time_zero + quot * tc->time_mult +

	       ((rem * tc->time_mult) >> tc->time_shift);

}



u64 __weak rdtsc(void)

{

	return 0;

}

tools/perf/util/tsc.h

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ 


u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc);

u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc);

u64 rdtsc(void);



#endif