diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2017-05-19 15:32:48 +0200 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2017-05-19 15:32:48 +0200 |
| commit | 7fd549d24fda05c859fb17697c51c16886902dad (patch) | |
| tree | a1ddeff9f474c8969d68b1b0b726f4ca763411f3 /gcc/fortran | |
| parent | 0d0afa9fafec1711b52259b9b8caebf51380216d (diff) | |
| download | gcc-7fd549d24fda05c859fb17697c51c16886902dad.zip gcc-7fd549d24fda05c859fb17697c51c16886902dad.tar.gz gcc-7fd549d24fda05c859fb17697c51c16886902dad.tar.bz2 | |
OpenACC 2.5 default (present) clause
gcc/c/
* c-parser.c (c_parser_omp_clause_default): Handle
"OMP_CLAUSE_DEFAULT_PRESENT".
gcc/cp/
* parser.c (cp_parser_omp_clause_default): Handle
"OMP_CLAUSE_DEFAULT_PRESENT".
gcc/fortran/
* gfortran.h (enum gfc_omp_default_sharing): Add
"OMP_DEFAULT_PRESENT".
* dump-parse-tree.c (show_omp_clauses): Handle it.
* openmp.c (gfc_match_omp_clauses): Likewise.
* trans-openmp.c (gfc_trans_omp_clauses): Likewise.
gcc/
* tree-core.h (enum omp_clause_default_kind): Add
"OMP_CLAUSE_DEFAULT_PRESENT".
* tree-pretty-print.c (dump_omp_clause): Handle it.
* gimplify.c (enum gimplify_omp_var_data): Add
"GOVD_MAP_FORCE_PRESENT".
(gimplify_adjust_omp_clauses_1): Map it to
"GOMP_MAP_FORCE_PRESENT".
(oacc_default_clause): Handle "OMP_CLAUSE_DEFAULT_PRESENT".
gcc/testsuite/
* c-c++-common/goacc/default-1.c: Update.
* c-c++-common/goacc/default-2.c: Likewise.
* c-c++-common/goacc/default-4.c: Likewise.
* gfortran.dg/goacc/default-1.f95: Likewise.
* gfortran.dg/goacc/default-4.f: Likewise.
* c-c++-common/goacc/default-5.c: New file.
* gfortran.dg/goacc/default-5.f: Likewise.
libgomp/
* testsuite/libgomp.oacc-c++/template-reduction.C: Update.
* testsuite/libgomp.oacc-c-c++-common/nested-2.c: Update.
* testsuite/libgomp.oacc-fortran/data-4-2.f90: Likewise.
* testsuite/libgomp.oacc-fortran/default-1.f90: Likewise.
* testsuite/libgomp.oacc-fortran/non-scalar-data.f90: Likewise.
From-SVN: r248280
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/dump-parse-tree.c | 1 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 3 | ||||
| -rw-r--r-- | gcc/fortran/openmp.c | 20 | ||||
| -rw-r--r-- | gcc/fortran/trans-openmp.c | 3 |
5 files changed, 27 insertions, 8 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9a8b3e1..4b7f1f4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2017-05-19 Thomas Schwinge <thomas@codesourcery.com> + + * gfortran.h (enum gfc_omp_default_sharing): Add + "OMP_DEFAULT_PRESENT". + * dump-parse-tree.c (show_omp_clauses): Handle it. + * openmp.c (gfc_match_omp_clauses): Likewise. + * trans-openmp.c (gfc_trans_omp_clauses): Likewise. + 2017-05-18 Fritz Reese <fritzoreese@gmail.com> PR fortran/79968 diff --git a/gcc/fortran/dump-parse-tree.c b/gcc/fortran/dump-parse-tree.c index 87a5304..49b23d8 100644 --- a/gcc/fortran/dump-parse-tree.c +++ b/gcc/fortran/dump-parse-tree.c @@ -1283,6 +1283,7 @@ show_omp_clauses (gfc_omp_clauses *omp_clauses) case OMP_DEFAULT_PRIVATE: type = "PRIVATE"; break; case OMP_DEFAULT_SHARED: type = "SHARED"; break; case OMP_DEFAULT_FIRSTPRIVATE: type = "FIRSTPRIVATE"; break; + case OMP_DEFAULT_PRESENT: type = "PRESENT"; break; default: gcc_unreachable (); } diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 2936550..26b89be 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1241,7 +1241,8 @@ enum gfc_omp_default_sharing OMP_DEFAULT_NONE, OMP_DEFAULT_PRIVATE, OMP_DEFAULT_SHARED, - OMP_DEFAULT_FIRSTPRIVATE + OMP_DEFAULT_FIRSTPRIVATE, + OMP_DEFAULT_PRESENT }; enum gfc_omp_proc_bind_kind diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 89eecfa..80146e2 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -1080,13 +1080,19 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask, if (gfc_match ("default ( none )") == MATCH_YES) c->default_sharing = OMP_DEFAULT_NONE; else if (openacc) - /* c->default_sharing = OMP_DEFAULT_UNKNOWN */; - else if (gfc_match ("default ( shared )") == MATCH_YES) - c->default_sharing = OMP_DEFAULT_SHARED; - else if (gfc_match ("default ( private )") == MATCH_YES) - c->default_sharing = OMP_DEFAULT_PRIVATE; - else if (gfc_match ("default ( firstprivate )") == MATCH_YES) - c->default_sharing = OMP_DEFAULT_FIRSTPRIVATE; + { + if (gfc_match ("default ( present )") == MATCH_YES) + c->default_sharing = OMP_DEFAULT_PRESENT; + } + else + { + if (gfc_match ("default ( firstprivate )") == MATCH_YES) + c->default_sharing = OMP_DEFAULT_FIRSTPRIVATE; + else if (gfc_match ("default ( private )") == MATCH_YES) + c->default_sharing = OMP_DEFAULT_PRIVATE; + else if (gfc_match ("default ( shared )") == MATCH_YES) + c->default_sharing = OMP_DEFAULT_SHARED; + } if (c->default_sharing != OMP_DEFAULT_UNKNOWN) continue; } diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 662036f..1d254c6 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -2564,6 +2564,9 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, case OMP_DEFAULT_FIRSTPRIVATE: OMP_CLAUSE_DEFAULT_KIND (c) = OMP_CLAUSE_DEFAULT_FIRSTPRIVATE; break; + case OMP_DEFAULT_PRESENT: + OMP_CLAUSE_DEFAULT_KIND (c) = OMP_CLAUSE_DEFAULT_PRESENT; + break; default: gcc_unreachable (); } |