OSHMEM/AMO: added missing C11 macro datatypes

- added signed datatypes for atomic_add calls
- added unsigned datatypes for atomic put/inc/get/fetch calls
- fixed incorrect SHMEM_CTX_DEFAULT macro, added
  external declaration of oshmem_ctx_default variable

Signed-off-by: Sergey Oblomov <[email protected]>

Author: Sergey Oblomov

oshmem/include/pshmem.h

@@ -63,9 +63,15 @@
 #pragma weak shmem_ctx_int_atomic_add = pshmem_ctx_int_atomic_add
 #pragma weak shmem_ctx_long_atomic_add = pshmem_ctx_long_atomic_add
 #pragma weak shmem_ctx_longlong_atomic_add = pshmem_ctx_longlong_atomic_add
+#pragma weak shmem_ctx_uint_atomic_add = pshmem_ctx_uint_atomic_add
+#pragma weak shmem_ctx_ulong_atomic_add = pshmem_ctx_ulong_atomic_add
+#pragma weak shmem_ctx_ulonglong_atomic_add = pshmem_ctx_ulonglong_atomic_add
 #pragma weak shmem_int_atomic_add = pshmem_int_atomic_add
 #pragma weak shmem_long_atomic_add = pshmem_long_atomic_add
 #pragma weak shmem_longlong_atomic_add = pshmem_longlong_atomic_add
+#pragma weak shmem_uint_atomic_add = pshmem_uint_atomic_add
+#pragma weak shmem_ulong_atomic_add = pshmem_ulong_atomic_add
+#pragma weak shmem_ulonglong_atomic_add = pshmem_ulonglong_atomic_add
 #pragma weak shmem_int_add = pshmem_int_add
 #pragma weak shmem_long_add = pshmem_long_add
 #pragma weak shmem_longlong_add = pshmem_longlong_add
@@ -74,12 +80,18 @@
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
+SHMEM_CTX_TYPE_ATOMIC_ADD(_uint, unsigned int, shmem)
+SHMEM_CTX_TYPE_ATOMIC_ADD(_ulong, unsigned long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_ADD(_ulonglong, unsigned long long, shmem)
 SHMEM_CTX_TYPE_ATOMIC_ADD(_int, int, shmem)
 SHMEM_CTX_TYPE_ATOMIC_ADD(_long, long, shmem)
 SHMEM_CTX_TYPE_ATOMIC_ADD(_longlong, long long, shmem)
 SHMEM_TYPE_ATOMIC_ADD(_int, int, shmem)
 SHMEM_TYPE_ATOMIC_ADD(_long, long, shmem)
 SHMEM_TYPE_ATOMIC_ADD(_longlong, long long, shmem)
+SHMEM_TYPE_ATOMIC_ADD(_uint, unsigned int, shmem)
+SHMEM_TYPE_ATOMIC_ADD(_ulong, unsigned long, shmem)
+SHMEM_TYPE_ATOMIC_ADD(_ulonglong, unsigned long long, shmem)
 
 /* deprecated APIs */
 #define SHMEM_TYPE_ADD(type_name, type, prefix)                     \

oshmem/include/shmem.h.in

@@ -25,9 +25,15 @@
  */
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"
+#pragma weak shmem_int_atomic_and       = pshmem_int_atomic_and
+#pragma weak shmem_long_atomic_and      = pshmem_long_atomic_and
+#pragma weak shmem_longlong_atomic_and  = pshmem_longlong_atomic_and
 #pragma weak shmem_uint_atomic_and      = pshmem_uint_atomic_and
 #pragma weak shmem_ulong_atomic_and     = pshmem_ulong_atomic_and
 #pragma weak shmem_ulonglong_atomic_and = pshmem_ulonglong_atomic_and
+#pragma weak shmem_ctx_int_atomic_and   = pshmem_ctx_int_atomic_and
+#pragma weak shmem_ctx_long_atomic_and  = pshmem_ctx_long_atomic_and
+#pragma weak shmem_ctx_longlong_atomic_and = pshmem_ctx_longlong_atomic_and
 #pragma weak shmem_ctx_uint_atomic_and  = pshmem_ctx_uint_atomic_and
 #pragma weak shmem_ctx_ulong_atomic_and = pshmem_ctx_ulong_atomic_and
 #pragma weak shmem_ctx_ulonglong_atomic_and = pshmem_ctx_ulonglong_atomic_and
@@ -38,9 +44,15 @@
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
+OSHMEM_TYPE_OP(int, int, shmem, and)
+OSHMEM_TYPE_OP(long, long, shmem, and)
+OSHMEM_TYPE_OP(longlong, long long, shmem, and)
 OSHMEM_TYPE_OP(uint, unsigned int, shmem, and)
 OSHMEM_TYPE_OP(ulong, unsigned long, shmem, and)
 OSHMEM_TYPE_OP(ulonglong, unsigned long long, shmem, and)
+OSHMEM_CTX_TYPE_OP(int, int, shmem, and)
+OSHMEM_CTX_TYPE_OP(long, long, shmem, and)
+OSHMEM_CTX_TYPE_OP(longlong, long long, shmem, and)
 OSHMEM_CTX_TYPE_OP(uint, unsigned int, shmem, and)
 OSHMEM_CTX_TYPE_OP(ulong, unsigned long, shmem, and)
 OSHMEM_CTX_TYPE_OP(ulonglong, unsigned long long, shmem, and)

oshmem/shmem/c/profile/defines.h

@@ -65,12 +65,18 @@
 
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"
+#pragma weak shmem_ctx_uint_atomic_compare_swap = pshmem_ctx_uint_atomic_compare_swap
+#pragma weak shmem_ctx_ulong_atomic_compare_swap = pshmem_ctx_ulong_atomic_compare_swap
+#pragma weak shmem_ctx_ulonglong_atomic_compare_swap = pshmem_ctx_ulonglong_atomic_compare_swap
 #pragma weak shmem_ctx_int_atomic_compare_swap = pshmem_ctx_int_atomic_compare_swap
 #pragma weak shmem_ctx_long_atomic_compare_swap = pshmem_ctx_long_atomic_compare_swap
 #pragma weak shmem_ctx_longlong_atomic_compare_swap = pshmem_ctx_longlong_atomic_compare_swap
 #pragma weak shmem_int_atomic_compare_swap = pshmem_int_atomic_compare_swap
 #pragma weak shmem_long_atomic_compare_swap = pshmem_long_atomic_compare_swap
 #pragma weak shmem_longlong_atomic_compare_swap = pshmem_longlong_atomic_compare_swap
+#pragma weak shmem_uint_atomic_compare_swap = pshmem_uint_atomic_compare_swap
+#pragma weak shmem_ulong_atomic_compare_swap = pshmem_ulong_atomic_compare_swap
+#pragma weak shmem_ulonglong_atomic_compare_swap = pshmem_ulonglong_atomic_compare_swap
 #pragma weak shmem_int_cswap = pshmem_int_cswap
 #pragma weak shmem_long_cswap = pshmem_long_cswap
 #pragma weak shmem_longlong_cswap = pshmem_longlong_cswap
@@ -82,9 +88,15 @@
 SHMEM_CTX_TYPE_ATOMIC_COMPARE_SWAP(_int, int, shmem)
 SHMEM_CTX_TYPE_ATOMIC_COMPARE_SWAP(_long, long, shmem)
 SHMEM_CTX_TYPE_ATOMIC_COMPARE_SWAP(_longlong, long long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_COMPARE_SWAP(_uint, unsigned int, shmem)
+SHMEM_CTX_TYPE_ATOMIC_COMPARE_SWAP(_ulong, unsigned long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_COMPARE_SWAP(_ulonglong, unsigned long long, shmem)
 SHMEM_TYPE_ATOMIC_COMPARE_SWAP(_int, int, shmem)
 SHMEM_TYPE_ATOMIC_COMPARE_SWAP(_long, long, shmem)
 SHMEM_TYPE_ATOMIC_COMPARE_SWAP(_longlong, long long, shmem)
+SHMEM_TYPE_ATOMIC_COMPARE_SWAP(_uint, unsigned int, shmem)
+SHMEM_TYPE_ATOMIC_COMPARE_SWAP(_ulong, unsigned long, shmem)
+SHMEM_TYPE_ATOMIC_COMPARE_SWAP(_ulonglong, unsigned long long, shmem)
 
 /* deprecated APIs */
 #define SHMEM_TYPE_CSWAP(type_name, type, prefix)                   \

oshmem/shmem/c/shmem_add.c

@@ -67,9 +67,15 @@
 #pragma weak shmem_ctx_int_atomic_fetch_add = pshmem_ctx_int_atomic_fetch_add
 #pragma weak shmem_ctx_long_atomic_fetch_add = pshmem_ctx_long_atomic_fetch_add
 #pragma weak shmem_ctx_longlong_atomic_fetch_add = pshmem_ctx_longlong_atomic_fetch_add
+#pragma weak shmem_ctx_uint_atomic_fetch_add = pshmem_ctx_uint_atomic_fetch_add
+#pragma weak shmem_ctx_ulong_atomic_fetch_add = pshmem_ctx_ulong_atomic_fetch_add
+#pragma weak shmem_ctx_ulonglong_atomic_fetch_add = pshmem_ctx_ulonglong_atomic_fetch_add
 #pragma weak shmem_int_atomic_fetch_add = pshmem_int_atomic_fetch_add
 #pragma weak shmem_long_atomic_fetch_add = pshmem_long_atomic_fetch_add
 #pragma weak shmem_longlong_atomic_fetch_add = pshmem_longlong_atomic_fetch_add
+#pragma weak shmem_uint_atomic_fetch_add = pshmem_uint_atomic_fetch_add
+#pragma weak shmem_ulong_atomic_fetch_add = pshmem_ulong_atomic_fetch_add
+#pragma weak shmem_ulonglong_atomic_fetch_add = pshmem_ulonglong_atomic_fetch_add
 #pragma weak shmem_int_fadd = pshmem_int_fadd
 #pragma weak shmem_long_fadd = pshmem_long_fadd
 #pragma weak shmem_longlong_fadd = pshmem_longlong_fadd
@@ -81,9 +87,15 @@
 SHMEM_CTX_TYPE_ATOMIC_FETCH_ADD(_int, int, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH_ADD(_long, long, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH_ADD(_longlong, long long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH_ADD(_uint, unsigned int, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH_ADD(_ulong, unsigned long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH_ADD(_ulonglong, unsigned long long, shmem)
 SHMEM_TYPE_ATOMIC_FETCH_ADD(_int, int, shmem)
 SHMEM_TYPE_ATOMIC_FETCH_ADD(_long, long, shmem)
 SHMEM_TYPE_ATOMIC_FETCH_ADD(_longlong, long long, shmem)
+SHMEM_TYPE_ATOMIC_FETCH_ADD(_uint, unsigned int, shmem)
+SHMEM_TYPE_ATOMIC_FETCH_ADD(_ulong, unsigned long, shmem)
+SHMEM_TYPE_ATOMIC_FETCH_ADD(_ulonglong, unsigned long long, shmem)
 
 /* deprecated APIs */
 #define SHMEM_TYPE_FADD(type_name, type, prefix)                    \

oshmem/shmem/c/shmem_and.c

@@ -27,9 +27,15 @@
  */
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"
+#pragma weak shmem_int_atomic_fetch_and       = pshmem_int_atomic_fetch_and
+#pragma weak shmem_long_atomic_fetch_and      = pshmem_long_atomic_fetch_and
+#pragma weak shmem_longlong_atomic_fetch_and  = pshmem_longlong_atomic_fetch_and
 #pragma weak shmem_uint_atomic_fetch_and      = pshmem_uint_atomic_fetch_and
 #pragma weak shmem_ulong_atomic_fetch_and     = pshmem_ulong_atomic_fetch_and
 #pragma weak shmem_ulonglong_atomic_fetch_and = pshmem_ulonglong_atomic_fetch_and
+#pragma weak shmem_ctx_int_atomic_fetch_and   = pshmem_ctx_int_atomic_fetch_and
+#pragma weak shmem_ctx_long_atomic_fetch_and  = pshmem_ctx_long_atomic_fetch_and
+#pragma weak shmem_ctx_longlong_atomic_fetch_and = pshmem_ctx_longlong_atomic_fetch_and
 #pragma weak shmem_ctx_uint_atomic_fetch_and  = pshmem_ctx_uint_atomic_fetch_and
 #pragma weak shmem_ctx_ulong_atomic_fetch_and = pshmem_ctx_ulong_atomic_fetch_and
 #pragma weak shmem_ctx_ulonglong_atomic_fetch_and = pshmem_ctx_ulonglong_atomic_fetch_and
@@ -42,9 +48,15 @@
 
  unsigned int shmem_uint_atomic_fand(unsigned int *target, unsigned int value, int pe);
 
+OSHMEM_TYPE_FOP(int, int, shmem, and)
+OSHMEM_TYPE_FOP(long, long, shmem, and)
+OSHMEM_TYPE_FOP(longlong, long long, shmem, and)
 OSHMEM_TYPE_FOP(uint, unsigned int, shmem, and)
 OSHMEM_TYPE_FOP(ulong, unsigned long, shmem, and)
 OSHMEM_TYPE_FOP(ulonglong, unsigned long long, shmem, and)
+OSHMEM_CTX_TYPE_FOP(int, int, shmem, and)
+OSHMEM_CTX_TYPE_FOP(long, long, shmem, and)
+OSHMEM_CTX_TYPE_FOP(longlong, long long, shmem, and)
 OSHMEM_CTX_TYPE_FOP(uint, unsigned int, shmem, and)
 OSHMEM_CTX_TYPE_FOP(ulong, unsigned long, shmem, and)
 OSHMEM_CTX_TYPE_FOP(ulonglong, unsigned long long, shmem, and)

oshmem/shmem/c/shmem_cswap.c

@@ -68,11 +68,17 @@
 #pragma weak shmem_ctx_int_atomic_fetch = pshmem_ctx_int_atomic_fetch
 #pragma weak shmem_ctx_long_atomic_fetch = pshmem_ctx_long_atomic_fetch
 #pragma weak shmem_ctx_longlong_atomic_fetch = pshmem_ctx_longlong_atomic_fetch
+#pragma weak shmem_ctx_uint_atomic_fetch = pshmem_ctx_uint_atomic_fetch
+#pragma weak shmem_ctx_ulong_atomic_fetch = pshmem_ctx_ulong_atomic_fetch
+#pragma weak shmem_ctx_ulonglong_atomic_fetch = pshmem_ctx_ulonglong_atomic_fetch
 #pragma weak shmem_ctx_double_atomic_fetch = pshmem_ctx_double_atomic_fetch
 #pragma weak shmem_ctx_float_atomic_fetch = pshmem_ctx_float_atomic_fetch
 #pragma weak shmem_int_atomic_fetch = pshmem_int_atomic_fetch
 #pragma weak shmem_long_atomic_fetch = pshmem_long_atomic_fetch
 #pragma weak shmem_longlong_atomic_fetch = pshmem_longlong_atomic_fetch
+#pragma weak shmem_uint_atomic_fetch = pshmem_uint_atomic_fetch
+#pragma weak shmem_ulong_atomic_fetch = pshmem_ulong_atomic_fetch
+#pragma weak shmem_ulonglong_atomic_fetch = pshmem_ulonglong_atomic_fetch
 #pragma weak shmem_double_atomic_fetch = pshmem_double_atomic_fetch
 #pragma weak shmem_float_atomic_fetch = pshmem_float_atomic_fetch
 #pragma weak shmem_int_fetch = pshmem_int_fetch
@@ -88,11 +94,17 @@
 SHMEM_CTX_TYPE_ATOMIC_FETCH(_int, int, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH(_long, long, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH(_longlong, long long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH(_uint, unsigned int, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH(_ulong, unsigned long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH(_ulonglong, unsigned long long, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH(_double, double, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH(_float, float, shmem)
 SHMEM_TYPE_ATOMIC_FETCH(_int, int, shmem)
 SHMEM_TYPE_ATOMIC_FETCH(_long, long, shmem)
 SHMEM_TYPE_ATOMIC_FETCH(_longlong, long long, shmem)
+SHMEM_TYPE_ATOMIC_FETCH(_uint, unsigned int, shmem)
+SHMEM_TYPE_ATOMIC_FETCH(_ulong, unsigned long, shmem)
+SHMEM_TYPE_ATOMIC_FETCH(_ulonglong, unsigned long long, shmem)
 SHMEM_TYPE_ATOMIC_FETCH(_double, double, shmem)
 SHMEM_TYPE_ATOMIC_FETCH(_float, float, shmem)
 

oshmem/shmem/c/shmem_fadd.c

@@ -68,9 +68,15 @@
 #pragma weak shmem_ctx_int_atomic_fetch_inc = pshmem_ctx_int_atomic_fetch_inc
 #pragma weak shmem_ctx_long_atomic_fetch_inc = pshmem_ctx_long_atomic_fetch_inc
 #pragma weak shmem_ctx_longlong_atomic_fetch_inc = pshmem_ctx_longlong_atomic_fetch_inc
+#pragma weak shmem_ctx_uint_atomic_fetch_inc = pshmem_ctx_uint_atomic_fetch_inc
+#pragma weak shmem_ctx_ulong_atomic_fetch_inc = pshmem_ctx_ulong_atomic_fetch_inc
+#pragma weak shmem_ctx_ulonglong_atomic_fetch_inc = pshmem_ctx_ulonglong_atomic_fetch_inc
 #pragma weak shmem_int_atomic_fetch_inc = pshmem_int_atomic_fetch_inc
 #pragma weak shmem_long_atomic_fetch_inc = pshmem_long_atomic_fetch_inc
 #pragma weak shmem_longlong_atomic_fetch_inc = pshmem_longlong_atomic_fetch_inc
+#pragma weak shmem_uint_atomic_fetch_inc = pshmem_uint_atomic_fetch_inc
+#pragma weak shmem_ulong_atomic_fetch_inc = pshmem_ulong_atomic_fetch_inc
+#pragma weak shmem_ulonglong_atomic_fetch_inc = pshmem_ulonglong_atomic_fetch_inc
 #pragma weak shmem_int_finc = pshmem_int_finc
 #pragma weak shmem_long_finc = pshmem_long_finc
 #pragma weak shmem_longlong_finc = pshmem_longlong_finc
@@ -82,9 +88,15 @@
 SHMEM_CTX_TYPE_ATOMIC_FETCH_INC(_int, int, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH_INC(_long, long, shmem)
 SHMEM_CTX_TYPE_ATOMIC_FETCH_INC(_longlong, long long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH_INC(_uint, unsigned int, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH_INC(_ulong, unsigned long, shmem)
+SHMEM_CTX_TYPE_ATOMIC_FETCH_INC(_ulonglong, unsigned long long, shmem)
 SHMEM_TYPE_ATOMIC_FETCH_INC(_int, int, shmem)
 SHMEM_TYPE_ATOMIC_FETCH_INC(_long, long, shmem)
 SHMEM_TYPE_ATOMIC_FETCH_INC(_longlong, long long, shmem)
+SHMEM_TYPE_ATOMIC_FETCH_INC(_uint, unsigned int, shmem)
+SHMEM_TYPE_ATOMIC_FETCH_INC(_ulong, unsigned long, shmem)
+SHMEM_TYPE_ATOMIC_FETCH_INC(_ulonglong, unsigned long long, shmem)
 
 /* deprecated APIs */
 #define SHMEM_TYPE_FINC(type_name, type, prefix)                    \