From b04a576c12a784f00dae4c7c9f5b831404c37b4c Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 30 May 2018 11:24:48 +0530 Subject: [PATCH 1/2] Add signature for hipFuncGetAttributes to nvcc_details Change-Id: I06d5b50028fcfe3ea9d81f749b02be6b094c0977 [ROCm/clr commit: a923cac5d5de1d79f8fc01c11428079f1859897a] --- .../clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h index d54a8de99c..fbff263295 100644 --- a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h +++ b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h @@ -150,6 +150,7 @@ typedef CUfunction hipFunction_t; typedef CUdeviceptr hipDeviceptr_t; typedef struct cudaArray hipArray; typedef struct cudaArray* hipArray_const_t; +typedef cudaFuncAttributes hipFuncAttributes; #define hipMemcpy3DParms cudaMemcpy3DParms #define hipArrayDefault cudaArrayDefault @@ -1107,6 +1108,10 @@ inline static hipError_t hipModuleGetFunction(hipFunction_t* function, hipModule return hipCUResultTohipError(cuModuleGetFunction(function, module, kname)); } +inline static hipError_t hipFuncGetAttributes(hipFuncAttributes* attr, const void* func) { + return hipCUDAErrorTohipError(cudaFuncGetAttributes(attr, func)); +} + inline static hipError_t hipModuleGetGlobal(hipDeviceptr_t* dptr, size_t* bytes, hipModule_t hmod, const char* name) { return hipCUResultTohipError(cuModuleGetGlobal(dptr, bytes, hmod, name)); From cd912ecf7f9b41fb8d4f253197428838157c5f17 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 30 May 2018 11:26:11 +0530 Subject: [PATCH 2/2] [dtests] Fix nvcc path build errors in hipFuncGetAttributes.tst Change-Id: I000bed69162897f7b6edd733ed6e9acc93beb0ed [ROCm/clr commit: e2842f2f2892a6e0a59901b68ccd28437dcff503] --- .../hipamd/tests/src/runtimeApi/module/hipFuncGetAttributes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/hipamd/tests/src/runtimeApi/module/hipFuncGetAttributes.cpp b/projects/clr/hipamd/tests/src/runtimeApi/module/hipFuncGetAttributes.cpp index 7d3eff5f73..6af87edb25 100644 --- a/projects/clr/hipamd/tests/src/runtimeApi/module/hipFuncGetAttributes.cpp +++ b/projects/clr/hipamd/tests/src/runtimeApi/module/hipFuncGetAttributes.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 * RUN: %t * HIT_END */