From 5ceaf8a54abb3f9bd3c268fe420999a7962b2a15 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 27 Oct 2020 17:14:10 +0100 Subject: [PATCH] [Fortran] More precise location information for OpenACC 'gang', 'worker', 'vector' clauses with argument [PR92793] gcc/fortran/ PR fortran/92793 * trans-openmp.c (gfc_trans_omp_clauses): More precise location information for OpenACC 'gang', 'worker', 'vector' clauses with argument. gcc/testsuite/ PR fortran/92793 * gfortran.dg/goacc/pr92793-1.f90: Adjust. (cherry picked from commit 41f7f6178e2d35288273656dc55dae8fcf3edeb5) --- gcc/fortran/trans-openmp.c | 40 ++++++++++++------- gcc/testsuite/gfortran.dg/goacc/pr92793-1.f90 | 29 +++++--------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index c01c4d792195..b3d31c560435 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -3523,34 +3523,38 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, } if (clauses->vector) { + c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_VECTOR); + omp_clauses = gfc_trans_add_clause (c, omp_clauses); + if (clauses->vector_expr) { tree vector_var = gfc_convert_expr_to_tree (block, clauses->vector_expr); - c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_VECTOR); OMP_CLAUSE_VECTOR_EXPR (c) = vector_var; - omp_clauses = gfc_trans_add_clause (c, omp_clauses); - } - else - { - c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_VECTOR); - omp_clauses = gfc_trans_add_clause (c, omp_clauses); + + /* TODO: We're not capturing location information for individual + clauses. However, if we have an expression attached to the + clause, that one provides better location information. */ + OMP_CLAUSE_LOCATION (c) + = gfc_get_location (&clauses->vector_expr->where); } } if (clauses->worker) { + c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_WORKER); + omp_clauses = gfc_trans_add_clause (c, omp_clauses); + if (clauses->worker_expr) { tree worker_var = gfc_convert_expr_to_tree (block, clauses->worker_expr); - c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_WORKER); OMP_CLAUSE_WORKER_EXPR (c) = worker_var; - omp_clauses = gfc_trans_add_clause (c, omp_clauses); - } - else - { - c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_WORKER); - omp_clauses = gfc_trans_add_clause (c, omp_clauses); + + /* TODO: We're not capturing location information for individual + clauses. However, if we have an expression attached to the + clause, that one provides better location information. */ + OMP_CLAUSE_LOCATION (c) + = gfc_get_location (&clauses->worker_expr->where); } } if (clauses->gang) @@ -3558,11 +3562,19 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, tree arg; c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_GANG); omp_clauses = gfc_trans_add_clause (c, omp_clauses); + if (clauses->gang_num_expr) { arg = gfc_convert_expr_to_tree (block, clauses->gang_num_expr); OMP_CLAUSE_GANG_EXPR (c) = arg; + + /* TODO: We're not capturing location information for individual + clauses. However, if we have an expression attached to the + clause, that one provides better location information. */ + OMP_CLAUSE_LOCATION (c) + = gfc_get_location (&clauses->gang_num_expr->where); } + if (clauses->gang_static) { arg = clauses->gang_static_expr diff --git a/gcc/testsuite/gfortran.dg/goacc/pr92793-1.f90 b/gcc/testsuite/gfortran.dg/goacc/pr92793-1.f90 index 23d6886580a1..4651ccffaa1f 100644 --- a/gcc/testsuite/gfortran.dg/goacc/pr92793-1.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/pr92793-1.f90 @@ -52,13 +52,10 @@ subroutine gwv_sl () integer :: i !$acc serial loop & - !$acc & gang(num:5) & ! { dg-error "argument not permitted on 'gang' clause" "TODO" { xfail *-*-* } } - !$acc & & ! { dg-bogus "14: argument not permitted on 'gang' clause" "TODO" { xfail *-*-* } .+6 } - !$acc & worker(num:5) & ! { dg-error "argument not permitted on 'worker' clause" "TODO" { xfail *-*-* } } - !$acc & & ! { dg-bogus "14: argument not permitted on 'worker' clause" "TODO" { xfail *-*-* } .+4 } - !$acc & vector(length:5) & ! { dg-error "argument not permitted on 'vector' clause" "TODO" { xfail *-*-* } } - !$acc & ! { dg-bogus "14: argument not permitted on 'vector' clause" "TODO" { xfail *-*-* } .+2 } - ! { dg-message "99: enclosing parent compute construct" "" { target *-*-* } .-1 } + !$acc & gang(num:5) & ! { dg-error "25: argument not permitted on 'gang' clause" } + !$acc & worker(num:5) & ! { dg-error "24: argument not permitted on 'worker' clause" } + !$acc & vector(length:5) ! { dg-error "28: argument not permitted on 'vector' clause" } + ! { dg-message "93: enclosing parent compute construct" "" { target *-*-* } .-1 } do i = 0, 10 end do !$acc end serial loop @@ -70,12 +67,9 @@ subroutine gwv_s_l () !$acc serial ! { dg-message "72: enclosing parent compute construct" } !$acc loop & - !$acc & gang(num:5) & ! { dg-error "argument not permitted on 'gang' clause" "TODO" { xfail *-*-* } } - !$acc & & ! { dg-bogus "14: argument not permitted on 'gang' clause" "TODO" { xfail *-*-* } .+5 } - !$acc & worker(num:5) & ! { dg-error "argument not permitted on 'worker' clause" "TODO" { xfail *-*-* } } - !$acc & & ! { dg-bogus "14: argument not permitted on 'worker' clause" "TODO" { xfail *-*-* } .+3 } - !$acc & vector(length:5) & ! { dg-error "argument not permitted on 'vector' clause" "TODO" { xfail *-*-* } } - !$acc & ! { dg-bogus "14: argument not permitted on 'vector' clause" "TODO" { xfail *-*-* } .+1 } + !$acc & gang(num:5) & ! { dg-error "27: argument not permitted on 'gang' clause" } + !$acc & worker(num:5) & ! { dg-error "23: argument not permitted on 'worker' clause" } + !$acc & vector(length:5) ! { dg-error "29: argument not permitted on 'vector' clause" } do i = 0, 10 end do !$acc end serial @@ -88,12 +82,9 @@ subroutine gwv_r () ! { dg-message "16: enclosing routine" } !$acc routine(gwv_r) !$acc loop & - !$acc & gang(num:5) & ! { dg-error "argument not permitted on 'gang' clause" "TODO" { xfail *-*-* } } - !$acc & & ! { dg-bogus "14: argument not permitted on 'gang' clause" "TODO" { xfail *-*-* } .+5 } - !$acc & worker(num:5) & ! { dg-error "argument not permitted on 'worker' clause" "TODO" { xfail *-*-* } } - !$acc & & ! { dg-bogus "14: argument not permitted on 'worker' clause" "TODO" { xfail *-*-* } .+3 } - !$acc & vector(length:5) & ! { dg-error "argument not permitted on 'vector' clause" "TODO" { xfail *-*-* } } - !$acc & ! { dg-bogus "14: argument not permitted on 'vector' clause" "TODO" { xfail *-*-* } .+1 } + !$acc & gang(num:5) & ! { dg-error "23: argument not permitted on 'gang' clause" } + !$acc & worker(num:5) & ! { dg-error "26: argument not permitted on 'worker' clause" } + !$acc & vector(length:5) ! { dg-error "27: argument not permitted on 'vector' clause" } do i = 0, 10 end do end subroutine gwv_r -- 2.17.1