From 78672bd8fdff27789807b81d787202d3b8c3887a Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Wed, 24 May 2017 08:59:05 +0200
Subject: [PATCH] libgomp nvptx plugin: Debugging output when disabling nvptx
 offloading

	libgomp/
	* plugin/plugin-nvptx.c (nvptx_get_num_devices): Debugging output
	when disabling nvptx offloading.

From-SVN: r248400
---
 libgomp/ChangeLog             |  5 +++++
 libgomp/plugin/plugin-nvptx.c | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 32f8bf10b2b7..14e95ef9ba92 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-24  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* plugin/plugin-nvptx.c (nvptx_get_num_devices): Debugging output
+	when disabling nvptx offloading.
+
 2017-05-23  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c: Update.
diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c
index 3ef48dd5d82e..0e1b3e2d4f3f 100644
--- a/libgomp/plugin/plugin-nvptx.c
+++ b/libgomp/plugin/plugin-nvptx.c
@@ -838,7 +838,11 @@ nvptx_get_num_devices (void)
   /* PR libgomp/65099: Currently, we only support offloading in 64-bit
      configurations.  */
   if (sizeof (void *) != 8)
-    return 0;
+    {
+      GOMP_PLUGIN_debug (0, "Disabling nvptx offloading;"
+			 " only 64-bit configurations are supported\n");
+      return 0;
+    }
 
   /* This function will be called before the plugin has been initialized in
      order to enumerate available devices, but CUDA API routines can't be used
@@ -852,7 +856,11 @@ nvptx_get_num_devices (void)
       /* This is not an error: e.g. we may have CUDA libraries installed but
          no devices available.  */
       if (r != CUDA_SUCCESS)
-        return 0;
+	{
+	  GOMP_PLUGIN_debug (0, "Disabling nvptx offloading; cuInit: %s\n",
+			     cuda_error (r));
+	  return 0;
+	}
     }
 
   CUDA_CALL_ERET (-1, cuDeviceGetCount, &n);
-- 
GitLab