From b10799a7e7876dfebf7b0fb007423c6673475a1b Mon Sep 17 00:00:00 2001 From: Anusha GodavarthySurya Date: Wed, 20 Dec 2023 11:42:11 +0000 Subject: [PATCH] SWDEV-351966 - Rename hip::__hipExtModuleLaunchKernel to hip::hipExtModuleLaunchKernel Change-Id: Ie922760f37bf0c9abf2653d36e32705a12ab5a90 [ROCm/clr commit: 9b6cf0f74bab27664046f09c66f7a0cb6581cc23] --- projects/clr/hipamd/src/hip_api_trace.cpp | 8 ++++---- projects/clr/hipamd/src/hip_module.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/clr/hipamd/src/hip_api_trace.cpp b/projects/clr/hipamd/src/hip_api_trace.cpp index 3bb339ffca..69ae1ffac0 100644 --- a/projects/clr/hipamd/src/hip_api_trace.cpp +++ b/projects/clr/hipamd/src/hip_api_trace.cpp @@ -629,13 +629,13 @@ hipError_t hipWaitExternalSemaphoresAsync(const hipExternalSemaphore_t* extSemAr unsigned int numExtSems, hipStream_t stream); hipChannelFormatDesc hipCreateChannelDesc(int x, int y, int z, int w, hipChannelFormatKind f); hipError_t hipCreateSurfaceObject(hipSurfaceObject_t* pSurfObject, const hipResourceDesc* pResDesc); -hipError_t __hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, +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, hipEvent_t stopEvent, uint32_t flag); -hipError_t __hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, +hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, uint32_t localWorkSizeX, uint32_t localWorkSizeY, uint32_t localWorkSizeZ, size_t sharedMemBytes, @@ -1159,8 +1159,8 @@ void UpdateHipDispatchTable(HipDispatchTable* ptrDispatchTable) { ptrDispatchTable->hipWaitExternalSemaphoresAsync_fn = hip::hipWaitExternalSemaphoresAsync; ptrDispatchTable->hipCreateChannelDesc_fn = hip::hipCreateChannelDesc; ptrDispatchTable->hipCreateSurfaceObject_fn = hip::hipCreateSurfaceObject; - ptrDispatchTable->hipExtModuleLaunchKernel_fn = hip::__hipExtModuleLaunchKernel; - ptrDispatchTable->hipHccModuleLaunchKernel_fn = hip::__hipHccModuleLaunchKernel; + ptrDispatchTable->hipExtModuleLaunchKernel_fn = hip::hipExtModuleLaunchKernel; + ptrDispatchTable->hipHccModuleLaunchKernel_fn = hip::hipHccModuleLaunchKernel; ptrDispatchTable->hipMemcpy_spt_fn = hip::hipMemcpy_spt; ptrDispatchTable->hipMemcpyToSymbol_spt_fn = hip::hipMemcpyToSymbol_spt; ptrDispatchTable->hipMemcpyFromSymbol_spt_fn = hip::hipMemcpyFromSymbol_spt; diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp index c783294d6c..2bd64fbd98 100644 --- a/projects/clr/hipamd/src/hip_module.cpp +++ b/projects/clr/hipamd/src/hip_module.cpp @@ -461,7 +461,7 @@ hipError_t hipModuleLaunchKernel(hipFunction_t f, uint32_t gridDimX, uint32_t gr hStream, kernelParams, extra, nullptr, nullptr)); } -hipError_t __hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, +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, @@ -485,7 +485,7 @@ hipError_t __hipExtModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, } -hipError_t __hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, +hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, uint32_t blockDimX, uint32_t blockDimY, uint32_t blockDimZ, size_t sharedMemBytes, hipStream_t hStream, void** kernelParams,