AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-388278 - Fix return HIP_RETURN(x)

Browse Source 
Change-Id: I940ee3660a2427eade8690a9318966fb04a1fbe8


[ROCm/clr commit: e6520ddf8a]
This commit is contained in:
Ioannis Assiouras
2023-03-13 13:32:55 +00:00
parent 7528052a8f
commit bf7e31c1ff
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/src/hip_module.cpp
+6 -3
View File
@@ -690,12 +690,15 @@ hipError_t hipLaunchCooperativeKernel_common(const void* f, dim3 gridDim, dim3 b
void** kernelParams, uint32_t sharedMemBytes,
hipStream_t hStream) {
if (!hip::isValid(hStream)) {
HIP_RETURN(hipErrorInvalidValue);
return hipErrorInvalidValue;
}
hipFunction_t func = nullptr;
int deviceId = hip::Stream::DeviceId(hStream);
HIP_RETURN_ONFAIL(PlatformState::instance().getStatFunc(&func, f, deviceId));
hipError_t getStatFuncError = PlatformState::instance().getStatFunc(&func, f, deviceId);
if (getStatFuncError != hipSuccess) {
return getStatFuncError;
}
const amd::Device* device = g_devices[deviceId]->devices()[0];
size_t globalWorkSizeX = static_cast<size_t>(gridDim.x) * blockDim.x;
size_t globalWorkSizeY = static_cast<size_t>(gridDim.y) * blockDim.y;
@@ -704,7 +707,7 @@ hipError_t hipLaunchCooperativeKernel_common(const void* f, dim3 gridDim, dim3 b
globalWorkSizeY > std::numeric_limits<uint32_t>::max() ||
globalWorkSizeZ > std::numeric_limits<uint32_t>::max() ||
(blockDim.x * blockDim.y * blockDim.z > device->info().maxWorkGroupSize_)) {
return HIP_RETURN(hipErrorInvalidConfiguration);
return hipErrorInvalidConfiguration;
}
return ihipModuleLaunchKernel(func, static_cast<uint32_t>(globalWorkSizeX),