From 48b1585b8f81b5d9bbe6563f59132e9577e71495 Mon Sep 17 00:00:00 2001 From: Alexey Kopytov Date: Sun, 5 Jul 2015 18:32:41 +0300 Subject: [PATCH] Bug #77620: No cycle timer implementation for AArch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add AArch64-specific ‘cycles’ timer implementation. --- include/my_rdtsc.h | 1 + mysys/my_rdtsc.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h index 38ab0de..0fd3066 100644 --- a/include/my_rdtsc.h +++ b/include/my_rdtsc.h @@ -125,6 +125,7 @@ C_MODE_END #define MY_TIMER_ROUTINE_MACH_ABSOLUTE_TIME 25 #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26 #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64 27 +#define MY_TIMER_ROUTINE_ASM_AARCH64 28 #endif diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c index 028c7f8..6b668a8 100644 --- a/mysys/my_rdtsc.c +++ b/mysys/my_rdtsc.c @@ -224,6 +224,12 @@ ulonglong my_timer_cycles(void) clock_gettime(CLOCK_SGI_CYCLE, &tp); return (ulonglong) tp.tv_sec * 1000000000 + (ulonglong) tp.tv_nsec; } +#elif defined(__GNUC__) && defined(__aarch64__) + { + ulonglong result; + __asm __volatile__ ("mrs %[rt],cntvct_el0" : [rt] "=r" (result)); + return result; + } #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) /* gethrtime may appear as either cycle or nanosecond counter */ return (ulonglong) gethrtime(); @@ -533,6 +539,8 @@ void my_timer_init(MY_TIMER_INFO *mti) mti->cycles.routine= MY_TIMER_ROUTINE_ASM_GCC_SPARC32; #elif defined(__sgi) && defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) mti->cycles.routine= MY_TIMER_ROUTINE_SGI_CYCLE; +#elif defined(__GNUC__) && defined(__aarch64__) + mti->cycles.routine= MY_TIMER_ROUTINE_ASM_AARCH64; #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) mti->cycles.routine= MY_TIMER_ROUTINE_GETHRTIME; #else