[gcc r12-1289] Fix 'libgomp.oacc-c-c++-common/acc_prof-kernels-1.c' for 'acc_device_radeon'

Thomas Schwinge tschwinge@gcc.gnu.org
Tue Jun 8 09:38:19 GMT 2021


https://gcc.gnu.org/g:984df1e1630f262d782c00cefad2643b8e8469f8

commit r12-1289-g984df1e1630f262d782c00cefad2643b8e8469f8
Author: Thomas Schwinge <thomas@codesourcery.com>
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__


More information about the Gcc-cvs mailing list