From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 5D3B33858D32; Fri, 10 Mar 2023 14:45:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D3B33858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678459518; bh=8Mge3ZpcMkYuEPqWHWAfaQ4UaXA3ueTeXEqlRDQIwu8=; h=From:To:Subject:Date:From; b=EWXesZBDh2cd1yt/likpOGND66CtCZjUdAvNzYrKzTm9R4c8K2NAEtsp0277397ox zf40gC1nL5na06aWQUVLGZD59CoEjTKQl82RhRss1evNfnE3MhcZTXqYQlAskgH45B LcCqFkPSF9KNvB7wBhKRv2R2oOxF6OHqjaWsvRQ0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] OpenACC: Remove 'acc_async_test' -> skip shortcut in 'libgomp/oacc-async.c:goacc_wait' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: b13cc8db8d4a6fd82b9b540945723d2eca293e0c X-Git-Newrev: e58692d95d36ed9b466a1925cae38eb5318bc25e Message-Id: <20230310144518.5D3B33858D32@sourceware.org> Date: Fri, 10 Mar 2023 14:45:18 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e58692d95d36ed9b466a1925cae38eb5318bc25e commit e58692d95d36ed9b466a1925cae38eb5318bc25e Author: Thomas Schwinge Date: Fri Feb 24 16:17:57 2023 +0100 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: --- libgomp/ChangeLog.omp | 6 ++++++ libgomp/oacc-async.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 402b14311a8..da11f40651f 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -3,6 +3,12 @@ Backported from master: 2023-03-10 Thomas Schwinge + * oacc-async.c (goacc_wait): Remove 'acc_async_test' -> skip + shortcut. + + Backported from master: + 2023-03-10 Thomas Schwinge + * 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 026df3c9417..b00f45d5754 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)