FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Fortran] More precise location information for OpenACC 'gang', 'worker', 'vector' clauses with argument [PR92793]

Browse source 
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.
This commit is contained in:
Thomas Schwinge 2020-10-27 17:14:10 +01:00
parent beddd1762a
commit 41f7f6178e
2 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gcc/fortran/trans-openmp.c
View file

@ -3771,34 +3771,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)
@ -3806,11 +3810,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

29
gcc/testsuite/gfortran.dg/goacc/pr92793-1.f90
View file

@ -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