Hi!
On 2022-03-04T14:46:25+0100, I wrote:
> Pushed to master branch commit 8935589b496f755e08cadf26d8ceddf0dd6e0968
> "OMP lowering: Regimplify 'OMP_CLAUSE_MAP_DECL_MAKE_ADDRESSABLE' DECLs
> [PR100280, PR104132, PR104133]", see attached.
> --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
> +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
> [...]
> @@ -27,8 +31,12 @@ int main()
> (volatile int *) &a;
> #define N 123
> int b[N] = { 0 };
> + unsigned long long f1;
> + /*TODO See above. */
> + (volatile void *) &f1;
Ah, the famous last-minute change just before 'git push'... To work
around execution failure with GCN offloading, we're explicitly making
'f1' addressable here -- but I didn't realize that this also affects
diagnostics, sorry.
Pushed to master branch commit 14dfbb53594e164fe222476523a68039a8bd5252
"Fix 'libgomp.oacc-c-c++-common/kernels-decompose-1.c' expected
diagnostics", see attached.
Grüße
Thomas
>
> #pragma acc kernels /* { dg-line l_compute[incr c_compute] } */
> + /* { dg-note {variable 'g2\.0' declared in block isn't candidate for
> adjusting OpenACC privatization level: not addressable} {} { target *-*-* }
> l_compute$c_compute } */
> {
> [...]
> + /* { dg-note {beginning 'gang-single' part in OpenACC 'kernels' region}
> {} { target *-*-* } .+1 } */
> + f1 = 1;
> + /* { dg-note {forwarded loop nest in OpenACC 'kernels' region to
> 'parloops' for analysis} {} { target *-*-* } .+1 } */
> +#pragma acc loop /* { dg-line l_loop_c[incr c_loop_c] } */
> + /* { dg-note {variable 'c' in 'private' clause is candidate for
> adjusting OpenACC privatization level} {} { target *-*-* } l_loop_c$c_loop_c
> } */
> + /* { dg-optimized {assigned OpenACC seq loop parallelism} {} { target
> *-*-* } l_loop_c$c_loop_c } */
> + for (c = 20; c > 0; --c)
> + f1 *= c;
> +
> + /* { dg-note {beginning 'parloops' part in OpenACC 'kernels' region}
> {} { target *-*-* } .+1 } */
> + if (c != 234)
> + __builtin_abort ();
> + /* { dg-optimized {assigned OpenACC seq loop parallelism} {} { target
> *-*-* } l_compute$c_compute } */
> + }
> }
> [...]
> + assert (f1 == 2432902008176640000ULL);
>
> return 0;
> }
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634
München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas
Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht
München, HRB 106955
>From 14dfbb53594e164fe222476523a68039a8bd5252 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Fri, 4 Mar 2022 20:34:40 +0100
Subject: [PATCH] Fix 'libgomp.oacc-c-c++-common/kernels-decompose-1.c'
expected diagnostics
Fix-up for recent commit 8935589b496f755e08cadf26d8ceddf0dd6e0968
"OMP lowering: Regimplify 'OMP_CLAUSE_MAP_DECL_MAKE_ADDRESSABLE' DECLs
[PR100280, PR104132, PR104133]": adjust for a GCN offloading workaround
added just before commit: '(volatile void *) &f1;'.
PR testsuite/104791
libgomp/
* testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Fix
expected diagnostics.
---
.../testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
index 049b3a44b03..985a547d381 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c
@@ -37,6 +37,8 @@ int main()
#pragma acc kernels /* { dg-line l_compute[incr c_compute] } */
/* { dg-note {variable 'g2\.0' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l_compute$c_compute } */
+ /* { dg-note {variable 'f1\.1' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l_compute$c_compute } */
+ /* { dg-note {variable 'f1\.2' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} {} { target *-*-* } l_compute$c_compute } */
{
/* { dg-note {beginning 'gang-single' part in OpenACC 'kernels' region} {} { target *-*-* } .+1 } */
int c = 234;
--
2.25.1
