From ecd4fd4382ff58527c811f63b3c55cb968678f84 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 26 Oct 2015 17:24:54 +0100 Subject: [PATCH] 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 --- libgomp/ChangeLog | 6 ++++++ .../testsuite/libgomp.oacc-c-c++-common/lib-1.c | 14 ++------------ .../libgomp.oacc-c-c++-common/lib-10.c | 9 +-------- .../testsuite/libgomp.oacc-c-c++-common/lib-2.c | 17 +++-------------- .../testsuite/libgomp.oacc-c-c++-common/lib-9.c | 14 ++++++-------- 5 files changed, 18 insertions(+), 42 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index ad970df522f..fa9027b1428 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,11 @@ 2015-10-26 Thomas Schwinge + * 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 26318f1cca4..8ed743d18d3 100644 --- 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 cf1af8c142f..55054c00296 100644 --- 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 c658dd66861..353cd1c4d31 100644 --- 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 a4cf7f2e848..5dce9b82088 100644 --- 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++) -- 2.30.2