diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-26 12:59:00 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-26 12:59:00 +0200 |
| commit | 62e475bad0d668c432bb97113cbf73fa281b8b55 (patch) | |
| tree | 1c8993afe363ddbf4ae80795e47042df1e33d181 /include | |
| parent | 5776a5ffab3b92d6ccac87ccf32c580ee2742d5a (diff) | |
| parent | d80b7744c6ae6f6d8ca1f56982a50d1888b8279f (diff) | |
| download | gcc-62e475bad0d668c432bb97113cbf73fa281b8b55.zip gcc-62e475bad0d668c432bb97113cbf73fa281b8b55.tar.gz gcc-62e475bad0d668c432bb97113cbf73fa281b8b55.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 7 | ||||
| -rw-r--r-- | include/cuda/cuda.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 36da72b..b69f2b8 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2022-10-24 Tobias Burnus <tobias@codesourcery.com> + + * cuda/cuda.h (enum CUdevice_attribute): Add + CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING. + (CU_MEMHOSTALLOC_DEVICEMAP): Define. + (cuMemHostAlloc): Add prototype. + 2022-10-20 Tobias Burnus <tobias@codesourcery.com> * gomp-constants.h (GOMP_DEVICE_HSA): Comment out unused define. diff --git a/include/cuda/cuda.h b/include/cuda/cuda.h index 3938d05..e081f04 100644 --- a/include/cuda/cuda.h +++ b/include/cuda/cuda.h @@ -77,6 +77,7 @@ typedef enum { CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31, CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_MULTIPROCESSOR = 39, CU_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT = 40, + CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING = 41, CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_MULTIPROCESSOR = 82 } CUdevice_attribute; @@ -113,6 +114,7 @@ enum { #define CU_LAUNCH_PARAM_END ((void *) 0) #define CU_LAUNCH_PARAM_BUFFER_POINTER ((void *) 1) #define CU_LAUNCH_PARAM_BUFFER_SIZE ((void *) 2) +#define CU_MEMHOSTALLOC_DEVICEMAP 0x02U enum { CU_STREAM_DEFAULT = 0, @@ -169,6 +171,7 @@ CUresult cuMemGetInfo (size_t *, size_t *); CUresult cuMemAlloc (CUdeviceptr *, size_t); #define cuMemAllocHost cuMemAllocHost_v2 CUresult cuMemAllocHost (void **, size_t); +CUresult cuMemHostAlloc (void **, size_t, unsigned int); CUresult cuMemcpy (CUdeviceptr, CUdeviceptr, size_t); #define cuMemcpyDtoDAsync cuMemcpyDtoDAsync_v2 CUresult cuMemcpyDtoDAsync (CUdeviceptr, CUdeviceptr, size_t, CUstream); |