From e27759956f0355609e5c785332ef0fad202568bb Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Sun, 23 Nov 2014 23:51:13 -0500 Subject: [PATCH 1/4] Allow the use of the optimized used timers --- opal/mca/timer/aix/timer_aix.h | 4 ++-- opal/mca/timer/altix/timer_altix.h | 4 ++-- opal/mca/timer/darwin/timer_darwin.h | 16 ++++++++++------ opal/mca/timer/darwin/timer_darwin_component.c | 6 ++---- opal/mca/timer/linux/timer_linux.h | 6 +++--- opal/mca/timer/solaris/timer_solaris.h | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/opal/mca/timer/aix/timer_aix.h b/opal/mca/timer/aix/timer_aix.h index 278ee71c97..2e99ffb60d 100644 --- a/opal/mca/timer/aix/timer_aix.h +++ b/opal/mca/timer/aix/timer_aix.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2006 The University of Tennessee and The University + * Copyright (c) 2004-2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -39,7 +39,7 @@ opal_timer_base_get_usec() retval = (t.tb_high * 1000000) + t.tb_low / 1000; return retval; -} +} static inline opal_timer_t opal_timer_base_get_cycles() diff --git a/opal/mca/timer/altix/timer_altix.h b/opal/mca/timer/altix/timer_altix.h index 1ed990999d..e588d74bb8 100644 --- a/opal/mca/timer/altix/timer_altix.h +++ b/opal/mca/timer/altix/timer_altix.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -36,7 +36,7 @@ static inline opal_timer_t opal_timer_base_get_usec(void) { return opal_timer_base_get_cycles() / opal_timer_altix_usec_conv; -} +} static inline opal_timer_t diff --git a/opal/mca/timer/darwin/timer_darwin.h b/opal/mca/timer/darwin/timer_darwin.h index 7d4e342c6c..961b3cfe09 100644 --- a/opal/mca/timer/darwin/timer_darwin.h +++ b/opal/mca/timer/darwin/timer_darwin.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -21,20 +21,24 @@ #include "opal_config.h" #include +#include typedef uint64_t opal_timer_t; /* frequency in mhz */ OPAL_DECLSPEC extern opal_timer_t opal_timer_darwin_freq; - +OPAL_DECLSPEC extern mach_timebase_info_data_t opal_timer_darwin_info; static inline opal_timer_t opal_timer_base_get_cycles(void) { + if( opal_timer_darwin_info.denom == 0 ) { + (void) mach_timebase_info(&opal_timer_darwin_info); + } /* this is basically a wrapper around the "right" assembly to get the tick counter off the PowerPC Time Base. I believe it's something similar on x86 */ - return mach_absolute_time(); + return mach_absolute_time() * opal_timer_darwin_info.numer / opal_timer_darwin_info.denom / 1000; } @@ -43,7 +47,7 @@ opal_timer_base_get_usec(void) { /* freq is in Hz, so this gives usec */ return mach_absolute_time() * 1000000 / opal_timer_darwin_freq; -} +} static inline opal_timer_t @@ -53,9 +57,9 @@ opal_timer_base_get_freq(void) } -#define OPAL_TIMER_CYCLE_NATIVE 1 +#define OPAL_TIMER_CYCLE_NATIVE 0 #define OPAL_TIMER_CYCLE_SUPPORTED 1 -#define OPAL_TIMER_USEC_NATIVE 0 +#define OPAL_TIMER_USEC_NATIVE 1 #define OPAL_TIMER_USEC_SUPPORTED 1 #endif diff --git a/opal/mca/timer/darwin/timer_darwin_component.c b/opal/mca/timer/darwin/timer_darwin_component.c index 6f05e2f088..aecb94ab95 100644 --- a/opal/mca/timer/darwin/timer_darwin_component.c +++ b/opal/mca/timer/darwin/timer_darwin_component.c @@ -2,7 +2,7 @@ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -20,17 +20,15 @@ #include "opal_config.h" -#include - #include "opal/mca/timer/timer.h" #include "opal/mca/timer/darwin/timer_darwin.h" #include "opal/constants.h" opal_timer_t opal_timer_darwin_freq; +mach_timebase_info_data_t opal_timer_darwin_info; static int opal_timer_darwin_open(void); - const opal_timer_base_component_2_0_0_t mca_timer_darwin_component = { /* First, the mca_component_t struct containing meta information about the component itself */ diff --git a/opal/mca/timer/linux/timer_linux.h b/opal/mca/timer/linux/timer_linux.h index 6bdffcb0f7..af3b84e057 100644 --- a/opal/mca/timer/linux/timer_linux.h +++ b/opal/mca/timer/linux/timer_linux.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -44,7 +44,7 @@ opal_timer_base_get_usec(void) #else return 0; #endif -} +} static inline opal_timer_t @@ -56,7 +56,7 @@ opal_timer_base_get_freq(void) #define OPAL_TIMER_CYCLE_NATIVE OPAL_HAVE_SYS_TIMER_GET_CYCLES #define OPAL_TIMER_CYCLE_SUPPORTED OPAL_HAVE_SYS_TIMER_GET_CYCLES -#define OPAL_TIMER_USEC_NATIVE 0 +#define OPAL_TIMER_USEC_NATIVE 1 #define OPAL_TIMER_USEC_SUPPORTED OPAL_HAVE_SYS_TIMER_GET_CYCLES #endif diff --git a/opal/mca/timer/solaris/timer_solaris.h b/opal/mca/timer/solaris/timer_solaris.h index a48c570448..40973c432b 100644 --- a/opal/mca/timer/solaris/timer_solaris.h +++ b/opal/mca/timer/solaris/timer_solaris.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -35,7 +35,7 @@ opal_timer_base_get_usec(void) { /* gethrtime returns nanoseconds */ return gethrtime() / 1000; -} +} static inline opal_timer_t opal_timer_base_get_freq(void) From 18a916fced1837b3aae0bf3bc9d1cdbcfa2fd035 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Sun, 23 Nov 2014 23:58:39 -0500 Subject: [PATCH 2/4] Cleanup the AMD64 timer function. --- opal/include/opal/sys/amd64/timer.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/opal/include/opal/sys/amd64/timer.h b/opal/include/opal/sys/amd64/timer.h index 67a1d32061..71b009886c 100644 --- a/opal/include/opal/sys/amd64/timer.h +++ b/opal/include/opal/sys/amd64/timer.h @@ -25,19 +25,6 @@ typedef uint64_t opal_timer_t; #if OPAL_GCC_INLINE_ASSEMBLY -#if 0 -static inline opal_timer_t -opal_sys_timer_get_cycles(void) -{ - opal_timer_t ret; - - __asm__ __volatile__("rdtsc" : "=A"(ret)); - - return ret; -} - -#else - static inline opal_timer_t opal_sys_timer_get_cycles(void) { @@ -46,8 +33,6 @@ opal_sys_timer_get_cycles(void) return ((opal_timer_t)a) | (((opal_timer_t)d) << 32); } -#endif - #define OPAL_HAVE_SYS_TIMER_GET_CYCLES 1 #else From 5f49a11b2901cfeab38025688e8ff881edb2d0a8 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Mon, 24 Nov 2014 00:44:50 -0500 Subject: [PATCH 3/4] Minor cleanups. --- opal/include/opal/sys/amd64/timer.h | 2 +- opal/mca/timer/darwin/timer_darwin_component.c | 5 ----- opal/mca/timer/linux/timer_linux.h | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/opal/include/opal/sys/amd64/timer.h b/opal/include/opal/sys/amd64/timer.h index 71b009886c..a0ea9c8520 100644 --- a/opal/include/opal/sys/amd64/timer.h +++ b/opal/include/opal/sys/amd64/timer.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University + * Copyright (c) 2004-2014 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, diff --git a/opal/mca/timer/darwin/timer_darwin_component.c b/opal/mca/timer/darwin/timer_darwin_component.c index aecb94ab95..15f52215c7 100644 --- a/opal/mca/timer/darwin/timer_darwin_component.c +++ b/opal/mca/timer/darwin/timer_darwin_component.c @@ -93,11 +93,6 @@ int opal_timer_darwin_open(void) nanoseconds, taking the reverse of that and multipling by 1000000000 will give you a frequency in cycles / second if you think of mach_absolute_time() always returning a cycle count. - - By the way, it's interesting to note that because these are - library functions and because of how rosetta works, a PPC - binary running under rosetta on an Intel Mac will behave - exactly like an Intel binary running on an Intel Mac. */ opal_timer_darwin_freq = sTBI.denom * (1000000000 / sTBI.numer); diff --git a/opal/mca/timer/linux/timer_linux.h b/opal/mca/timer/linux/timer_linux.h index af3b84e057..d4ffc8043e 100644 --- a/opal/mca/timer/linux/timer_linux.h +++ b/opal/mca/timer/linux/timer_linux.h @@ -56,7 +56,7 @@ opal_timer_base_get_freq(void) #define OPAL_TIMER_CYCLE_NATIVE OPAL_HAVE_SYS_TIMER_GET_CYCLES #define OPAL_TIMER_CYCLE_SUPPORTED OPAL_HAVE_SYS_TIMER_GET_CYCLES -#define OPAL_TIMER_USEC_NATIVE 1 +#define OPAL_TIMER_USEC_NATIVE OPAL_HAVE_SYS_TIMER_GET_CYCLES #define OPAL_TIMER_USEC_SUPPORTED OPAL_HAVE_SYS_TIMER_GET_CYCLES #endif From d4edd097c0ed0a87513065d328171b137bb0cab6 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Mon, 24 Nov 2014 00:45:14 -0500 Subject: [PATCH 4/4] Allow for native timer (cycle level) integration for MPI_Wtime and MPI_Wtick. --- ompi/mpi/c/wtick.c | 4 +++- ompi/mpi/c/wtime.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ompi/mpi/c/wtick.c b/ompi/mpi/c/wtick.c index 2d0b01fcd8..8088888e5f 100644 --- a/ompi/mpi/c/wtick.c +++ b/ompi/mpi/c/wtick.c @@ -40,7 +40,9 @@ double MPI_Wtick(void) { OPAL_CR_NOOP_PROGRESS(); -#if OPAL_TIMER_USEC_NATIVE +#if OPAL_TIMER_CYCLE_NATIVE + return opal_timer_base_get_freq(); +#elif OPAL_TIMER_USEC_NATIVE return 0.000001; #else /* Otherwise, we already return usec precision. */ diff --git a/ompi/mpi/c/wtime.c b/ompi/mpi/c/wtime.c index 6a39f51e23..c7309ddb0a 100644 --- a/ompi/mpi/c/wtime.c +++ b/ompi/mpi/c/wtime.c @@ -40,7 +40,9 @@ double MPI_Wtime(void) { double wtime; -#if OPAL_TIMER_USEC_NATIVE +#if OPAL_TIMER_CYCLE_NATIVE + wtime = ((double) opal_timer_base_get_cycles()) / opal_timer_base_get_freq(); +#elif OPAL_TIMER_USEC_NATIVE wtime = ((double) opal_timer_base_get_usec()) / 1000000.0; #else /* Fall back to gettimeofday() if we have nothing else */