aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2019-06-19 00:15:43 +0200
committerThomas Schwinge <tschwinge@gcc.gnu.org>2019-06-19 00:15:43 +0200
commitca8ecd919453664b1312e6c7d236e404731d8bb0 (patch)
tree1e4e88568ff968cd0e7942ff3f2d651473a1250c
parent02fd3a0ecc6931fcb0afc1b74ebc38d178c2d84f (diff)
downloadgcc-ca8ecd919453664b1312e6c7d236e404731d8bb0.zip
gcc-ca8ecd919453664b1312e6c7d236e404731d8bb0.tar.gz
gcc-ca8ecd919453664b1312e6c7d236e404731d8bb0.tar.bz2
[PR85221] Set 'omp declare target', 'omp declare target link' attributes for Fortran OpenACC 'declare'd variables
gcc/fortran/ PR fortran/85221 * trans-decl.c (add_attributes_to_decl): Handle OpenACC 'declare' directive. gcc/testsuite/ PR fortran/85221 * gfortran.dg/goacc/declare-3.f95: New file. From-SVN: r272453
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-decl.c9
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/gfortran.dg/goacc/declare-3.f9547
4 files changed, 63 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d30fa2e5..6fd97b6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-18 Thomas Schwinge <thomas@codesourcery.com>
+
+ PR fortran/85221
+ * trans-decl.c (add_attributes_to_decl): Handle OpenACC 'declare'
+ directive.
+
2019-06-16 Thomas Koenig <tkoenig@gcc.gnu.org>
* dump_parse_tree (debug): Add verison for formal arglist.
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index b8e0727..f504c27 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -1432,10 +1432,15 @@ add_attributes_to_decl (symbol_attribute sym_attr, tree list)
list = oacc_replace_fn_attrib_attr (list, dims);
}
- if (sym_attr.omp_declare_target_link)
+ if (sym_attr.omp_declare_target_link
+ || sym_attr.oacc_declare_link)
list = tree_cons (get_identifier ("omp declare target link"),
NULL_TREE, list);
- else if (sym_attr.omp_declare_target)
+ else if (sym_attr.omp_declare_target
+ || sym_attr.oacc_declare_create
+ || sym_attr.oacc_declare_copyin
+ || sym_attr.oacc_declare_deviceptr
+ || sym_attr.oacc_declare_device_resident)
list = tree_cons (get_identifier ("omp declare target"),
clauses, list);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 59d39e8..552ccc6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2019-06-18 Thomas Schwinge <thomas@codesourcery.com>
+ PR fortran/85221
+ * gfortran.dg/goacc/declare-3.f95: New file.
+
PR middle-end/90859
* c-c++-common/goacc/firstprivate-mappings-1.c: Update.
diff --git a/gcc/testsuite/gfortran.dg/goacc/declare-3.f95 b/gcc/testsuite/gfortran.dg/goacc/declare-3.f95
new file mode 100644
index 0000000..ec5d4c5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/declare-3.f95
@@ -0,0 +1,47 @@
+! Test valid usage of the OpenACC 'declare' directive.
+
+module mod_a
+ implicit none
+ integer :: a
+ !$acc declare create (a)
+end module
+
+module mod_b
+ implicit none
+ integer :: b
+ !$acc declare copyin (b)
+end module
+
+module mod_c
+ implicit none
+ integer :: c
+ !$acc declare deviceptr (c)
+end module
+
+module mod_d
+ implicit none
+ integer :: d
+ !$acc declare device_resident (d)
+end module
+
+module mod_e
+ implicit none
+ integer :: e
+ !$acc declare link (e)
+end module
+
+subroutine sub1
+ use mod_a
+ use mod_b
+ use mod_c
+ use mod_d
+ use mod_e
+end subroutine sub1
+
+program test
+ use mod_a
+ use mod_b
+ use mod_c
+ use mod_d
+ use mod_e
+end program test