diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2021-01-19 11:57:34 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2021-01-19 11:58:21 +0100 |
| commit | 049bfd186fae9fb764a3ec04acb20d3eaacda7a3 (patch) | |
| tree | ccfc528fa1495feaf59625d72f52ad034f229d37 /gcc/fortran/openmp.c | |
| parent | 9b8741c98f2876a430c12c85b396d29a87c9c488 (diff) | |
| download | gcc-049bfd186fae9fb764a3ec04acb20d3eaacda7a3.zip gcc-049bfd186fae9fb764a3ec04acb20d3eaacda7a3.tar.gz gcc-049bfd186fae9fb764a3ec04acb20d3eaacda7a3.tar.bz2 | |
OpenMP/Fortran: Fixes for {use,is}_device_ptr
gcc/fortran/ChangeLog:
PR fortran/98476
* openmp.c (resolve_omp_clauses): Change use_device_ptr
to use_device_addr for unless type(c_ptr); check all
list item for is_device_ptr.
gcc/ChangeLog:
PR fortran/98476
* omp-low.c (lower_omp_target): Handle nonpointer is_device_ptr.
libgomp/ChangeLog:
PR fortran/98476
* testsuite/libgomp.fortran/is_device_ptr-1.f90: New test.
gcc/testsuite/ChangeLog:
PR fortran/98476
* gfortran.dg/gomp/map-3.f90: Update expected scan-dump-tree.
* gfortran.dg/gomp/is_device_ptr-2.f90: New test.
* gfortran.dg/gomp/use_device_ptr-1.f90: New test.
Diffstat (limited to 'gcc/fortran/openmp.c')
| -rw-r--r-- | gcc/fortran/openmp.c | 67 |
1 files changed, 51 insertions, 16 deletions
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index a9ecd96..9a3a8f6 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -5345,22 +5345,25 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, } break; case OMP_LIST_IS_DEVICE_PTR: - if (!n->sym->attr.dummy) - gfc_error ("Non-dummy object %qs in %s clause at %L", - n->sym->name, name, &n->where); - if (n->sym->attr.allocatable - || (n->sym->ts.type == BT_CLASS - && CLASS_DATA (n->sym)->attr.allocatable)) - gfc_error ("ALLOCATABLE object %qs in %s clause at %L", - n->sym->name, name, &n->where); - if (n->sym->attr.pointer - || (n->sym->ts.type == BT_CLASS - && CLASS_DATA (n->sym)->attr.pointer)) - gfc_error ("POINTER object %qs in %s clause at %L", - n->sym->name, name, &n->where); - if (n->sym->attr.value) - gfc_error ("VALUE object %qs in %s clause at %L", - n->sym->name, name, &n->where); + for (n = omp_clauses->lists[list]; n != NULL; n = n->next) + { + if (!n->sym->attr.dummy) + gfc_error ("Non-dummy object %qs in %s clause at %L", + n->sym->name, name, &n->where); + if (n->sym->attr.allocatable + || (n->sym->ts.type == BT_CLASS + && CLASS_DATA (n->sym)->attr.allocatable)) + gfc_error ("ALLOCATABLE object %qs in %s clause at %L", + n->sym->name, name, &n->where); + if (n->sym->attr.pointer + || (n->sym->ts.type == BT_CLASS + && CLASS_DATA (n->sym)->attr.pointer)) + gfc_error ("POINTER object %qs in %s clause at %L", + n->sym->name, name, &n->where); + if (n->sym->attr.value) + gfc_error ("VALUE object %qs in %s clause at %L", + n->sym->name, name, &n->where); + } break; case OMP_LIST_USE_DEVICE_PTR: case OMP_LIST_USE_DEVICE_ADDR: @@ -5657,6 +5660,38 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, break; } } + /* OpenMP 5.1: use_device_ptr acts like use_device_addr, except for + type(c_ptr). */ + if (omp_clauses->lists[OMP_LIST_USE_DEVICE_PTR]) + { + gfc_omp_namelist *n_prev, *n_next, *n_addr; + n_addr = omp_clauses->lists[OMP_LIST_USE_DEVICE_ADDR]; + for (; n_addr && n_addr->next; n_addr = n_addr->next) + ; + n_prev = NULL; + n = omp_clauses->lists[OMP_LIST_USE_DEVICE_PTR]; + while (n) + { + n_next = n->next; + if (n->sym->ts.type != BT_DERIVED + || n->sym->ts.u.derived->ts.f90_type != BT_VOID) + { + n->next = NULL; + if (n_addr) + n_addr->next = n; + else + omp_clauses->lists[OMP_LIST_USE_DEVICE_ADDR] = n; + n_addr = n; + if (n_prev) + n_prev->next = n_next; + else + omp_clauses->lists[OMP_LIST_USE_DEVICE_PTR] = n_next; + } + else + n_prev = n; + n = n_next; + } + } if (omp_clauses->safelen_expr) resolve_positive_int_expr (omp_clauses->safelen_expr, "SAFELEN"); if (omp_clauses->simdlen_expr) |