From 76a8871e586d5d434a75d01df71ba37448cdfebb Mon Sep 17 00:00:00 2001 From: Marcel Vollweiler Date: Fri, 21 Oct 2022 02:56:46 -0700 Subject: [PATCH] Added "noclone" to scan-tree-dump for several OpenAcc tests. This fixes multiple tests in addition to b0256655fb402f87c921cd782b873dd301760ebd. gcc/testsuite/ChangeLog: * c-c++-common/goacc/classify-kernels-unparallelized-graphite.c: Add "noclone" in scan-tree-dump. * c-c++-common/goacc/kernels-acc-loop-reduction.c: Likewise. * c-c++-common/goacc/kernels-acc-loop-smaller-equal.c: Likewise. * c-c++-common/goacc/kernels-loop-2-acc-loop.c: Likewise. * c-c++-common/goacc/kernels-loop-3-acc-loop.c: Likewise. * c-c++-common/goacc/kernels-loop-acc-loop.c: Likewise. * c-c++-common/goacc/kernels-loop-n-acc-loop.c: Likewise. * gfortran.dg/goacc/kernels-loop-data-parloops-2.f95: Likewise. * gfortran.dg/goacc/kernels-loop-parloops-2.f95: Likewise. * gfortran.dg/goacc/kernels-loop-parloops.f95: Likewise. --- gcc/testsuite/ChangeLog.omp | 11 +++++++++++ .../goacc/classify-kernels-unparallelized-graphite.c | 4 ++-- .../c-c++-common/goacc/kernels-acc-loop-reduction.c | 2 +- .../goacc/kernels-acc-loop-smaller-equal.c | 2 +- .../c-c++-common/goacc/kernels-loop-2-acc-loop.c | 2 +- .../c-c++-common/goacc/kernels-loop-3-acc-loop.c | 2 +- .../c-c++-common/goacc/kernels-loop-acc-loop.c | 2 +- .../c-c++-common/goacc/kernels-loop-n-acc-loop.c | 2 +- .../goacc/kernels-loop-data-parloops-2.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-parloops-2.f95 | 2 +- .../gfortran.dg/goacc/kernels-loop-parloops.f95 | 2 +- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 6928d520c0f3..0ded9edf750b 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,14 @@ +2022-10-21 Marcel Vollweiler + + * c-c++-common/goacc/classify-kernels-unparallelized-graphite.c: + Add "noclone" in scan-tree-dump. + * c-c++-common/goacc/kernels-acc-loop-reduction.c: Likewise. + * c-c++-common/goacc/kernels-acc-loop-smaller-equal.c: Likewise. + * c-c++-common/goacc/kernels-loop-2-acc-loop.c: Likewise. + * c-c++-common/goacc/kernels-loop-3-acc-loop.c: Likewise. + * c-c++-common/goacc/kernels-loop-acc-loop.c: Likewise. + * c-c++-common/goacc/kernels-loop-n-acc-loop.c: Likewise. + 2022-10-19 Tobias Burnus * gfortran.dg/gomp/affinity-clause-1.f90: Revert to upsteam version, diff --git a/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized-graphite.c b/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized-graphite.c index 721b34acd9a8..ad49d2212ea5 100644 --- a/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized-graphite.c +++ b/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized-graphite.c @@ -29,7 +29,7 @@ void KERNELS () } /* Check the offloaded function's attributes. - { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc parallel_kernels_graphite, omp target entrypoint\\)\\)" 1 "ompexp" } } */ + { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc parallel_kernels_graphite, omp target entrypoint, noclone\\)\\)" 1 "ompexp" } } */ /* Check that Graphite can handle neither the original nor the offloaded region { dg-final { scan-tree-dump-times "number of SCoPs: 0" 2 "graphite" } } @@ -38,4 +38,4 @@ void KERNELS () always be 1 x 1 x 1 for non-offloading compilation). { dg-final { scan-tree-dump-times "(?n)Function is parallel_kernels_graphite OpenACC kernels offload" 1 "oaccloops1" } } { dg-final { scan-tree-dump-times "(?n)Compute dimensions \\\[1, 1, 1\\\]" 1 "oaccloops1" } } - { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc function \\(1, 1, 1\\), oacc parallel_kernels_graphite, omp target entrypoint\\)\\)" 1 "oaccloops1" } } */ + { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc function \\(1, 1, 1\\), oacc parallel_kernels_graphite, omp target entrypoint, noclone\\)\\)" 1 "oaccloops1" } } */ diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-reduction.c b/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-reduction.c index ba3a99d1b2c2..cc3e3879c712 100644 --- a/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-reduction.c +++ b/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-reduction.c @@ -18,7 +18,7 @@ foo (int n, unsigned int *a) /* Check that only one loop is analyzed, and that it can be parallelized. */ /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops1" } } */ -/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 1 "parloops1" } } */ +/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 1 "parloops1" } } */ /* { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } */ /* Check that the loop has been split off into a function. */ diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c b/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c index a5599b1da234..9bc31a40e636 100644 --- a/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c +++ b/gcc/testsuite/c-c++-common/goacc/kernels-acc-loop-smaller-equal.c @@ -18,7 +18,7 @@ foo (int n) /* Check that only one loop is analyzed, and that it can be parallelized. */ /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops1" } } */ -/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 1 "parloops1" } } */ +/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 1 "parloops1" } } */ /* { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } */ /* Check that the loop has been split off into a function. */ diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-2-acc-loop.c b/gcc/testsuite/c-c++-common/goacc/kernels-loop-2-acc-loop.c index 059ceadc7c47..f6c8cc588618 100644 --- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-2-acc-loop.c +++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-2-acc-loop.c @@ -11,7 +11,7 @@ /* Check that only three loops are analyzed, and that all can be parallelized. */ /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops1" } } */ -/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 3 "parloops1" } } */ +/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 3 "parloops1" } } */ /* { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } */ /* Check that the loop has been split off into a function. */ diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-3-acc-loop.c b/gcc/testsuite/c-c++-common/goacc/kernels-loop-3-acc-loop.c index a9098ac531f2..43e85de25639 100644 --- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-3-acc-loop.c +++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-3-acc-loop.c @@ -10,7 +10,7 @@ /* Check that only one loop is analyzed, and that it can be parallelized. */ /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops1" } } */ -/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 1 "parloops1" } } */ +/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 1 "parloops1" } } */ /* { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } */ /* Check that the loop has been split off into a function. */ diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop.c b/gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop.c index a4750c9fe199..9f337630cd93 100644 --- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop.c +++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-acc-loop.c @@ -10,7 +10,7 @@ /* Check that only one loop is analyzed, and that it can be parallelized. */ /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops1" } } */ -/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 1 "parloops1" } } */ +/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 1 "parloops1" } } */ /* { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } */ /* Check that the loop has been split off into a function. */ diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-loop-n-acc-loop.c b/gcc/testsuite/c-c++-common/goacc/kernels-loop-n-acc-loop.c index 300c2e71c49b..d9699c01364c 100644 --- a/gcc/testsuite/c-c++-common/goacc/kernels-loop-n-acc-loop.c +++ b/gcc/testsuite/c-c++-common/goacc/kernels-loop-n-acc-loop.c @@ -10,7 +10,7 @@ /* Check that only one loop is analyzed, and that it can be parallelized. */ /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops1" } } */ -/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 1 "parloops1" } } */ +/* { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 1 "parloops1" } } */ /* { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } */ /* Check that the loop has been split off into a function. */ diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-parloops-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-parloops-2.f95 index c92ad4ccf6f2..d1d5ed9973f3 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-parloops-2.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-parloops-2.f95 @@ -43,7 +43,7 @@ end program main ! Check that only three loops are analyzed, and that all can be parallelized. ! { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops1" } } -! { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 3 "parloops1" } } +! { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 3 "parloops1" } } ! { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } ! Check that the loop has been split off into a function. diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops-2.f95 index 634445ad4a1b..e15d4959716b 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops-2.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops-2.f95 @@ -36,7 +36,7 @@ end program main ! Check that only three loops are analyzed, and that all can be parallelized. ! { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops1" } } -! { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 3 "parloops1" } } +! { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 3 "parloops1" } } ! { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } ! Check that the loop has been split off into a function. diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops.f95 index c6fa14f5920f..317c05f95c27 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-parloops.f95 @@ -32,7 +32,7 @@ end program main ! Check that only one loop is analyzed, and that it can be parallelized. ! { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops1" } } -! { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint\\)\\)" 1 "parloops1" } } +! { dg-final { scan-tree-dump-times "(?n)__attribute__\\(\\(oacc kernels parallelized, oacc function \\(, , \\), oacc kernels, omp target entrypoint, noclone\\)\\)" 1 "parloops1" } } ! { dg-final { scan-tree-dump-not "FAILED:" "parloops1" } } ! Check that the loop has been split off into a function. -- 2.47.2