From: Julian Brown <julian@codesourcery.com>
Date: Sat, 4 Jan 2020 01:39:56 +0000 (-0800)
Subject: Check array contiguity for OpenACC/Fortran
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5ed4958a2c1b563e933b25ca3b481761cc40b07;p=gcc.git

Check array contiguity for OpenACC/Fortran

	PR fortran/93025

	gcc/fortran/
	* openmp.c (resolve_omp_clauses): Check array references for contiguity.

	gcc/testsuite/
	* gfortran.dg/goacc/mapping-tests-2.f90: New test.
	* gfortran.dg/goacc/subarrays.f95: Expect rejection of non-contiguous
	array.
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c51dab2636f..c7e2b319337 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-28  Julian Brown  <julian@codesourcery.com>
+
+	PR fortran/93025
+	* openmp.c (resolve_omp_clauses): Check array references for contiguity.
+
 2020-01-28  Julian Brown  <julian@codesourcery.com>
 
 	* gfortran.h (gfc_symbol): Add comp_mark bitfield.
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 444fdcc4751..0accb185e87 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -4536,13 +4536,28 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
 		    /* Look through component refs to find last array
 		       reference.  */
 		    if (openacc && resolved)
-		      while (array_ref
-			     && (array_ref->type == REF_COMPONENT
-				 || (array_ref->type == REF_ARRAY
-				     && array_ref->next
-				     && (array_ref->next->type
-					 == REF_COMPONENT))))
-			array_ref = array_ref->next;
+		      {
+			/* The "!$acc cache" directive allows rectangular
+			   subarrays to be specified, with some restrictions
+			   on the form of bounds (not implemented).
+			   Only raise an error here if we're really sure the
+			   array isn't contiguous.  An expression such as
+			   arr(-n:n,-n:n) could be contiguous even if it looks
+			   like it may not be.  */
+			if (list != OMP_LIST_CACHE
+			    && !gfc_is_simply_contiguous (n->expr, false, true)
+			    && gfc_is_not_contiguous (n->expr))
+			  gfc_error ("Array is not contiguous at %L",
+				     &n->where);
+
+			while (array_ref
+			       && (array_ref->type == REF_COMPONENT
+				   || (array_ref->type == REF_ARRAY
+				       && array_ref->next
+				       && (array_ref->next->type
+					   == REF_COMPONENT))))
+			  array_ref = array_ref->next;
+		      }
 		  }
 		if (array_ref
 		    || (n->expr
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a3623672cff..9e1af091bcc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-01-28  Tobias Burnus  <tobias@codesourcery.com>
+	    Julian Brown  <julian@codesourcery.com>
+
+	* gfortran.dg/goacc/mapping-tests-2.f90: New test.
+	* gfortran.dg/goacc/subarrays.f95: Expect rejection of non-contiguous
+	array.
+
 2020-01-28  Julian Brown  <julian@codesourcery.com>
 
 	* gfortran.dg/goacc/deep-copy-2.f90: Move test here (from libgomp
diff --git a/gcc/testsuite/gfortran.dg/goacc/mapping-tests-2.f90 b/gcc/testsuite/gfortran.dg/goacc/mapping-tests-2.f90
new file mode 100644
index 00000000000..1372f6af53e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/mapping-tests-2.f90
@@ -0,0 +1,32 @@
+subroutine foo
+  type t
+    integer :: i, j
+  end type t
+
+  type t2
+    type(t) :: cc(3)
+  end type t2
+
+  type(t) x, y(3)
+  type(t2) :: z(3)
+
+  ! OK - map whole aggregated variable
+!$acc enter data copyin(x)
+  ! map(to:x [len: 8])
+
+  ! OK - map two components of the aggregated variable
+!$acc enter data copyin(x%j, x%i)
+
+  ! Bad - we cannot mix full-object and component accesses
+!$acc enter data copyin(x, x%i)
+! { dg-error "Symbol .x. has mixed component and non-component accesses" "" { target "*-*-*" } 21 }
+
+  ! Bad - we cannot do a strided access of 'x'
+  ! No C/C++ equivalent
+!$acc enter data copyin(y(:)%i)
+! { dg-error "Array is not contiguous" "" { target "*-*-*" } 26 }
+
+  ! Bad - again, a strided access
+!$acc enter data copyin(z(1)%cc(:)%i)
+! { dg-error "Array is not contiguous" "" { target "*-*-*" } 30 }
+end
diff --git a/gcc/testsuite/gfortran.dg/goacc/subarrays.f95 b/gcc/testsuite/gfortran.dg/goacc/subarrays.f95
index f6adde459f4..fa0378550e9 100644
--- a/gcc/testsuite/gfortran.dg/goacc/subarrays.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/subarrays.f95
@@ -27,7 +27,7 @@ program test
   ! { dg-error "'a' in MAP clause" "" { target *-*-* } .-2 }
   !$acc end parallel
 
-  !$acc parallel copy (b(1:3,2:4))
+  !$acc parallel copy (b(1:3,2:4)) ! { dg-error "Array is not contiguous" }
   !$acc end parallel
   !$acc parallel copy (b(2:3))
   ! { dg-error "Rank mismatch" "" { target *-*-* } .-1 }