Re: [PATCH V2 5/5] OpenMP: Fortran support for imperfectly-nested loops
On 22.08.23 15:37, Jakub Jelinek wrote: On Sun, Jul 23, 2023 at 04:15:21PM -0600, Sandra Loosemore wrote: [...] In the Fortran front end, most of the semantic processing happens during the translation phase, so the parse phase just collects the intervening statements, checks them for errors, and splices them around the loop body. LGTM, but please let Tobias have a second look unless he has done so already. LGTM but some minor comments: @@ -9764,13 +9820,12 @@ gfc_resolve_do_iterator (gfc_code *code, gfc_symbol *sym, bool add_clause) ... - c = c->block->next; -} + c = find_nested_loop_in_chain (c->block->next); + } Here the indentation of '}' is now in col 3 instead of 4. * * * I was wondering whether any removed error message (due to early return on error) will cause missed error checking, but it looks as if all are covered elsewhere. :-) * * * Can you update the implementation status - either as part of this patch as it is the last in the series or as follow up? It feels good to see 'Y' getting added there. https://gcc.gnu.org/onlinedocs/libgomp/OpenMP-5_002e0.html "Collapse of associated loops that are imperfectly nested loops" alias libgomp/libgomp.texi in line 203. Thanks, Tobias - 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
Re: [PATCH V2 5/5] OpenMP: Fortran support for imperfectly-nested loops
On Sun, Jul 23, 2023 at 04:15:21PM -0600, Sandra Loosemore wrote: > OpenMP 5.0 removed the restriction that multiple collapsed loops must > be perfectly nested, allowing "intervening code" (including nested > BLOCKs) before or after each nested loop. In GCC this code is moved > into the inner loop body by the respective front ends. > > In the Fortran front end, most of the semantic processing happens during > the translation phase, so the parse phase just collects the intervening > statements, checks them for errors, and splices them around the loop body. > > gcc/fortran/ChangeLog > * gfortran.h (struct gfc_namespace): Add omp_structured_block bit. > * openmp.cc: Include omp-api.h. > (resolve_omp_clauses): Consolidate inscan reduction clause conflict > checking here. > (find_nested_loop_in_chain): New. > (find_nested_loop_in_block): New. > (gfc_resolve_omp_do_blocks): Set omp_current_do_collapse properly. > Handle imperfectly-nested loops when looking for nested omp scan. > Refactor to move inscan reduction clause conflict checking to > resolve_omp_clauses. > (gfc_resolve_do_iterator): Handle imperfectly-nested loops. > (struct icode_error_state): New. > (icode_code_error_callback): New. > (icode_expr_error_callback): New. > (diagnose_intervening_code_errors_1): New. > (diagnose_intervening_code_errors): New. > (make_structured_block): New. > (restructure_intervening_code): New. > (is_outer_iteration_variable): Do not assume loops are perfectly > nested. > (check_nested_loop_in_chain): New. > (check_nested_loop_in_block_state): New. > (check_nested_loop_in_block_symbol): New. > (check_nested_loop_in_block): New. > (expr_uses_intervening_var): New. > (is_intervening_var): New. > (expr_is_invariant): Do not assume loops are perfectly nested. > (resolve_omp_do): Handle imperfectly-nested loops. > * trans-stmt.cc (gfc_trans_block_construct): Generate > OMP_STRUCTURED_BLOCK if magic bit is set on block namespace. > > gcc/testsuite/ChangeLog > * gfortran.dg/gomp/collapse1.f90: Adjust expected errors. > * gfortran.dg/gomp/collapse2.f90: Likewise. > * gfortran.dg/gomp/imperfect-gotos.f90: New. > * gfortran.dg/gomp/imperfect-invalid-scope.f90: New. > * gfortran.dg/gomp/imperfect1.f90: New. > * gfortran.dg/gomp/imperfect2.f90: New. > * gfortran.dg/gomp/imperfect3.f90: New. > * gfortran.dg/gomp/imperfect4.f90: New. > * gfortran.dg/gomp/imperfect5.f90: New. > > libgomp/ChangeLog > * testsuite/libgomp.fortran/imperfect-destructor.f90: New. > * testsuite/libgomp.fortran/imperfect1.f90: New. > * testsuite/libgomp.fortran/imperfect2.f90: New. > * testsuite/libgomp.fortran/imperfect3.f90: New. > * testsuite/libgomp.fortran/imperfect4.f90: New. > * testsuite/libgomp.fortran/target-imperfect1.f90: New. > * testsuite/libgomp.fortran/target-imperfect2.f90: New. > * testsuite/libgomp.fortran/target-imperfect3.f90: New. > * testsuite/libgomp.fortran/target-imperfect4.f90: New. LGTM, but please let Tobias have a second look unless he has done so already. Jakub
[PATCH V2 5/5] OpenMP: Fortran support for imperfectly-nested loops
OpenMP 5.0 removed the restriction that multiple collapsed loops must be perfectly nested, allowing "intervening code" (including nested BLOCKs) before or after each nested loop. In GCC this code is moved into the inner loop body by the respective front ends. In the Fortran front end, most of the semantic processing happens during the translation phase, so the parse phase just collects the intervening statements, checks them for errors, and splices them around the loop body. gcc/fortran/ChangeLog * gfortran.h (struct gfc_namespace): Add omp_structured_block bit. * openmp.cc: Include omp-api.h. (resolve_omp_clauses): Consolidate inscan reduction clause conflict checking here. (find_nested_loop_in_chain): New. (find_nested_loop_in_block): New. (gfc_resolve_omp_do_blocks): Set omp_current_do_collapse properly. Handle imperfectly-nested loops when looking for nested omp scan. Refactor to move inscan reduction clause conflict checking to resolve_omp_clauses. (gfc_resolve_do_iterator): Handle imperfectly-nested loops. (struct icode_error_state): New. (icode_code_error_callback): New. (icode_expr_error_callback): New. (diagnose_intervening_code_errors_1): New. (diagnose_intervening_code_errors): New. (make_structured_block): New. (restructure_intervening_code): New. (is_outer_iteration_variable): Do not assume loops are perfectly nested. (check_nested_loop_in_chain): New. (check_nested_loop_in_block_state): New. (check_nested_loop_in_block_symbol): New. (check_nested_loop_in_block): New. (expr_uses_intervening_var): New. (is_intervening_var): New. (expr_is_invariant): Do not assume loops are perfectly nested. (resolve_omp_do): Handle imperfectly-nested loops. * trans-stmt.cc (gfc_trans_block_construct): Generate OMP_STRUCTURED_BLOCK if magic bit is set on block namespace. gcc/testsuite/ChangeLog * gfortran.dg/gomp/collapse1.f90: Adjust expected errors. * gfortran.dg/gomp/collapse2.f90: Likewise. * gfortran.dg/gomp/imperfect-gotos.f90: New. * gfortran.dg/gomp/imperfect-invalid-scope.f90: New. * gfortran.dg/gomp/imperfect1.f90: New. * gfortran.dg/gomp/imperfect2.f90: New. * gfortran.dg/gomp/imperfect3.f90: New. * gfortran.dg/gomp/imperfect4.f90: New. * gfortran.dg/gomp/imperfect5.f90: New. libgomp/ChangeLog * testsuite/libgomp.fortran/imperfect-destructor.f90: New. * testsuite/libgomp.fortran/imperfect1.f90: New. * testsuite/libgomp.fortran/imperfect2.f90: New. * testsuite/libgomp.fortran/imperfect3.f90: New. * testsuite/libgomp.fortran/imperfect4.f90: New. * testsuite/libgomp.fortran/target-imperfect1.f90: New. * testsuite/libgomp.fortran/target-imperfect2.f90: New. * testsuite/libgomp.fortran/target-imperfect3.f90: New. * testsuite/libgomp.fortran/target-imperfect4.f90: New. --- gcc/fortran/gfortran.h| 3 + gcc/fortran/openmp.cc | 765 +++--- gcc/fortran/trans-stmt.cc | 7 +- gcc/testsuite/gfortran.dg/gomp/collapse1.f90 | 6 +- gcc/testsuite/gfortran.dg/gomp/collapse2.f90 | 10 +- .../gfortran.dg/gomp/imperfect-gotos.f90 | 69 ++ .../gomp/imperfect-invalid-scope.f90 | 81 ++ gcc/testsuite/gfortran.dg/gomp/imperfect1.f90 | 39 + gcc/testsuite/gfortran.dg/gomp/imperfect2.f90 | 56 ++ gcc/testsuite/gfortran.dg/gomp/imperfect3.f90 | 29 + gcc/testsuite/gfortran.dg/gomp/imperfect4.f90 | 36 + gcc/testsuite/gfortran.dg/gomp/imperfect5.f90 | 67 ++ .../libgomp.fortran/imperfect-destructor.f90 | 142 .../testsuite/libgomp.fortran/imperfect1.f90 | 67 ++ .../testsuite/libgomp.fortran/imperfect2.f90 | 102 +++ .../testsuite/libgomp.fortran/imperfect3.f90 | 110 +++ .../testsuite/libgomp.fortran/imperfect4.f90 | 121 +++ .../libgomp.fortran/target-imperfect1.f90 | 72 ++ .../libgomp.fortran/target-imperfect2.f90 | 110 +++ .../libgomp.fortran/target-imperfect3.f90 | 116 +++ .../libgomp.fortran/target-imperfect4.f90 | 126 +++ 21 files changed, 2025 insertions(+), 109 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/gomp/imperfect-gotos.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/imperfect-invalid-scope.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/imperfect1.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/imperfect2.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/imperfect3.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/imperfect4.f90 create mode 100644 gcc/testsuite/gfortran.dg/gomp/imperfect5.f90 create mode 100644 libgomp/testsuite/libgomp.fortran/imperfect-destructor.f90 create mode 100644 libgomp/testsuite/libgomp.fortran/imperfect1.f90 create
