forked from pool/mvapich2
ab816e656c
- Update to mvapich2 2.3.1 - See CHANGELOG for fixes and new features - Refreshed patches against the new version: - 0001-Drop-GCC-check.patch - mvapich2-arm-support.patch - mvapich2-s390_get_cycles.patch - Drop mvapich2-fix-double-free.patch as it was merged upstream OBS-URL: https://build.opensuse.org/request/show/702622 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=58
28 lines
931 B
Diff
28 lines
931 B
Diff
commit 92d5b11beaf8919979705f44d56eb0569feceb93
|
|
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
|
Date: Thu Jun 8 15:11:12 2017 +0200
|
|
|
|
mvapich2-s390_get_cycles
|
|
|
|
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 dba8e51bf129..af8bb2b77d08 100644
|
|
--- src/mpid/ch3/channels/common/include/mv2_clock.h
|
|
+++ src/mpid/ch3/channels/common/include/mv2_clock.h
|
|
@@ -93,6 +93,14 @@ static inline cycles_t get_cycles()
|
|
return ret;
|
|
}
|
|
|
|
+#elif defined(__s390__) || defined(__s390x__)
|
|
+typedef unsigned long cycles_t;
|
|
+static inline cycles_t get_cycles()
|
|
+{
|
|
+ unsigned long clk;
|
|
+ asm volatile("stck %0" : "=Q" (clk) : : "cc");
|
|
+ return clk >> 2;
|
|
+}
|
|
#else
|
|
#warning get_cycles not implemented for this architecture: attempt asm/timex.h
|
|
#include <asm/timex.h>
|