Adjust the testsuite to changed expectations with the new Graphite-based "kernels" handling. libgomp/ChangeLog: * testsuite/libgomp.oacc-c++/privatized-ref-2.C: Adjust. * testsuite/libgomp.oacc-c++/privatized-ref-3.C: Adjust. * testsuite/libgomp.oacc-c-c++-common/acc_prof-kernels-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/declare-vla-kernels-decompose-ice-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-2.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-3.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-4.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-local-worker-5.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-2.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-3.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-4.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-5.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-gang-6.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-vector-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-vector-2.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-2.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-3.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-4.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-5.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-6.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/kernels-private-vars-loop-worker-7.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/loop-auto-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/parallel-dims.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/pr84955-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/pr85381-2.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/pr85381-3.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/pr85381-4.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/pr85486-2.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/pr85486-3.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/pr85486.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/routine-nohost-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/vector-length-128-1.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/vector-length-128-2.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/vector-length-128-3.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/vector-length-128-4.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/vector-length-128-5.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/vector-length-128-6.c: Adjust. * testsuite/libgomp.oacc-c-c++-common/vector-length-128-7.c: Adjust. * testsuite/libgomp.oacc-fortran/if-1.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-acc-loop-reduction-2.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-1.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-2.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-3.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-gang-6.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-1.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-vector-2.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-1.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-2.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-3.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-4.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-5.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-6.f90: Adjust. * testsuite/libgomp.oacc-fortran/kernels-private-vars-loop-worker-7.f90: Adjust. * testsuite/libgomp.oacc-fortran/optional-private.f90: Adjust. * testsuite/libgomp.oacc-fortran/pr94358-1.f90: Adjust. * testsuite/libgomp.oacc-fortran/routine-nohost-1.f90: Adjust. gcc/testsuite/ChangeLog: * c-c++-common/goacc-gomp/nesting-1.c: Adjust. * c-c++-common/goacc/cache-3-1.c: Adjust. * c-c++-common/goacc/classify-kernels-unparallelized.c: Adjust. * c-c++-common/goacc/classify-kernels.c: Adjust. * c-c++-common/goacc/classify-routine-nohost.c: Adjust. * c-c++-common/goacc/classify-serial.c: Adjust. * c-c++-common/goacc/if-clause-2.c: Adjust. * c-c++-common/goacc/kernels-1.c: Adjust. * c-c++-common/goacc/kernels-counter-var-redundant-load.c: Adjust. * c-c++-common/goacc/kernels-counter-vars-function-scope.c: Adjust. * c-c++-common/goacc/kernels-decompose-1.c: Adjust. * c-c++-common/goacc/kernels-decompose-2.c: Adjust. * c-c++-common/goacc/kernels-decompose-ice-1.c: Adjust. * c-c++-common/goacc/kernels-decompose-ice-2.c: Adjust. * c-c++-common/goacc/kernels-double-reduction-n.c: Adjust. * c-c++-common/goacc/kernels-double-reduction.c: Adjust. * c-c++-common/goacc/kernels-loop-2.c: Adjust. * c-c++-common/goacc/kernels-loop-3.c: Adjust. * c-c++-common/goacc/kernels-loop-data-2.c: Adjust. * c-c++-common/goacc/kernels-loop-data-enter-exit-2.c: Adjust. * c-c++-common/goacc/kernels-loop-data-enter-exit.c: Adjust. * c-c++-common/goacc/kernels-loop-data-update.c: Adjust. * c-c++-common/goacc/kernels-loop-data.c: Adjust. * c-c++-common/goacc/kernels-loop-g.c: Adjust. * c-c++-common/goacc/kernels-loop-mod-not-zero.c: Adjust. * c-c++-common/goacc/kernels-loop-n.c: Adjust. * c-c++-common/goacc/kernels-loop-nest.c: Adjust. * c-c++-common/goacc/kernels-loop.c: Adjust. * c-c++-common/goacc/kernels-one-counter-var.c: Adjust. * c-c++-common/goacc/kernels-parallel-loop-data-enter-exit.c: Adjust. * c-c++-common/goacc/kernels-reduction.c: Adjust. * c-c++-common/goacc/loop-2-kernels.c: Adjust. * c-c++-common/goacc/loop-auto-1.c: Adjust. * c-c++-common/goacc/loop-auto-2.c: Adjust. * c-c++-common/goacc/nested-reductions-2-parallel.c: Adjust. * c-c++-common/goacc/omp_data_optimize-1.c: Adjust. * c-c++-common/goacc/routine-nohost-1.c: Adjust. * c-c++-common/goacc/uninit-copy-clause.c: Adjust. * g++.dg/goacc/omp_data_optimize-1.C: Adjust. * g++.dg/goacc/template.C: Adjust. * gcc.dg/goacc/loop-processing-1.c: Adjust. * gcc.dg/goacc/nested-function-1.c: Adjust. * gfortran.dg/directive_unroll_1.f90: Adjust. * gfortran.dg/directive_unroll_4.f90: Adjust. * gfortran.dg/goacc/classify-kernels-unparallelized.f95: Adjust. * gfortran.dg/goacc/classify-kernels.f95: Adjust. * gfortran.dg/goacc/classify-parallel.f95: Adjust. * gfortran.dg/goacc/classify-routine-nohost.f95: Adjust. * gfortran.dg/goacc/classify-routine.f95: Adjust. * gfortran.dg/goacc/classify-serial.f95: Adjust. * gfortran.dg/goacc/common-block-3.f90: Adjust. * gfortran.dg/goacc/declare-3.f95: Adjust. * gfortran.dg/goacc/gang-static.f95: Adjust. * gfortran.dg/goacc/kernels-decompose-1.f95: Adjust. * gfortran.dg/goacc/kernels-decompose-2.f95: Adjust. * gfortran.dg/goacc/kernels-loop-2.f95: Adjust. * gfortran.dg/goacc/kernels-loop-data-2.f95: Adjust. * gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95: Adjust. * gfortran.dg/goacc/kernels-loop-data-enter-exit.f95: Adjust. * gfortran.dg/goacc/kernels-loop-data-update.f95: Adjust. * gfortran.dg/goacc/kernels-loop-data.f95: Adjust. * gfortran.dg/goacc/kernels-loop-inner.f95: Adjust. * gfortran.dg/goacc/kernels-loop-n.f95: Adjust. * gfortran.dg/goacc/kernels-loop.f95: Adjust. * gfortran.dg/goacc/kernels-parallel-loop-data-enter-exit.f95: Adjust. * gfortran.dg/goacc/kernels-tree.f95: Adjust. * gfortran.dg/goacc/loop-2-kernels.f95: Adjust. * gfortran.dg/goacc/loop-auto-transfer-2.f90: Adjust. * gfortran.dg/goacc/loop-auto-transfer-3.f90: Adjust. * gfortran.dg/goacc/loop-auto-transfer-4.f90: Adjust. * gfortran.dg/goacc/nested-function-1.f90: Adjust. * gfortran.dg/goacc/nested-reductions-2-parallel.f90: Adjust. * gfortran.dg/goacc/omp_data_optimize-1.f90: Adjust. * gfortran.dg/goacc/private-explicit-kernels-1.f95: Adjust. * gfortran.dg/goacc/private-predetermined-kernels-1.f95: Adjust. * gfortran.dg/goacc/privatization-1-compute-loop.f90: Adjust. * gfortran.dg/goacc/routine-module-mod-1.f90: Adjust. * gfortran.dg/goacc/routine-multiple-directives-1.f90: Adjust. * gfortran.dg/goacc/uninit-copy-clause.f95: Adjust. * c-c++-common/goacc/loop-auto-reductions.c: New test. * c-c++-common/goacc/note-parallelism-kernels-loops-1.c: New test. * c-c++-common/goacc/note-parallelism-kernels-loops-parloops.c: New test. * gfortran.dg/goacc/classify-kernels-unparallelized-parloops.f95: New test. * gfortran.dg/goacc/kernels-conversion.f95: New test. * gfortran.dg/goacc/kernels-reductions.f90: New test. --- .../c-c++-common/goacc-gomp/nesting-1.c | 10 +- gcc/testsuite/c-c++-common/goacc/cache-3-1.c | 2 +- .../goacc/classify-kernels-unparallelized.c | 34 ++- .../c-c++-common/goacc/classify-kernels.c | 21 +- .../goacc/classify-routine-nohost.c | 20 +- .../c-c++-common/goacc/classify-serial.c | 8 +- .../c-c++-common/goacc/if-clause-2.c | 2 +- gcc/testsuite/c-c++-common/goacc/kernels-1.c | 17 +- .../kernels-counter-var-redundant-load.c | 20 +- .../kernels-counter-vars-function-scope.c | 11 +- .../c-c++-common/goacc/kernels-decompose-1.c | 31 ++- .../c-c++-common/goacc/kernels-decompose-2.c | 58 +++-- .../goacc/kernels-decompose-ice-1.c | 7 +- .../goacc/kernels-decompose-ice-2.c | 3 +- .../goacc/kernels-double-reduction-n.c | 5 +- .../goacc/kernels-double-reduction.c | 4 +- .../c-c++-common/goacc/kernels-loop-2.c | 20 +- .../c-c++-common/goacc/kernels-loop-3.c | 2 + .../c-c++-common/goacc/kernels-loop-data-2.c | 18 +- .../goacc/kernels-loop-data-enter-exit-2.c | 17 +- .../goacc/kernels-loop-data-enter-exit.c | 18 +- .../goacc/kernels-loop-data-update.c | 14 +- .../c-c++-common/goacc/kernels-loop-data.c | 13 +- .../c-c++-common/goacc/kernels-loop-g.c | 15 +- .../goacc/kernels-loop-mod-not-zero.c | 11 +- .../c-c++-common/goacc/kernels-loop-n.c | 11 +- .../c-c++-common/goacc/kernels-loop-nest.c | 13 +- .../c-c++-common/goacc/kernels-loop.c | 11 +- .../goacc/kernels-one-counter-var.c | 13 +- .../kernels-parallel-loop-data-enter-exit.c | 18 +- .../c-c++-common/goacc/kernels-reduction.c | 9 +- .../c-c++-common/goacc/loop-2-kernels.c | 6 +- .../c-c++-common/goacc/loop-auto-1.c | 127 +++++------ .../c-c++-common/goacc/loop-auto-2.c | 37 +-- .../c-c++-common/goacc/loop-auto-reductions.c | 22 ++ .../goacc/nested-reductions-2-parallel.c | 138 +++++++++++ .../goacc/note-parallelism-kernels-loops-1.c | 61 +++++ .../note-parallelism-kernels-loops-parloops.c | 53 +++++ .../c-c++-common/goacc/omp_data_optimize-1.c | 208 ++++++++--------- .../c-c++-common/goacc/routine-nohost-1.c | 2 +- .../c-c++-common/goacc/uninit-copy-clause.c | 6 - .../g++.dg/goacc/omp_data_optimize-1.C | 32 +-- gcc/testsuite/g++.dg/goacc/template.C | 18 +- .../gcc.dg/goacc/loop-processing-1.c | 9 +- .../gcc.dg/goacc/nested-function-1.c | 3 +- .../gfortran.dg/directive_unroll_1.f90 | 2 +- .../gfortran.dg/directive_unroll_4.f90 | 2 +- ...assify-kernels-unparallelized-parloops.f95 | 44 ++++ .../goacc/classify-kernels-unparallelized.f95 | 27 +-- .../gfortran.dg/goacc/classify-kernels.f95 | 21 +- .../gfortran.dg/goacc/classify-parallel.f95 | 6 +- .../goacc/classify-routine-nohost.f95 | 18 +- .../gfortran.dg/goacc/classify-routine.f95 | 20 +- .../gfortran.dg/goacc/classify-serial.f95 | 8 +- .../gfortran.dg/goacc/common-block-3.f90 | 16 +- gcc/testsuite/gfortran.dg/goacc/declare-3.f95 | 2 +- .../gfortran.dg/goacc/gang-static.f95 | 14 +- .../gfortran.dg/goacc/kernels-conversion.f95 | 52 +++++ .../gfortran.dg/goacc/kernels-decompose-1.f95 | 186 ++++++++++----- .../gfortran.dg/goacc/kernels-decompose-2.f95 | 114 +++++++--- .../gfortran.dg/goacc/kernels-loop-2.f95 | 11 +- .../gfortran.dg/goacc/kernels-loop-data-2.f95 | 11 +- .../goacc/kernels-loop-data-enter-exit-2.f95 | 13 +- .../goacc/kernels-loop-data-enter-exit.f95 | 13 +- .../goacc/kernels-loop-data-update.f95 | 13 +- .../gfortran.dg/goacc/kernels-loop-data.f95 | 15 +- .../gfortran.dg/goacc/kernels-loop-inner.f95 | 6 +- .../gfortran.dg/goacc/kernels-loop-n.f95 | 14 +- .../gfortran.dg/goacc/kernels-loop.f95 | 10 +- .../kernels-parallel-loop-data-enter-exit.f95 | 13 +- .../gfortran.dg/goacc/kernels-reductions.f90 | 37 +++ .../gfortran.dg/goacc/kernels-tree.f95 | 2 +- .../gfortran.dg/goacc/loop-2-kernels.f95 | 6 +- .../goacc/loop-auto-transfer-2.f90 | 2 - .../goacc/loop-auto-transfer-3.f90 | 8 - .../goacc/loop-auto-transfer-4.f90 | 30 --- .../gfortran.dg/goacc/nested-function-1.f90 | 12 +- .../goacc/nested-reductions-2-parallel.f90 | 177 +++++++++++++++ .../gfortran.dg/goacc/omp_data_optimize-1.f90 | 214 +++++++++--------- .../goacc/private-explicit-kernels-1.f95 | 13 +- .../goacc/private-predetermined-kernels-1.f95 | 16 +- .../goacc/privatization-1-compute-loop.f90 | 3 - .../goacc/routine-module-mod-1.f90 | 4 +- .../goacc/routine-multiple-directives-1.f90 | 32 +-- .../gfortran.dg/goacc/uninit-copy-clause.f95 | 2 - .../libgomp.oacc-c++/privatized-ref-2.C | 4 +- .../libgomp.oacc-c++/privatized-ref-3.C | 4 +- .../acc_prof-kernels-1.c | 4 +- .../declare-vla-kernels-decompose-ice-1.c | 4 - .../kernels-decompose-1.c | 8 +- .../kernels-private-vars-local-worker-1.c | 6 +- .../kernels-private-vars-local-worker-2.c | 6 +- .../kernels-private-vars-local-worker-3.c | 6 +- .../kernels-private-vars-local-worker-4.c | 8 +- .../kernels-private-vars-local-worker-5.c | 6 +- .../kernels-private-vars-loop-gang-1.c | 4 +- .../kernels-private-vars-loop-gang-2.c | 4 +- .../kernels-private-vars-loop-gang-3.c | 4 +- .../kernels-private-vars-loop-gang-4.c | 15 +- .../kernels-private-vars-loop-gang-5.c | 10 +- .../kernels-private-vars-loop-gang-6.c | 4 +- .../kernels-private-vars-loop-vector-1.c | 6 +- .../kernels-private-vars-loop-vector-2.c | 6 +- .../kernels-private-vars-loop-worker-1.c | 8 +- .../kernels-private-vars-loop-worker-2.c | 6 +- .../kernels-private-vars-loop-worker-3.c | 6 +- .../kernels-private-vars-loop-worker-4.c | 6 +- .../kernels-private-vars-loop-worker-5.c | 9 +- .../kernels-private-vars-loop-worker-6.c | 6 +- .../kernels-private-vars-loop-worker-7.c | 6 +- .../libgomp.oacc-c-c++-common/loop-auto-1.c | 30 ++- .../libgomp.oacc-c-c++-common/parallel-dims.c | 39 ++-- .../libgomp.oacc-c-c++-common/pr84955-1.c | 1 - .../libgomp.oacc-c-c++-common/pr85381-2.c | 8 +- .../libgomp.oacc-c-c++-common/pr85381-3.c | 8 +- .../libgomp.oacc-c-c++-common/pr85381-4.c | 4 +- .../libgomp.oacc-c-c++-common/pr85486-2.c | 4 +- .../libgomp.oacc-c-c++-common/pr85486-3.c | 4 +- .../libgomp.oacc-c-c++-common/pr85486.c | 4 +- .../routine-nohost-1.c | 6 +- .../vector-length-128-1.c | 5 +- .../vector-length-128-2.c | 6 +- .../vector-length-128-3.c | 5 +- .../vector-length-128-4.c | 5 +- .../vector-length-128-5.c | 5 +- .../vector-length-128-6.c | 5 +- .../vector-length-128-7.c | 5 +- .../testsuite/libgomp.oacc-fortran/if-1.f90 | 32 +-- .../kernels-acc-loop-reduction-2.f90 | 12 +- .../kernels-private-vars-loop-gang-1.f90 | 4 +- .../kernels-private-vars-loop-gang-2.f90 | 4 +- .../kernels-private-vars-loop-gang-3.f90 | 4 +- .../kernels-private-vars-loop-gang-6.f90 | 5 +- .../kernels-private-vars-loop-vector-1.f90 | 4 +- .../kernels-private-vars-loop-vector-2.f90 | 11 +- .../kernels-private-vars-loop-worker-1.f90 | 6 +- .../kernels-private-vars-loop-worker-2.f90 | 4 +- .../kernels-private-vars-loop-worker-3.f90 | 4 +- .../kernels-private-vars-loop-worker-4.f90 | 4 +- .../kernels-private-vars-loop-worker-5.f90 | 7 +- .../kernels-private-vars-loop-worker-6.f90 | 4 +- .../kernels-private-vars-loop-worker-7.f90 | 6 +- .../libgomp.oacc-fortran/optional-private.f90 | 2 - .../libgomp.oacc-fortran/pr94358-1.f90 | 2 - .../libgomp.oacc-fortran/routine-nohost-1.f90 | 4 +- 145 files changed, 1697 insertions(+), 1109 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/goacc/loop-auto-reductions.c create mode 100644 gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops-1.c create mode 100644 gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops-parloops.c create mode 100644 gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized-parloops.f95 create mode 100644 gcc/testsuite/gfortran.dg/goacc/kernels-conversion.f95 create mode 100644 gcc/testsuite/gfortran.dg/goacc/kernels-reductions.f90 ----------------- 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