https://gcc.gnu.org/g:37078f241a22c45db6380c5e9a79b4d08054bb3d

commit r14-9396-g37078f241a22c45db6380c5e9a79b4d08054bb3d
Author: Thomas Schwinge <tschwi...@baylibre.com>
Date:   Thu Mar 7 13:18:23 2024 +0100

    nvptx: 'cuDeviceGetCount' failure is fatal
    
    Per commit 683f11843974f0bdf42f79cdcbb0c2b43c7b81b0
    "OpenMP: Move omp requires checks to libgomp", we're now using 'return -1'
    from 'GOMP_OFFLOAD_get_num_devices' for 'omp_requires_mask' purposes.  This
    missed that via 'nvptx_get_num_devices', we could also 'return -1' for
    'cuDeviceGetCount' failure.  Before, this meant (in 'gomp_target_init') to
    silently ignore the plugin/device -- which also has been doubtful behavior.
    Let's instead turn 'cuDeviceGetCount' failure into a fatal error, similar to
    other errors during device initialization.
    
            libgomp/
            * plugin/plugin-nvptx.c (nvptx_get_num_devices):
            'cuDeviceGetCount' failure is fatal.

Diff:
---
 libgomp/plugin/plugin-nvptx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c
index 2bc7b850671..ced6e014ece 100644
--- a/libgomp/plugin/plugin-nvptx.c
+++ b/libgomp/plugin/plugin-nvptx.c
@@ -612,7 +612,7 @@ nvptx_get_num_devices (void)
        }
     }
 
-  CUDA_CALL_ERET (-1, cuDeviceGetCount, &n);
+  CUDA_CALL_ASSERT (cuDeviceGetCount, &n);
   return n;
 }

Reply via email to