Skip to content

Fixed erratas: Match shmem_ptr and shmem_team_ptr to spec and Add cost Qualifier to cmp_values argument #1214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avincigu wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fixed erratas: Match shmem_ptr and shmem_team_ptr to spec and Add cost Qualifier to cmp_values argument #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15cd9c1
Fixed erratas: Match shmem_ptr and shmem_team_ptr to spec and Add con…
avincigu Jul 31, 2025
c2b79c0
Fixed typo
avincigu Jul 31, 2025
1cd9cb5
Adding missing consts
avincigu Jul 31, 2025
6a4687a
More consts
avincigu Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mpp/shmem.h4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ define(`SHMEM_CXX_WAIT_UNTIL_ALL',
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ALL')

define(`SHMEM_CXX_WAIT_UNTIL_ALL_VECTOR',
`static inline void shmem_wait_until_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
`static inline void shmem_wait_until_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
shmem_$1_wait_until_all_vector(ivars, nelems, status, cmp, cmp_values);
}')dnl
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ALL_VECTOR')
Expand All @@ -522,7 +522,7 @@ define(`SHMEM_CXX_WAIT_UNTIL_ANY',
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ANY')

define(`SHMEM_CXX_WAIT_UNTIL_ANY_VECTOR',
`static inline size_t shmem_wait_until_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
`static inline size_t shmem_wait_until_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
return shmem_$1_wait_until_any_vector(ivars, nelems, status, cmp, cmp_values);
}')dnl
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_ANY_VECTOR')
Expand All @@ -534,7 +534,7 @@ define(`SHMEM_CXX_WAIT_UNTIL_SOME',
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_SOME')

define(`SHMEM_CXX_WAIT_UNTIL_SOME_VECTOR',
`static inline size_t shmem_wait_until_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *cmp_values) {
`static inline size_t shmem_wait_until_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *cmp_values) {
return shmem_$1_wait_until_some_vector(ivars, nelems, indices, status, cmp, cmp_values);
}')dnl
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_WAIT_UNTIL_SOME_VECTOR')
Expand All @@ -552,7 +552,7 @@ define(`SHMEM_CXX_TEST_ALL',
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ALL')

define(`SHMEM_CXX_TEST_ALL_VECTOR',
`static inline int shmem_test_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
`static inline int shmem_test_all_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
return shmem_$1_test_all_vector(ivars, nelems, status, cmp, cmp_values);
}')dnl
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ALL_VECTOR')
Expand All @@ -564,7 +564,7 @@ define(`SHMEM_CXX_TEST_ANY',
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ANY')

define(`SHMEM_CXX_TEST_ANY_VECTOR',
`static inline size_t shmem_test_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, $2 *cmp_values) {
`static inline size_t shmem_test_any_vector($2 *ivars, size_t nelems, const int *status, int cmp, const $2 *cmp_values) {
return shmem_$1_test_any_vector(ivars, nelems, status, cmp, cmp_values);
}')dnl
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_ANY_VECTOR')
Expand All @@ -576,7 +576,7 @@ define(`SHMEM_CXX_TEST_SOME',
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_SOME')

define(`SHMEM_CXX_TEST_SOME_VECTOR',
`static inline size_t shmem_test_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *cmp_values) {
`static inline size_t shmem_test_some_vector($2 *ivars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *cmp_values) {
return shmem_$1_test_some_vector(ivars, nelems, indices, status, cmp, cmp_values);
}')dnl
SHMEM_CXX_DEFINE_FOR_SYNC(`SHMEM_CXX_TEST_SOME_VECTOR')
Expand Down
16 changes: 8 additions & 8 deletions mpp/shmem_c_func.h4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_global_exit(int status);

SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_pe_accessible(int pe);
SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_addr_accessible(const void *addr, int pe);
SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_ptr(const void *target, int pe);
SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_team_ptr(shmem_team_t team, const void *target, int pe);
SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_ptr(const void *dest, int pe);
SHMEM_FUNCTION_ATTRIBUTES void *SHPRE()shmem_team_ptr(shmem_team_t team, const void *dest, int pe);

SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_info_get_version(int *major, int *minor);
SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_info_get_name(char *name);
Expand Down Expand Up @@ -500,15 +500,15 @@ define(`SHMEM_C_WAIT_UNTIL_SOME',
SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_SOME')

define(`SHMEM_C_WAIT_UNTIL_ALL_VECTOR',
`SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_$1_wait_until_all_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
`SHMEM_FUNCTION_ATTRIBUTES void SHPRE()shmem_$1_wait_until_all_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_ALL_VECTOR')

define(`SHMEM_C_WAIT_UNTIL_ANY_VECTOR',
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_any_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_any_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_ANY_VECTOR')

define(`SHMEM_C_WAIT_UNTIL_SOME_VECTOR',
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *values);')dnl
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_wait_until_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *values);')dnl
SHMEM_BIND_C_SYNC(`SHMEM_C_WAIT_UNTIL_SOME_VECTOR')

define(`SHMEM_C_TEST',
Expand All @@ -528,15 +528,15 @@ define(`SHMEM_C_TEST_SOME',
SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_SOME')

define(`SHMEM_C_TEST_ALL_VECTOR',
`SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_$1_test_all_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
`SHMEM_FUNCTION_ATTRIBUTES int SHPRE()shmem_$1_test_all_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_ALL_VECTOR')

define(`SHMEM_C_TEST_ANY_VECTOR',
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_any_vector($2 *vars, size_t nelems, const int *status, int cmp, $2 *values);')dnl
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_any_vector($2 *vars, size_t nelems, const int *status, int cmp, const $2 *values);')dnl
SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_ANY_VECTOR')

define(`SHMEM_C_TEST_SOME_VECTOR',
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, $2 *values);')dnl
`SHMEM_FUNCTION_ATTRIBUTES size_t SHPRE()shmem_$1_test_some_vector($2 *vars, size_t nelems, size_t *indices, const int *status, int cmp, const $2 *values);')dnl
SHMEM_BIND_C_SYNC(`SHMEM_C_TEST_SOME_VECTOR')

SHMEM_FUNCTION_ATTRIBUTES uint64_t SHPRE()shmem_signal_wait_until(uint64_t *sig_addr, int cmp, uint64_t cmp_value);
Expand Down
12 changes: 6 additions & 6 deletions src/remote_pointer_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,27 @@


void SHMEM_FUNCTION_ATTRIBUTES *
shmem_ptr(const void *target, int pe)
shmem_ptr(const void *dest, int pe)
{
SHMEM_ERR_CHECK_INITIALIZED();
SHMEM_ERR_CHECK_PE(pe);
SHMEM_ERR_CHECK_SYMMETRIC(target, 1);
SHMEM_ERR_CHECK_SYMMETRIC(dest, 1);

return shmem_internal_ptr(target, pe);
return shmem_internal_ptr(dest, pe);
}

void SHMEM_FUNCTION_ATTRIBUTES *
shmem_team_ptr(shmem_team_t team, const void *target, int pe)
shmem_team_ptr(shmem_team_t team, const void *dest, int pe)
{
SHMEM_ERR_CHECK_INITIALIZED();
SHMEM_ERR_CHECK_PE(pe);
SHMEM_ERR_CHECK_SYMMETRIC(target, 1);
SHMEM_ERR_CHECK_SYMMETRIC(dest, 1);

if (team == SHMEM_TEAM_INVALID) {
return NULL;
}

int global_pe = shmem_team_translate_pe(team, pe, SHMEM_TEAM_WORLD);

return shmem_internal_ptr(target, global_pe);
return shmem_internal_ptr(dest, global_pe);
}
12 changes: 6 additions & 6 deletions src/synchronization_c.c4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_WAIT_UNTIL_ALL')
#define SHMEM_DEF_WAIT_UNTIL_ALL_VECTOR(STYPE,TYPE) \
void SHMEM_FUNCTION_ATTRIBUTES \
shmem_##STYPE##_wait_until_all_vector(TYPE *vars, size_t nelems, \
const int *status, int cond, TYPE *values) \
const int *status, int cond, const TYPE *values) \
{ \
SHMEM_ERR_CHECK_INITIALIZED(); \
SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE)); \
Expand Down Expand Up @@ -338,7 +338,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_WAIT_UNTIL_ANY')
#define SHMEM_DEF_WAIT_UNTIL_ANY_VECTOR(STYPE,TYPE) \
size_t SHMEM_FUNCTION_ATTRIBUTES \
shmem_##STYPE##_wait_until_any_vector(TYPE *vars, size_t nelems, \
const int *status, int cond, TYPE *values) \
const int *status, int cond, const TYPE *values) \
{ \
SHMEM_ERR_CHECK_INITIALIZED(); \
SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE)); \
Expand Down Expand Up @@ -436,7 +436,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_WAIT_UNTIL_SOME')
#define SHMEM_DEF_WAIT_UNTIL_SOME_VECTOR(STYPE,TYPE) \
size_t SHMEM_FUNCTION_ATTRIBUTES \
shmem_##STYPE##_wait_until_some_vector(TYPE *vars, size_t nelems, size_t *indices, \
const int *status, int cond, TYPE *values) \
const int *status, int cond, const TYPE *values) \
{ \
SHMEM_ERR_CHECK_INITIALIZED(); \
SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE)); \
Expand Down Expand Up @@ -537,7 +537,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_TEST_ALL')
#define SHMEM_DEF_TEST_ALL_VECTOR(STYPE,TYPE) \
int SHMEM_FUNCTION_ATTRIBUTES \
shmem_##STYPE##_test_all_vector(TYPE *vars, size_t nelems, const int *status, int cond, \
TYPE *values) \
const TYPE *values) \
{ \
SHMEM_ERR_CHECK_INITIALIZED(); \
SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE)); \
Expand Down Expand Up @@ -607,7 +607,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_TEST_ANY')
#define SHMEM_DEF_TEST_ANY_VECTOR(STYPE,TYPE) \
size_t SHMEM_FUNCTION_ATTRIBUTES \
shmem_##STYPE##_test_any_vector(TYPE *vars, size_t nelems, const int *status, \
int cond, TYPE *values) \
int cond, const TYPE *values) \
{ \
SHMEM_ERR_CHECK_INITIALIZED(); \
SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE)); \
Expand Down Expand Up @@ -692,7 +692,7 @@ SHMEM_BIND_C_SYNC(`SHMEM_DEF_TEST_SOME')
#define SHMEM_DEF_TEST_SOME_VECTOR(STYPE,TYPE) \
size_t SHMEM_FUNCTION_ATTRIBUTES \
shmem_##STYPE##_test_some_vector(TYPE *vars, size_t nelems, size_t *indices, \
const int *status, int cond, TYPE *values) \
const int *status, int cond, const TYPE *values) \
{ \
SHMEM_ERR_CHECK_INITIALIZED(); \
SHMEM_ERR_CHECK_SYMMETRIC(vars, sizeof(TYPE)); \
Expand Down
Loading