From f6fda276ce9afaa0e8340e01ce9fefbd88ce6717 Mon Sep 17 00:00:00 2001 From: sriharikarnam Date: Thu, 14 Sep 2017 16:03:19 +0530 Subject: [PATCH] Add hipDevice[Get/Set]SharedMemConfig API on nvcc details --- .../include/hip/nvcc_detail/hip_runtime_api.h | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h index 502d205ac4..cd8b2c17a0 100644 --- a/hipamd/include/hip/nvcc_detail/hip_runtime_api.h +++ b/hipamd/include/hip/nvcc_detail/hip_runtime_api.h @@ -105,7 +105,7 @@ typedef cudaIpcMemHandle_t hipIpcMemHandle_t; typedef cudaLimit hipLimit_t; typedef cudaFuncCache hipFuncCache_t; typedef CUcontext hipCtx_t; -typedef CUsharedconfig hipSharedMemConfig; +typedef cudaSharedMemConfig hipSharedMemConfig; typedef CUfunc_cache hipFuncCache; typedef CUjit_option hipJitOption; typedef CUdevice hipDevice_t; @@ -124,6 +124,11 @@ typedef cudaArray hipArray; //typedef cudaChannelFormatDesc hipChannelFormatDesc; #define hipChannelFormatDesc cudaChannelFormatDesc +//adding code for hipmemSharedConfig +#define hipSharedMemBankSizeDefault cudaSharedMemBankSizeDefault +#define hipSharedMemBankSizeFourByte cudaSharedMemBankSizeFourByte +#define hipSharedMemBankSizeEightByte cudaSharedMemBankSizeEightByte + inline static hipError_t hipCUDAErrorTohipError(cudaError_t cuError) { switch(cuError) { case cudaSuccess : return hipSuccess; @@ -833,12 +838,12 @@ inline static hipError_t hipCtxSetCacheConfig (hipFuncCache cacheConfig) inline static hipError_t hipCtxSetSharedMemConfig (hipSharedMemConfig config) { - return hipCUResultTohipError(cuCtxSetSharedMemConfig(config)); + return hipCUResultTohipError(cuCtxSetSharedMemConfig((CUsharedconfig)config)); } inline static hipError_t hipCtxGetSharedMemConfig ( hipSharedMemConfig * pConfig ) { - return hipCUResultTohipError(cuCtxGetSharedMemConfig(pConfig)); + return hipCUResultTohipError(cuCtxGetSharedMemConfig((CUsharedconfig *)pConfig)); } inline static hipError_t hipCtxSynchronize ( void ) @@ -881,6 +886,16 @@ inline static hipError_t hipDeviceGetByPCIBusId(int* device, const char *pciBusI return hipCUDAErrorTohipError(cudaDeviceGetByPCIBusId(device, pciBusId)); } +inline static hipError_t hipDeviceGetSharedMemConfig(hipSharedMemConfig *config) +{ + return hipCUDAErrorTohipError(cudaDeviceGetSharedMemConfig(config)); +} + +inline static hipError_t hipDeviceSetSharedMemConfig(hipSharedMemConfig config) +{ + return hipCUDAErrorTohipError(cudaDeviceSetSharedMemConfig(config)); +} + inline static hipError_t hipDeviceGetLimit(size_t *pValue, hipLimit_t limit) { return hipCUDAErrorTohipError(cudaDeviceGetLimit(pValue, limit));