From: Thomas Schwinge <thomas@codesourcery.com>
Date: Fri, 24 Feb 2023 15:17:57 +0000 (+0100)
Subject: OpenACC: Remove 'acc_async_test' -> skip shortcut in 'libgomp/oacc-async.c:goacc_wait'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e58692d95d36ed9b466a1925cae38eb5318bc25e;p=thirdparty%2Fgcc.git

OpenACC: Remove 'acc_async_test' -> skip shortcut in 'libgomp/oacc-async.c:goacc_wait'

We're not taking such a shortcut anywhere else, and (with future changes) it
has potential to confuse things if synchronization in a libgomp plugin happens
to have side effects even if an async queue currently is empty.

	libgomp/
	* oacc-async.c (goacc_wait): Remove 'acc_async_test' -> skip
	shortcut.

(cherry picked from commit b5037d4a073f2e4625afab5ec1f35624d9f9eba1)
---

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 402b14311a85..da11f40651f9 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -3,6 +3,12 @@
 	Backported from master:
 	2023-03-10  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* oacc-async.c (goacc_wait): Remove 'acc_async_test' -> skip
+	shortcut.
+
+	Backported from master:
+	2023-03-10  Thomas Schwinge  <thomas@codesourcery.com>
+
 	* testsuite/libgomp.oacc-c-c++-common/data-3.c: Document/verify
 	another aspect of OpenACC 'async' semantics.
 
diff --git a/libgomp/oacc-async.c b/libgomp/oacc-async.c
index 026df3c94179..b00f45d5754b 100644
--- a/libgomp/oacc-async.c
+++ b/libgomp/oacc-async.c
@@ -410,9 +410,6 @@ goacc_wait (int async, int num_waits, va_list *ap)
 	  break;
 	}
 
-      if (acc_async_test (qid))
-	continue;
-
       if (async == acc_async_sync)
 	acc_wait (qid);
       else if (qid == async)