Skip to content

Use acquire/release barrier to synchronize completion of request and test/wait #11665

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

Merged
merged 1 commit into from
May 26, 2023
Merged

Use acquire/release barrier to synchronize completion of request and test/wait #11665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions ompi/request/req_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ int ompi_request_default_test(ompi_request_t ** rptr,

recheck_request_status:
#endif
opal_atomic_mb();
if( request->req_state == OMPI_REQUEST_INACTIVE ) {
*completed = true;
if (MPI_STATUS_IGNORE != status) {
Expand All @@ -55,6 +54,8 @@ int ompi_request_default_test(ompi_request_t ** rptr,
ompi_grequest_invoke_query(request, &request->req_status);
}
if (MPI_STATUS_IGNORE != status) {
/* make sure we get the correct status */
opal_atomic_rmb();
OMPI_COPY_STATUS(status, request->req_status, false);
}
if( request->req_persistent ) {
Expand Down Expand Up @@ -108,7 +109,6 @@ int ompi_request_default_test_any(
ompi_request_t **rptr;
ompi_request_t *request;

opal_atomic_mb();
rptr = requests;
for (i = 0; i < count; i++, rptr++) {
request = *rptr;
Expand All @@ -129,6 +129,8 @@ int ompi_request_default_test_any(
ompi_grequest_invoke_query(request, &request->req_status);
}
if (MPI_STATUS_IGNORE != status) {
/* make sure we get the correct status */
opal_atomic_rmb();
OMPI_COPY_STATUS(status, request->req_status, false);
}

Expand Down Expand Up @@ -186,7 +188,6 @@ int ompi_request_default_test_all(
ompi_request_t *request;
int do_it_once = 0;

opal_atomic_mb();
for (i = 0; i < count; i++) {
request = requests[i];

Expand Down Expand Up @@ -231,6 +232,8 @@ int ompi_request_default_test_all(

rc = MPI_SUCCESS;
if (MPI_STATUSES_IGNORE != statuses) {
/* make sure we get the correct statuses */
opal_atomic_rmb();
/* fill out completion status and free request if required */
for( i = 0; i < count; i++, rptr++ ) {
request = *rptr;
Expand Down Expand Up @@ -318,7 +321,6 @@ int ompi_request_default_test_some(
ompi_request_t **rptr;
ompi_request_t *request;

opal_atomic_mb();
rptr = requests;
for (i = 0; i < count; i++, rptr++) {
request = *rptr;
Expand Down Expand Up @@ -357,6 +359,9 @@ int ompi_request_default_test_some(
return OMPI_SUCCESS;
}

/* make sure we get the correct statuses */
opal_atomic_rmb();

/* fill out completion status and free request if required */
for( i = 0; i < num_requests_done; i++) {
request = requests[indices[i]];
Expand Down
11 changes: 11 additions & 0 deletions ompi/request/req_wait.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ int ompi_request_default_wait(

ompi_request_wait_completion(req);

/* make sure we get the correct status */
opal_atomic_rmb();

#if OPAL_ENABLE_FT_MPI
/* Special case for MPI_ANY_SOURCE */
if( MPI_ERR_PROC_FAILED_PENDING == req->req_status.MPI_ERROR ) {
Expand Down Expand Up @@ -198,6 +201,8 @@ int ompi_request_default_wait_any(size_t count,
rc = ompi_grequest_invoke_query(request, &request->req_status);
}
if (MPI_STATUS_IGNORE != status) {
/* make sure we get the correct status */
opal_atomic_rmb();
OMPI_COPY_STATUS(status, request->req_status, false);
}
rc = request->req_status.MPI_ERROR;
Expand Down Expand Up @@ -302,6 +307,9 @@ int ompi_request_default_wait_all( size_t count,
finish:
rptr = requests;
if (MPI_STATUSES_IGNORE != statuses) {
/* make sure we get the correct status */
opal_atomic_rmb();

/* fill out status and free request if required */
for( i = 0; i < count; i++, rptr++ ) {
void *_tmp_ptr = &sync;
Expand Down Expand Up @@ -574,6 +582,9 @@ int ompi_request_default_wait_some(size_t count,

*outcount = num_requests_done;

/* make sure we get the correct status */
opal_atomic_rmb();

for (size_t i = 0; i < num_requests_done; i++) {
request = requests[indices[i]];
#if OPAL_ENABLE_FT_MPI
Expand Down
2 changes: 2 additions & 0 deletions ompi/request/request.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,8 @@ static inline int ompi_request_complete(ompi_request_t* request, bool with_signa

if (0 == rc) {
if (OPAL_LIKELY(with_signal)) {
/* make sure everything in the request is visible before we mark it complete */
opal_atomic_wmb();

ompi_wait_sync_t *tmp_sync = (ompi_wait_sync_t *) OPAL_ATOMIC_SWAP_PTR(&request->req_complete,
REQUEST_COMPLETED);
Expand Down