https://gcc.gnu.org/g:9f111716ea0fc5ab730240de4fe595be300744d5
commit 9f111716ea0fc5ab730240de4fe595be300744d5
Author: Mikael Morin <mik...@gcc.gnu.org>
Date: Sat Aug 23 16:48:56 2025 +0200
Correction régression goacc/kernels-decompose-1
Diff:
---
gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95 | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95
b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95
index 22558e4cd4f6..44d1aaf8f324 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-1.f95
@@ -77,7 +77,8 @@ program main
!$acc end kernels
end program main
-! { dg-final { scan-tree-dump-times {(?n)#pragma omp target oacc_kernels
map\(to:a\[_[0-9]+\](?:{lb: 1 sz: 4})? \[len: _[0-9]+\]\) map\(alloc:a
\[pointer assign, bias: _[0-9]+\]\) map\(tofrom:sum \[len: [0-9]+\]\)$} 1
"gimple" } }
+! { dg-final { global lbound1; scan-tree-dump-vars {(?n)#pragma omp target
oacc_kernels map\(to:a\[_[0-9]+\](?:{lb: ([^ ]+) sz: 4})? \[len: _[0-9]+\]\)
map\(alloc:a \[pointer assign, bias: _[0-9]+\]\) map\(tofrom:sum \[len:
[0-9]+\]\)$} [list lbound1] "gimple" } }
+! { dg-final { global lbound1; scan-tree-dump-times "$lbound1 = 0;" 1 "gimple"
} }
! { dg-final { scan-tree-dump-times {(?n)#pragma acc loop private\(i\)$} 2
"gimple" } }
! { dg-final { scan-tree-dump-times {(?n)#pragma acc loop private\(i\)
independent$} 1 "gimple" } }
@@ -86,11 +87,14 @@ end program main
! Check that the OpenACC 'kernels' got decomposed into 'data' and an enclosed
! sequence of compute constructs.
-! { dg-final { scan-tree-dump-times {(?n)#pragma omp target oacc_data_kernels
map\(to:a\[_[0-9]+\](?:{lb: 1 sz: 4})? \[len: _[0-9]+\]\) map\(tofrom:sum
\[len: [0-9]+\]\)$} 1 "omp_oacc_kernels_decompose" } }
+! { dg-final { global lbound1; scan-tree-dump-vars {(?n)#pragma omp target
oacc_data_kernels map\(to:a\[_[0-9]+\](?:{lb: ([^ ]+) sz: 4})? \[len:
_[0-9]+\]\) map\(tofrom:sum \[len: [0-9]+\]\)$} [list lbound1]
"omp_oacc_kernels_decompose" } }
+! { dg-final { global lbound1; scan-tree-dump-times "$lbound1 = 0;" 1
"omp_oacc_kernels_decompose" } }
! As noted above, we get three "old-style" kernel regions, one gang-single
region, and one parallelized loop region.
-! { dg-final { scan-tree-dump-times {(?n)#pragma omp target oacc_kernels
async\(-1\) map\(force_present:a\[_[0-9]+\](?:{lb: 1 sz: 4})? \[len:
_[0-9]+\]\) map\(alloc:a \[pointer assign, bias: _[0-9]+\]\)
map\(force_present:sum \[len: [0-9]+\]\)$} 3 "omp_oacc_kernels_decompose" } }
-! { dg-final { scan-tree-dump-times {(?n)#pragma omp target
oacc_parallel_kernels_parallelized async\(-1\)
map\(force_present:a\[_[0-9]+\](?:{lb: 1 sz: 4})? \[len: _[0-9]+\]\)
map\(alloc:a \[pointer assign, bias: _[0-9]+\]\) map\(force_present:sum \[len:
[0-9]+\]\)$} 1 "omp_oacc_kernels_decompose" } }
-! { dg-final { scan-tree-dump-times {(?n)#pragma omp target
oacc_parallel_kernels_gang_single async\(-1\) num_gangs\(1\)
map\(force_present:a\[_[0-9]+\](?:{lb: 1 sz: 4})? \[len: _[0-9]+\]\)
map\(alloc:a \[pointer assign, bias: _[0-9]+\]\) map\(force_present:sum \[len:
[0-9]+\]\)$} 1 "omp_oacc_kernels_decompose" } }
+! { dg-final { scan-tree-dump-times {(?n)#pragma omp target oacc_kernels
async\(-1\) map\(force_present:a\[_[0-9]+\](?:{lb: _[0-9]+ sz: 4})? \[len:
_[0-9]+\]\) map\(alloc:a \[pointer assign, bias: _[0-9]+\]\)
map\(force_present:sum \[len: [0-9]+\]\)$} 3 "omp_oacc_kernels_decompose" } }
+! { dg-final { global lbound1; scan-tree-dump-vars {(?n)#pragma omp target
oacc_parallel_kernels_parallelized async\(-1\)
map\(force_present:a\[_[0-9]+\](?:{lb: ([^ ]+) sz: 4})? \[len: _[0-9]+\]\)
map\(alloc:a \[pointer assign, bias: _[0-9]+\]\) map\(force_present:sum \[len:
[0-9]+\]\)$} [list lbound1] "omp_oacc_kernels_decompose" } }
+! { dg-final { global lbound1; scan-tree-dump-times "$lbound1 = 0;" 1
"omp_oacc_kernels_decompose" } }
+! { dg-final { global lbound1; scan-tree-dump-vars {(?n)#pragma omp target
oacc_parallel_kernels_gang_single async\(-1\) num_gangs\(1\)
map\(force_present:a\[_[0-9]+\](?:{lb: ([^ ]+) sz: 4})? \[len: _[0-9]+\]\)
map\(alloc:a \[pointer assign, bias: _[0-9]+\]\) map\(force_present:sum \[len:
[0-9]+\]\)$} [list lbound1] "omp_oacc_kernels_decompose" } }
+! { dg-final { global lbound1; scan-tree-dump-times "$lbound1 = 0;" 1
"omp_oacc_kernels_decompose" } }
!
! 'data' plus five CCs.
! { dg-final { scan-tree-dump-times {(?n)#pragma omp target } 6
"omp_oacc_kernels_decompose" } }
