Commit 7baff00e authored by Jon Chesterfield's avatar Jon Chesterfield
Browse files

[libomptarget][cuda] Gracefully handle missing cuda library 

[libomptarget][cuda] Gracefully handle missing cuda library

If using dynamic cuda, and it failed to load, it is not safe to call
cuGetErrorString.

Reviewed By: jdoerfert

Differential Revision: https://reviews.llvm.org/D95412
parent fdeffd6f

openmp/libomptarget/plugins/cuda/dynamic_cuda/cuda.cpp

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ CUresult cuInit(unsigned X) { 
  // Note: Called exactly once from cuda rtl.cpp in a global constructor so

  // does not need to handle being called repeatedly or concurrently

  if (!checkForCUDA()) {

    return CUDA_ERROR_INVALID_VALUE;

    return CUDA_ERROR_INVALID_HANDLE;

  }

  return dlwrap_cuInit(X);

}

openmp/libomptarget/plugins/cuda/dynamic_cuda/cuda.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ typedef struct CUstream_st *CUstream; 
typedef enum cudaError_enum {

  CUDA_SUCCESS = 0,

  CUDA_ERROR_INVALID_VALUE = 1,

  CUDA_ERROR_INVALID_HANDLE = 400,

} CUresult;



typedef enum CUstream_flags_enum {

openmp/libomptarget/plugins/cuda/src/rtl.cpp

+5 −0
Original line number Diff line number Diff line
@@ -401,6 +401,11 @@ public: 
    DP("Start initializing CUDA\n");



    CUresult Err = cuInit(0);

    if (Err == CUDA_ERROR_INVALID_HANDLE) {

      // Can't call cuGetErrorString if dlsym failed

      DP("Failed to load CUDA shared library\n");

      return;

    }

    if (!checkResult(Err, "Error returned from cuInit\n")) {

      return;

    }