29 lines
926 B
Diff
29 lines
926 B
Diff
|
commit 55640b711726705a0127eb7ce767ef69e7642790
|
||
|
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||
|
Date: Thu Jun 8 15:14:01 2017 +0200
|
||
|
|
||
|
mvapich2 arm support
|
||
|
|
||
|
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||
|
|
||
|
diff --git src/mpid/ch3/channels/common/include/mv2_clock.h src/mpid/ch3/channels/common/include/mv2_clock.h
|
||
|
index af8bb2b77d08..b73a4ffa2fc0 100644
|
||
|
--- src/mpid/ch3/channels/common/include/mv2_clock.h
|
||
|
+++ src/mpid/ch3/channels/common/include/mv2_clock.h
|
||
|
@@ -92,7 +92,14 @@ static inline cycles_t get_cycles()
|
||
|
|
||
|
return ret;
|
||
|
}
|
||
|
-
|
||
|
+#elif defined(__ARM_ARCH_7A__)
|
||
|
+typedef unsigned long long cycles_t;
|
||
|
+static inline cycles_t get_cycles(void)
|
||
|
+{
|
||
|
+ cycles_t clk;
|
||
|
+ asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (clk));
|
||
|
+ return clk;
|
||
|
+}
|
||
|
#elif defined(__s390__) || defined(__s390x__)
|
||
|
typedef unsigned long cycles_t;
|
||
|
static inline cycles_t get_cycles()
|