This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via a80086ab827272f7ada033ff3fb216652bdfc634 (commit) from f0885c5b523afca1ee180c1f16c7acb2ea5450f8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/a80086ab827272f7ada033ff3fb216652b... commit a80086ab827272f7ada033ff3fb216652bdfc634 Author: Charles J Archer <[email protected]> Date: Wed Jan 20 17:47:26 2016 -0800 x86 cycle timer warning and asm fixes Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpl/include/mpl_timer_linux86_cycle.h b/src/mpl/include/mpl_timer_linux86_cycle.h index 3bc10da..bac07ca 100644 --- a/src/mpl/include/mpl_timer_linux86_cycle.h +++ b/src/mpl/include/mpl_timer_linux86_cycle.h @@ -16,23 +16,23 @@ static inline int MPL_Wtime(MPL_Time_t *timeval) the rdtscp instruction which is synchronizing, we use this when we can. */ #ifdef MPL_LINUX86_CYCLE_RDTSCP - __asm__ __volatile__("push %%rbx ; cpuid ; rdtsc ; pop %%rbx ; shl $32, %%rdx; or %%rdx, %%rax" : "=a" (*timeval) : : "ecx", "rdx"); + __asm__ __volatile__("push %%rbx ; cpuid ; rdtsc ; pop %%rbx ; shl $32, %%rdx; or %%rdx, %%rax" : "=a" (timeval) : : "ecx", "rdx"); #elif defined(MPL_LINUX86_CYCLE_CPUID_RDTSC64) /* Here we have to save the rbx register for when the compiler is generating position independent code (e.g., when it's generating shared libraries) */ - __asm__ __volatile__("push %%rbx ; cpuid ; rdtsc ; pop %%rbx" : "=A" (*timeval) : : "ecx"); + __asm__ __volatile__("push %%rbx ; cpuid ; rdtsc ; pop %%rbx" : "=A" (timeval) : : "ecx"); #elif defined(MPL_LINUX86_CYCLE_CPUID_RDTSC32) /* Here we have to save the ebx register for when the compiler is generating position independent code (e.g., when it's generating shared libraries) */ - __asm__ __volatile__("push %%ebx ; cpuid ; rdtsc ; pop %%ebx" : "=A" (*timeval) : : "ecx"); + __asm__ __volatile__("push %%ebx ; cpuid ; rdtsc ; pop %%ebx" : "=A" (timeval) : : "ecx"); #elif defined(MPL_LINUX86_CYCLE_RDTSC) /* The configure test using cpuid must have failed, try just rdtsc by itself */ - __asm__ __volatile__("rdtsc" : "=A" (*timeval)); + __asm__ __volatile__("rdtsc" : "=A" (timeval)); #else #error Dont know which Linux timer to use diff --git a/src/mpl/src/timer/mpl_timer_linux86_cycle.c b/src/mpl/src/timer/mpl_timer_linux86_cycle.c index 679260b..8f71589 100644 --- a/src/mpl/src/timer/mpl_timer_linux86_cycle.c +++ b/src/mpl/src/timer/mpl_timer_linux86_cycle.c @@ -23,7 +23,7 @@ int MPL_Wtick(double *wtick) int MPL_Wtime_init(void) { - unsigned long long t1, t2; + MPL_Time_t t1, t2; struct timeval tv1, tv2; double td1, td2; ----------------------------------------------------------------------- Summary of changes: src/mpl/include/mpl_timer_linux86_cycle.h | 8 ++++---- src/mpl/src/timer/mpl_timer_linux86_cycle.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository