diff options
| -rw-r--r-- | libgomp/ChangeLog | 9 | ||||
| -rw-r--r-- | libgomp/plugin/plugin-nvptx.c | 23 |
2 files changed, 29 insertions, 3 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index d96ab1f35f8..e3b92a707df 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,14 @@ 2018-08-07 Tom de Vries <tdevries@suse.de> + * plugin/plugin-nvptx.c (DO_PRAGMA): Define. + (struct cuda_lib_s): Add def/undef of CUDA_ONE_CALL_MAYBE_NULL. + (init_cuda_lib): Add new param to CUDA_ONE_CALL_1. Add arg to + corresponding call in CUDA_ONE_CALL. Add def/undef of + CUDA_ONE_CALL_MAYBE_NULL. + (CUDA_CALL_EXISTS): Define. + +2018-08-07 Tom de Vries <tdevries@suse.de> + * plugin/plugin-nvptx.c (struct cuda_lib_s, init_cuda_lib): Put CUDA_ONE_CALL defines right before the cuda-lib.def include, and the corresponding undefs right after. diff --git a/libgomp/plugin/plugin-nvptx.c b/libgomp/plugin/plugin-nvptx.c index 2e72a6379eb..825470adce3 100644 --- a/libgomp/plugin/plugin-nvptx.c +++ b/libgomp/plugin/plugin-nvptx.c @@ -49,6 +49,8 @@ #include <assert.h> #include <errno.h> +#define DO_PRAGMA(x) _Pragma (#x) + #if PLUGIN_NVPTX_DYNAMIC # include <dlfcn.h> @@ -56,8 +58,11 @@ struct cuda_lib_s { # define CUDA_ONE_CALL(call) \ __typeof (call) *call; +# define CUDA_ONE_CALL_MAYBE_NULL(call) \ + CUDA_ONE_CALL (call) #include "cuda-lib.def" # undef CUDA_ONE_CALL +# undef CUDA_ONE_CALL_MAYBE_NULL } cuda_lib; @@ -78,20 +83,29 @@ init_cuda_lib (void) if (h == NULL) return false; -# define CUDA_ONE_CALL(call) CUDA_ONE_CALL_1 (call) -# define CUDA_ONE_CALL_1(call) \ +# define CUDA_ONE_CALL(call) CUDA_ONE_CALL_1 (call, false) +# define CUDA_ONE_CALL_MAYBE_NULL(call) CUDA_ONE_CALL_1 (call, true) +# define CUDA_ONE_CALL_1(call, allow_null) \ cuda_lib.call = dlsym (h, #call); \ - if (cuda_lib.call == NULL) \ + if (!allow_null && cuda_lib.call == NULL) \ return false; #include "cuda-lib.def" # undef CUDA_ONE_CALL # undef CUDA_ONE_CALL_1 +# undef CUDA_ONE_CALL_MAYBE_NULL cuda_lib_inited = true; return true; } # define CUDA_CALL_PREFIX cuda_lib. #else + +# define CUDA_ONE_CALL(call) +# define CUDA_ONE_CALL_MAYBE_NULL(call) DO_PRAGMA (weak call) +#include "cuda-lib.def" +#undef CUDA_ONE_CALL_MAYBE_NULL +#undef CUDA_ONE_CALL + # define CUDA_CALL_PREFIX # define init_cuda_lib() true #endif @@ -136,6 +150,9 @@ init_cuda_lib (void) #define CUDA_CALL_NOCHECK(FN, ...) \ CUDA_CALL_PREFIX FN (__VA_ARGS__) +#define CUDA_CALL_EXISTS(FN) \ + CUDA_CALL_PREFIX FN + static const char * cuda_error (CUresult r) { |