diff --git a/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h b/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h --- a/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h +++ b/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h @@ -105,6 +105,13 @@ return __smid(); } +INLINE double __target_impl_get_wtick() { return ((double)1E-9); } + +EXTERN int64_t __clock64(); +INLINE double __target_impl_get_wtime() { + return ((double)1.0 / 745000000.0) * __clock64(); +} + INLINE uint64_t __kmpc_impl_ffs(uint64_t x) { return __builtin_ffsl(x); } INLINE uint64_t __kmpc_impl_popc(uint64_t x) { return __builtin_popcountl(x); } diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu --- a/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu @@ -12,19 +12,16 @@ //===----------------------------------------------------------------------===// #include "common/omptarget.h" - -// Timer precision is 1ns -#define TIMER_PRECISION ((double)1E-9) +#include "target_impl.h" EXTERN double omp_get_wtick(void) { - PRINT(LD_IO, "omp_get_wtick() returns %g\n", TIMER_PRECISION); - return TIMER_PRECISION; + double rc = __target_impl_get_wtick(); + PRINT(LD_IO, "omp_get_wtick() returns %g\n", rc); + return rc; } EXTERN double omp_get_wtime(void) { - unsigned long long nsecs; - asm("mov.u64 %0, %%globaltimer;" : "=l"(nsecs)); - double rc = (double)nsecs * TIMER_PRECISION; + double rc = __target_impl_get_wtime(); PRINT(LD_IO, "call omp_get_wtime() returns %g\n", rc); return rc; } diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h --- a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h @@ -100,6 +100,17 @@ return id; } +INLINE double __target_impl_get_wtick() { + // Timer precision is 1ns + return ((double)1E-9); +} + +INLINE double __target_impl_get_wtime() { + unsigned long long nsecs; + asm("mov.u64 %0, %%globaltimer;" : "=l"(nsecs)); + return (double)nsecs * __target_impl_get_wtick(); +} + INLINE uint32_t __kmpc_impl_ffs(uint32_t x) { return __ffs(x); } INLINE uint32_t __kmpc_impl_popc(uint32_t x) { return __popc(x); }