diff mbox

[openacc] implicit non-scalars data mapping in kernels

Message ID 5696D32D.1080906@codesourcery.com
State New
Headers show

Commit Message

Cesar Philippidis Jan. 13, 2016, 10:43 p.m. UTC 
On 01/13/2016 02:35 PM, Marek Polacek wrote:
> On Wed, Jan 13, 2016 at 02:29:21PM -0800, Cesar Philippidis wrote:
>> --- a/gcc/gimplify.c
>> +++ b/gcc/gimplify.c
>> @@ -5994,6 +5994,11 @@ oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
>>  {
>>    const char *rkind;
>>    bool on_device = false;
>> +  tree type = TREE_TYPE (decl);
>> +
>> +  if (TREE_CODE (type) == REFERENCE_TYPE
>> +      || POINTER_TYPE_P (type))
> 
> I think this should be just POINTER_TYPE_P--this macro checks for
> REFERENCE_TYPE as well.

You're right. Thanks for catching that. Is this patch ok for trunk after
I regtest it?

Cesar
diff mbox

Patch

2016-01-13  Cesar Philippidis  <cesar@codesourcery.com>

	gcc/
	* gimplify.c (oacc_default_clause): Decode reference and pointer
	types for both kernels and parallel regions.

	libgomp/
	* testsuite/libgomp.oacc-fortran/kernels-data.f90: New test.


diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 17144d1..5e444a9 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -5994,6 +5994,10 @@  oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
 {
   const char *rkind;
   bool on_device = false;
+  tree type = TREE_TYPE (decl);
+
+  if (POINTER_TYPE_P (type))
+    type = TREE_TYPE (type);
 
   if ((ctx->region_type & (ORT_ACC_PARALLEL | ORT_ACC_KERNELS)) != 0
       && is_global_var (decl)
@@ -6012,7 +6016,7 @@  oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
       /* Scalars are default 'copy' under kernels, non-scalars are default
 	 'present_or_copy'.  */
       flags |= GOVD_MAP;
-      if (!AGGREGATE_TYPE_P (TREE_TYPE (decl)))
+      if (!AGGREGATE_TYPE_P (type))
 	flags |= GOVD_MAP_FORCE;
 
       rkind = "kernels";
@@ -6020,12 +6024,6 @@  oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags)
 
     case ORT_ACC_PARALLEL:
       {
-	tree type = TREE_TYPE (decl);
-
-	if (TREE_CODE (type) == REFERENCE_TYPE
-	    || POINTER_TYPE_P (type))
-	  type = TREE_TYPE (type);
-
 	if (on_device || AGGREGATE_TYPE_P (type))
 	  /* Aggregates default to 'present_or_copy'.  */
 	  flags |= GOVD_MAP;
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-data.f90 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-data.f90
new file mode 100644
index 0000000..bf812b6
--- /dev/null
+++ b/libgomp/testsuite/libgomp.oacc-fortran/kernels-data.f90
@@ -0,0 +1,30 @@ 
+! Ensure that a non-scalar dummy argument which is implicitly used in a
+! kernels regions is properly mapped using present_or_copy.
+
+! { dg-do run }
+
+program main
+  implicit none
+
+  integer, parameter :: n = 100
+  integer :: array(n), i
+  
+  !$acc data copy(array)
+  call data(array, n)
+  !$acc end data
+
+  do i = 1, n
+     if (array(i) .ne. i) call abort
+  end do
+end program main
+
+subroutine data (array, n)
+  integer, dimension (n) :: array
+  integer :: n, i
+
+  !$acc kernels
+  do i = 1, n
+     array(i) = i
+  end do
+  !$acc end kernels
+end subroutine data