From: Julian Brown <julian@codesourcery.com>
Date: Wed, 16 Oct 2019 15:28:32 +0000 (-0700)
Subject: [og9] Fix libgomp serial-dims.c test for AMD GCN
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de5b5fcdd6934bc58a28cd34a12930cf87bd7551;p=thirdparty%2Fgcc.git

[og9] Fix libgomp serial-dims.c test for AMD GCN

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Support AMD GCN.

(cherry picked from openacc-gcc-9-branch commit
195a5318951ab947de00a4372d216ba9536493d3)
---

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 2ed786942797..bf880ac0c5e6 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,7 @@
+2019-10-16  Julian Brown  <julian@codesourcery.com>
+
+	* testsuite/libgomp.oacc-c-c++-common/serial-dims.c: Support AMD GCN.
+
 2019-10-09  Tobias Burnus  <tobias@codesourcery.com>
 
 	* testsuite/libgomp.fortran/use_device_ptr1.f90: New.
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
index 3895405b2cfd..e373ebd37b78 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/serial-dims.c
@@ -69,6 +69,13 @@ int main ()
 	  /* The GCC nvptx back end enforces vector_length (32).  */
 	  vectors_actual = 32;
 	}
+      else if (acc_on_device (acc_device_gcn))
+	{
+	  /* AMD GCN relies on the autovectorizer for the vector dimension:
+	     the loop below isn't likely to be vectorized, so vectors_actual
+	     is effectively 1.  */
+	  vectors_actual = 1;
+	}
       else if (!acc_on_device (acc_device_host))
 	__builtin_abort ();
 #pragma acc loop gang \