libgomp testsuite: Remove some explicit acc_device_nvidia usage.

	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/lib-1.c: Remove explicit
	acc_device_nvidia usage.
	* testsuite/libgomp.oacc-c-c++-common/lib-10.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/lib-2.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/lib-9.c: Likewise.

From-SVN: r229381

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index ad970df522f86c31cb2f5c24acbe546fb53249d8..fa9027b14288ccc7fd6158db5614921f5196c453 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-26  Thomas Schwinge  <thomas@codesourcery.com>
 
+       * testsuite/libgomp.oacc-c-c++-common/lib-1.c: Remove explicit
+       acc_device_nvidia usage.
+       * testsuite/libgomp.oacc-c-c++-common/lib-10.c: Likewise.
+       * testsuite/libgomp.oacc-c-c++-common/lib-2.c: Likewise.
+       * testsuite/libgomp.oacc-c-c++-common/lib-9.c: Likewise.
+
        * oacc-init.c (acc_shutdown): Call gomp_init_targets_once.
        * testsuite/libgomp.oacc-c-c++-common/lib-8.c: New file.
 

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
index 26318f1cca41bb345024ca727856102164e22bd2..8ed743d18d3d3d795b36a40865663902dcd758dc 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-1.c
@@ -6,19 +6,9 @@
 int
 main (int argc, char **argv)
 {
-  acc_device_t devtype = acc_device_host;
-
-#if ACC_DEVICE_TYPE_nvidia
-  devtype = acc_device_nvidia;
-
-  if (acc_get_num_devices (devtype) == 0)
-    return 0;
-#endif
-
-  acc_init (devtype);
-
+  acc_init (acc_device_default);
   fprintf (stderr, "CheCKpOInT\n");
-  acc_init (devtype);
+  acc_init (acc_device_default);
 
   return 0;
 }

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-10.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-10.c
index cf1af8c142fb53cd44a9d19617eaae04c1ff2f18..55054c00296f1c682b4f1c192618706e7884ccba 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-10.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-10.c
@@ -7,14 +7,7 @@ int
 main (int argc, char **argv)
 {
   void *d;
-  acc_device_t devtype = acc_device_host;
-
-#if ACC_DEVICE_TYPE_nvidia
-  devtype = acc_device_nvidia;
-
-  if (acc_get_num_devices (acc_device_nvidia) == 0)
-    return 0;
-#endif
+  acc_device_t devtype = acc_device_default;
 
   acc_init (devtype);
 

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
index c658dd668612bd6bd5ad0e073e984918b9445f15..353cd1c4d3198f4b02155c7501e88fec4e43e69f 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-2.c
@@ -6,21 +6,10 @@
 int
 main (int argc, char **argv)
 {
-  acc_device_t devtype = acc_device_host;
-
-#if ACC_DEVICE_TYPE_nvidia
-  devtype = acc_device_nvidia;
-
-  if (acc_get_num_devices (acc_device_nvidia) == 0)
-    return 0;
-#endif
-
-  acc_init (devtype);
-
-  acc_shutdown (devtype);
-
+  acc_init (acc_device_default);
+  acc_shutdown (acc_device_default);
   fprintf (stderr, "CheCKpOInT\n");
-  acc_shutdown (devtype);
+  acc_shutdown (acc_device_default);
 
   return 0;
 }

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-9.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-9.c
index a4cf7f2e848fc4cd401635d9bbdacbac362473e4..5dce9b820880f12386b98535a2a9ae074623f781 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-9.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/lib-9.c
@@ -9,18 +9,17 @@ main (int argc, char **argv)
   int i;
   int num_devices;
   int devnum;
-  acc_device_t devtype = acc_device_host;
-
-#if ACC_DEVICE_TYPE_nvidia
-  devtype = acc_device_nvidia;
-#endif
+  acc_device_t devtype = acc_device_default;
 
   num_devices = acc_get_num_devices (devtype);
   if (num_devices == 0)
-    return 0;
+    abort ();
 
   acc_init (devtype);
 
+  if (num_devices != acc_get_num_devices (devtype))
+    abort ();
+
   for (i = 0; i < num_devices; i++)
     {
       acc_set_device_num (i, devtype);
@@ -31,8 +30,7 @@ main (int argc, char **argv)
 
   acc_shutdown (devtype);
 
-  num_devices = acc_get_num_devices (devtype);
-  if (num_devices == 0)
+  if (num_devices != acc_get_num_devices (devtype))
     abort ();
 
   for (i = 0; i < num_devices; i++)