From a38de7d73d0122020d9a9259db9cb2f3d586b3ca Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 10 Aug 2018 17:16:53 -0400 Subject: [PATCH] P4 to Git Change 1592348 by cpaquot@cpaquot-ocl-lc-lnx on 2018/08/10 17:00:39 SWDEV-145570 - [HIP] Do not multiply block and dims for Hcc/Ext kernel module launch Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#16 edit --- api/hip/hip_module.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/hip/hip_module.cpp b/api/hip/hip_module.cpp index f4a8f6aaa3..67c4f06c6c 100644 --- a/api/hip/hip_module.cpp +++ b/api/hip/hip_module.cpp @@ -169,7 +169,7 @@ hipError_t ihipModuleLaunchKernel(hipFunction_t f, } size_t globalWorkOffset[3] = {0}; - size_t globalWorkSize[3] = { gridDimX * blockDimX, gridDimY * blockDimY, gridDimZ * blockDimZ}; + size_t globalWorkSize[3] = { gridDimX, gridDimY, gridDimZ }; size_t localWorkSize[3] = { blockDimX, blockDimY, blockDimZ }; amd::NDRangeContainer ndrange(3, globalWorkOffset, globalWorkSize, localWorkSize); amd::Command::EventWaitList waitList; @@ -242,7 +242,8 @@ hipError_t hipModuleLaunchKernel(hipFunction_t f, uint32_t sharedMemBytes, hipStream_t hStream, void **kernelParams, void **extra) { - return ihipModuleLaunchKernel(f, gridDimX, gridDimY, gridDimZ, blockDimX, blockDimY, blockDimZ, + return ihipModuleLaunchKernel(f, gridDimX * blockDimX, gridDimY * blockDimY, gridDimZ * blockDimZ, + blockDimX, blockDimY, blockDimZ, sharedMemBytes, hStream, kernelParams, extra, nullptr, nullptr); }