From 33cb388101abe1677b445f7ad71d9bcff52af482 Mon Sep 17 00:00:00 2001 From: Ioannis Assiouras Date: Mon, 28 Nov 2022 13:34:08 +0000 Subject: [PATCH] SWDEV-369557 - Added enum mapping for external[Semaphore/Memory]HandleType Change-Id: If1b95b084f7fa312e6cdad4ccf433127671a35ce --- .../nvidia_detail/nvidia_hip_runtime_api.h | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h index e30d27505b..cd43a6265a 100644 --- a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h +++ b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h @@ -1126,10 +1126,37 @@ inline static enum cudaChannelFormatKind hipChannelFormatKindToCudaChannelFormat } typedef enum cudaExternalMemoryHandleType hipExternalMemoryHandleType; +#define hipExternalMemoryHandleTypeOpaqueFd cudaExternalMemoryHandleTypeOpaqueFd +#define hipExternalMemoryHandleTypeOpaqueWin32 cudaExternalMemoryHandleTypeOpaqueWin32 +#define hipExternalMemoryHandleTypeOpaqueWin32Kmt cudaExternalMemoryHandleTypeOpaqueWin32Kmt +#define hipExternalMemoryHandleTypeD3D12Heap cudaExternalMemoryHandleTypeD3D12Heap +#define hipExternalMemoryHandleTypeD3D12Resource cudaExternalMemoryHandleTypeD3D12Resource +#if CUDA_VERSION >= CUDA_10020 +#define hipExternalMemoryHandleTypeD3D11Resource cudaExternalMemoryHandleTypeD3D11Resource +#define hipExternalMemoryHandleTypeD3D11ResourceKmt cudaExternalMemoryHandleTypeD3D11ResourceKmt +#define hipExternalMemoryHandleTypeNvSciBuf cudaExternalMemoryHandleTypeNvSciBuf +#endif + typedef struct cudaExternalMemoryHandleDesc hipExternalMemoryHandleDesc; typedef struct cudaExternalMemoryBufferDesc hipExternalMemoryBufferDesc; typedef cudaExternalMemory_t hipExternalMemory_t; + typedef enum cudaExternalSemaphoreHandleType hipExternalSemaphoreHandleType; +#define hipExternalSemaphoreHandleTypeOpaqueFd cudaExternalSemaphoreHandleTypeOpaqueFd +#define hipExternalSemaphoreHandleTypeOpaqueWin32 cudaExternalSemaphoreHandleTypeOpaqueWin32 +#define hipExternalSemaphoreHandleTypeOpaqueWin32Kmt cudaExternalSemaphoreHandleTypeOpaqueWin32Kmt +#define hipExternalSemaphoreHandleTypeD3D12Fence cudaExternalSemaphoreHandleTypeD3D12Fence +#if CUDA_VERSION >= CUDA_10020 +#define hipExternalSemaphoreHandleTypeD3D11Fence cudaExternalSemaphoreHandleTypeD3D11Fence +#define hipExternalSemaphoreHandleTypeNvSciSync cudaExternalSemaphoreHandleTypeNvSciSync +#define hipExternalSemaphoreHandleTypeKeyedMutex cudaExternalSemaphoreHandleTypeKeyedMutex +#define hipExternalSemaphoreHandleTypeKeyedMutexKmt cudaExternalSemaphoreHandleTypeKeyedMutexKmt +#endif +#if CUDA_VERSION >= CUDA_11020 +#define hipExternalSemaphoreHandleTypeTimelineSemaphoreFd cudaExternalSemaphoreHandleTypeTimelineSemaphoreFd +#define hipExternalSemaphoreHandleTypeTimelineSemaphoreWin32 cudaExternalSemaphoreHandleTypeTimelineSemaphoreWin32 +#endif + typedef struct cudaExternalSemaphoreHandleDesc hipExternalSemaphoreHandleDesc; typedef cudaExternalSemaphore_t hipExternalSemaphore_t; typedef struct cudaExternalSemaphoreSignalParams hipExternalSemaphoreSignalParams;