From fb17aa5c413e9c6936c9da6231d39a1a3a2fc710 Mon Sep 17 00:00:00 2001 From: Ioannis Assiouras Date: Fri, 19 May 2023 11:24:40 +0100 Subject: [PATCH] SWDEV-401489 - [ABI Break] Removed hipModuleLaunchKernelExt Change-Id: I0b31d9db755f8a89ead203dbd238a93c18b76855 [ROCm/clr commit: fe2d747bcc363ed2bbd90a03316db5efdef01857] --- .../hipamd/include/hip/amd_detail/hip_prof_str.h | 3 --- projects/clr/hipamd/src/amdhip.def | 1 - projects/clr/hipamd/src/hip_hcc.map.in | 1 - projects/clr/hipamd/src/hip_module.cpp | 14 -------------- 4 files changed, 19 deletions(-) diff --git a/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h b/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h index d0b24d01c0..b9d390ddd0 100644 --- a/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h +++ b/projects/clr/hipamd/include/hip/amd_detail/hip_prof_str.h @@ -397,7 +397,6 @@ enum hip_api_id_t { HIP_API_ID_hipMemcpyFromArrayAsync = HIP_API_ID_NONE, HIP_API_ID_hipMemcpyHtoAAsync = HIP_API_ID_NONE, HIP_API_ID_hipMemcpyToArrayAsync = HIP_API_ID_NONE, - HIP_API_ID_hipModuleLaunchKernelExt = HIP_API_ID_NONE, HIP_API_ID_hipSetValidDevices = HIP_API_ID_NONE, HIP_API_ID_hipTexObjectCreate = HIP_API_ID_NONE, HIP_API_ID_hipTexObjectDestroy = HIP_API_ID_NONE, @@ -5477,8 +5476,6 @@ typedef struct hip_api_data_s { #define INIT_hipMemcpyHtoAAsync_CB_ARGS_DATA(cb_data) {}; // hipMemcpyToArrayAsync() #define INIT_hipMemcpyToArrayAsync_CB_ARGS_DATA(cb_data) {}; -// hipModuleLaunchKernelExt() -#define INIT_hipModuleLaunchKernelExt_CB_ARGS_DATA(cb_data) {}; // hipSetValidDevices() #define INIT_hipSetValidDevices_CB_ARGS_DATA(cb_data) {}; // hipTexObjectCreate() diff --git a/projects/clr/hipamd/src/amdhip.def b/projects/clr/hipamd/src/amdhip.def index ffaff7f57d..0b285d88ce 100644 --- a/projects/clr/hipamd/src/amdhip.def +++ b/projects/clr/hipamd/src/amdhip.def @@ -160,7 +160,6 @@ hipModuleGetFunction hipModuleGetGlobal hipModuleGetTexRef hipModuleLaunchKernel -hipModuleLaunchKernelExt hipModuleLaunchCooperativeKernel hipModuleLaunchCooperativeKernelMultiDevice hipLaunchCooperativeKernel diff --git a/projects/clr/hipamd/src/hip_hcc.map.in b/projects/clr/hipamd/src/hip_hcc.map.in index 204b139f2c..9494a3f44c 100644 --- a/projects/clr/hipamd/src/hip_hcc.map.in +++ b/projects/clr/hipamd/src/hip_hcc.map.in @@ -138,7 +138,6 @@ global: hipModuleGetGlobal; hipModuleGetTexRef; hipModuleLaunchKernel; - hipModuleLaunchKernelExt; hipLaunchCooperativeKernel; hipLaunchCooperativeKernelMultiDevice; hipModuleLoad; diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp index 755a5594e2..8743beb2a8 100644 --- a/projects/clr/hipamd/src/hip_module.cpp +++ b/projects/clr/hipamd/src/hip_module.cpp @@ -498,20 +498,6 @@ hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, extra, startEvent, stopEvent)); } -hipError_t hipModuleLaunchKernelExt(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, - void** extra, hipEvent_t startEvent, hipEvent_t stopEvent) { - HIP_INIT_API(hipModuleLaunchKernelExt, f, globalWorkSizeX, globalWorkSizeY, globalWorkSizeZ, - blockDimX, blockDimY, blockDimZ, sharedMemBytes, hStream, kernelParams, extra, - startEvent, stopEvent); - - HIP_RETURN(ihipModuleLaunchKernel(f, globalWorkSizeX, globalWorkSizeY, globalWorkSizeZ, blockDimX, - blockDimY, blockDimZ, sharedMemBytes, hStream, kernelParams, - extra, startEvent, stopEvent)); -} - hipError_t hipModuleLaunchCooperativeKernel(hipFunction_t f, unsigned int gridDimX, unsigned int gridDimY, unsigned int gridDimZ, unsigned int blockDimX, unsigned int blockDimY,