From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 58FA23844051; Tue, 8 Jun 2021 09:38:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 58FA23844051 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1289] Fix 'libgomp.oacc-c-c++-common/acc_prof-kernels-1.c' for 'acc_device_radeon' X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/master X-Git-Oldrev: 292fb10bebf3c209f560d1590d2d70bf30b58018 X-Git-Newrev: 984df1e1630f262d782c00cefad2643b8e8469f8 Message-Id: <20210608093819.58FA23844051@sourceware.org> Date: Tue, 8 Jun 2021 09:38:19 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 09:38:19 -0000 https://gcc.gnu.org/g:984df1e1630f262d782c00cefad2643b8e8469f8 commit r12-1289-g984df1e1630f262d782c00cefad2643b8e8469f8 Author: Thomas Schwinge Date: Sun Jun 6 10:41:18 2021 +0200 Fix 'libgomp.oacc-c-c++-common/acc_prof-kernels-1.c' for 'acc_device_radeon' ... on top of r279378 (commit 26b74ed0223d108d7d7818c3c860f20cfe81a4af) "Update OpenACC tests for amdgcn". libgomp/ * testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c: Fix for 'acc_device_radeon'. Diff: --- libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c index ad33f72e2fb..7f74ee922b7 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c @@ -93,6 +93,11 @@ static void cb_enqueue_launch_start (acc_prof_info *prof_info, acc_event_info *e } if (num_workers < 1) assert (event_info->launch_event.num_workers >= 1); + /* GCN currently enforces 'num_workers (1)'. */ + else if (acc_device_type == acc_device_radeon + /*TODO ... just not in the "Parallelism dimensions: variable" case. */ + && /*TODO*/ num_gangs != 22) + assert (event_info->launch_event.num_workers == 1); else { #ifdef __OPTIMIZE__