From de768c22ae690641819a9cd80fb592fdbfc32104 Mon Sep 17 00:00:00 2001 From: Michael LIAO Date: Mon, 6 May 2019 21:20:28 -0400 Subject: [PATCH] [hip] Add API `hipExtModuleLaunchKernel` in HIP runtime --- hipamd/include/hip/hcc_detail/hip_runtime.h | 11 ++++++++++- hipamd/include/hip/hip_hcc.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hipamd/include/hip/hcc_detail/hip_runtime.h b/hipamd/include/hip/hcc_detail/hip_runtime.h index e6f03ab797..68406f0e29 100644 --- a/hipamd/include/hip/hcc_detail/hip_runtime.h +++ b/hipamd/include/hip/hcc_detail/hip_runtime.h @@ -459,6 +459,14 @@ hc_get_workitem_absolute_id(int dim) #undef __CUDA__ #pragma pop_macro("__CUDA__") +hipError_t hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, + uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, + uint32_t localWorkSizeX, uint32_t localWorkSizeY, + uint32_t localWorkSizeZ, size_t sharedMemBytes, + hipStream_t hStream, void** kernelParams, void** extra, + hipEvent_t startEvent = nullptr, + hipEvent_t stopEvent = nullptr, + uint32_t flags = 0); hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, @@ -466,7 +474,8 @@ hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, uint32_t localWorkSizeZ, size_t sharedMemBytes, hipStream_t hStream, void** kernelParams, void** extra, hipEvent_t startEvent = nullptr, - hipEvent_t stopEvent = nullptr); + hipEvent_t stopEvent = nullptr) + __attribute__((deprecated("use hipExtModuleLaunchKernel instead"))); #endif // defined(__clang__) && defined(__HIP__) diff --git a/hipamd/include/hip/hip_hcc.h b/hipamd/include/hip/hip_hcc.h index 68889ced4e..3935f4903b 100644 --- a/hipamd/include/hip/hip_hcc.h +++ b/hipamd/include/hip/hip_hcc.h @@ -105,7 +105,7 @@ hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, hipStream_t hStream, void** kernelParams, void** extra, hipEvent_t startEvent = nullptr, hipEvent_t stopEvent = nullptr) - __attribute__((deprecated("use hipExtModuleLaunchKernel instead")));; + __attribute__((deprecated("use hipExtModuleLaunchKernel instead"))); // doxygen end HCC-specific features /**