From d2c52db3e0f08095fc2a01d2bfc1712a6ecb8e2d Mon Sep 17 00:00:00 2001 From: Nikhil Talpallikar Date: Wed, 6 Aug 2025 00:29:22 -0700 Subject: [PATCH] Fixed the error path to initialize error path function pointers. Exit with error in case of LOADLIBRARY failureas initialize of function pointers in case of LOADLIBRARY failure will fail --- .../matrixMulDynlinkJIT/cuda_drvapi_dynlink.c | 68 ++++++++++++++++--- .../matrixMulDynlinkJIT/helper_cuda_drvapi.h | 10 +++ 2 files changed, 70 insertions(+), 8 deletions(-) diff --git a/Samples/0_Introduction/matrixMulDynlinkJIT/cuda_drvapi_dynlink.c b/Samples/0_Introduction/matrixMulDynlinkJIT/cuda_drvapi_dynlink.c index 05048e15..b4e8b95e 100644 --- a/Samples/0_Introduction/matrixMulDynlinkJIT/cuda_drvapi_dynlink.c +++ b/Samples/0_Introduction/matrixMulDynlinkJIT/cuda_drvapi_dynlink.c @@ -242,12 +242,23 @@ static CUresult LOAD_LIBRARY(CUDADRIVER *pInstance) if (*pInstance == NULL) { printf("LoadLibrary \"%s\" failed!\n", __CudaLibName); - return CUDA_ERROR_UNKNOWN; + exit(EXIT_FAILURE); } return CUDA_SUCCESS; } +CUresult GET_DRIVER_HANDLE(CUDADRIVER* pInstance) +{ + *pInstance = GetModuleHandle(__CudaLibName); + if (*pInstance) { + return CUDA_SUCCESS; + } + else { + return CUDA_ERROR_UNKNOWN; + } +} + #define GET_PROC_EX(name, alias, required) \ alias = (t##name *)GetProcAddress(CudaDrvLib, #name); \ if (alias == NULL && required) { \ @@ -269,6 +280,13 @@ static CUresult LOAD_LIBRARY(CUDADRIVER *pInstance) return CUDA_ERROR_UNKNOWN; \ } +#define GET_PROC_ERROR_FUNCTIONS(name, alias, required) \ + alias = (t##name *)GetProcAddress(CudaDrvLib, #name); \ + if (alias == NULL && required) { \ + printf("Failed to find error function \"%s\" in %s\n", #name, __CudaLibName); \ + exit(EXIT_FAILURE); \ + } \ + #elif defined(__unix__) || defined(__QNX__) || defined(__APPLE__) || defined(__MACOSX) #include @@ -293,12 +311,23 @@ static CUresult LOAD_LIBRARY(CUDADRIVER *pInstance) if (*pInstance == NULL) { printf("dlopen \"%s\" failed!\n", __CudaLibName); - return CUDA_ERROR_UNKNOWN; + exit(EXIT_FAILURE); } return CUDA_SUCCESS; } +CUresult GET_DRIVER_HANDLE(CUDADRIVER* pInstance) +{ + *pInstance = dlopen(__CudaLibName, RTLD_NOLOAD); + if (*pInstance) { + return CUDA_SUCCESS; + } + else { + return CUDA_ERROR_UNKNOWN; + } +} + #define GET_PROC_EX(name, alias, required) \ alias = (t##name *)dlsym(CudaDrvLib, #name); \ if (alias == NULL && required) { \ @@ -320,33 +349,56 @@ static CUresult LOAD_LIBRARY(CUDADRIVER *pInstance) return CUDA_ERROR_UNKNOWN; \ } +#define GET_PROC_ERROR_FUNCTIONS(name, alias, required) \ + alias = (t##name *)dlsym(CudaDrvLib, #name); \ + if (alias == NULL && required) { \ + printf("Failed to find error function \"%s\" in %s\n", #name, __CudaLibName); \ + exit(EXIT_FAILURE); \ + } + #else #error unsupported platform #endif +#define CHECKED_CALL(call) \ + do { \ + CUresult result = (call); \ + if (CUDA_SUCCESS != result) { \ + return result; \ + } \ + } while (0) + #define GET_PROC_REQUIRED(name) GET_PROC_EX(name, name, 1) #define GET_PROC_OPTIONAL(name) GET_PROC_EX(name, name, 0) #define GET_PROC(name) GET_PROC_REQUIRED(name) #define GET_PROC_V2(name) GET_PROC_EX_V2(name, name, 1) #define GET_PROC_V3(name) GET_PROC_EX_V3(name, name, 1) +CUresult INIT_ERROR_FUNCTIONS(void) +{ + CUDADRIVER CudaDrvLib; + CUresult result = CUDA_SUCCESS; + result = GET_DRIVER_HANDLE(&CudaDrvLib); + GET_PROC_ERROR_FUNCTIONS(cuGetErrorString, cuGetErrorString, 1); + return result; +} + CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion) { CUDADRIVER CudaDrvLib; int driverVer = 1000; - CUresult result = CUDA_SUCCESS; - - result = LOAD_LIBRARY(&CudaDrvLib); + + CHECKED_CALL(LOAD_LIBRARY(&CudaDrvLib)); // cuInit is required; alias it to _cuInit GET_PROC_EX(cuInit, _cuInit, 1); - result = _cuInit(Flags); + CHECKED_CALL(_cuInit(Flags)); // available since 2.2. if not present, version 1.0 is assumed GET_PROC_OPTIONAL(cuDriverGetVersion); if (cuDriverGetVersion) { - result = cuDriverGetVersion(&driverVer); + CHECKED_CALL(cuDriverGetVersion(&driverVer)); } // fetch all function pointers @@ -612,5 +664,5 @@ CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion) GET_PROC(cuGraphicsD3D9RegisterResource); #endif } - return result; + return CUDA_SUCCESS; } diff --git a/Samples/0_Introduction/matrixMulDynlinkJIT/helper_cuda_drvapi.h b/Samples/0_Introduction/matrixMulDynlinkJIT/helper_cuda_drvapi.h index 7c61ff2a..7f0e6d78 100644 --- a/Samples/0_Introduction/matrixMulDynlinkJIT/helper_cuda_drvapi.h +++ b/Samples/0_Introduction/matrixMulDynlinkJIT/helper_cuda_drvapi.h @@ -42,11 +42,21 @@ inline int ftoi(float value) { return (value >= 0 ? static_cast(value + 0.5 #ifndef checkCudaErrors #define checkCudaErrors(err) __checkCudaErrors(err, __FILE__, __LINE__) +extern "C" CUresult INIT_ERROR_FUNCTIONS(void); + // These are the inline versions for all of the SDK helper functions inline void __checkCudaErrors(CUresult err, const char *file, const int line) { if (CUDA_SUCCESS != err) { const char *errorStr = NULL; + + if (!cuGetErrorString) { + CUresult result = INIT_ERROR_FUNCTIONS(); + if (result != CUDA_SUCCESS) { + printf("CUDA driver API failed"); + exit(EXIT_FAILURE); + } + } cuGetErrorString(err, &errorStr); fprintf(stderr, "checkCudaErrors() Driver API error = %04d \"%s\" from file <%s>, "