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

SWDEV-438531 - Fixed hipGraphExecMemcpyNodeSetParams for H2H kind

Browse Source 
The function erroneously returns hipErrorInvalidValue when kind
is set to hipMemcpyHostToHost

Change-Id: I6810b9f04f3218e517fd2f96410d1375e6ac6ff0
This commit is contained in:
Ioannis Assiouras
2023-12-22 22:15:17 +00:00
parent 755eb2962c
commit af86c1b8a2
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hipamd/src/hip_memory.cpp
+32 -4
View File
@@ -1909,26 +1909,44 @@ hipError_t ihipMemcpyHtoDCommand(amd::Command*& command, const void* srcHost, vo
return hipSuccess;
}
hipError_t ihipMemcpyHtoH(const void* srcHost, void* dstHost, amd::Coord3D srcOrigin,
hipError_t ihipMemcpyHtoHValidate(const void* srcHost, void* dstHost, amd::Coord3D srcOrigin,
amd::Coord3D dstOrigin, amd::Coord3D copyRegion, size_t srcRowPitch,
size_t srcSlicePitch, size_t dstRowPitch, size_t dstSlicePitch,
hip::Stream* stream) {
amd::BufferRect& srcRect, amd::BufferRect& dstRect) {
if ((srcHost == nullptr) || (dstHost == nullptr)) {
return hipErrorInvalidValue;
}
amd::BufferRect srcRect;
if (!srcRect.create(static_cast<size_t*>(srcOrigin), static_cast<size_t*>(copyRegion),
srcRowPitch, srcSlicePitch)) {
return hipErrorInvalidValue;
}
amd::BufferRect dstRect;
if (!dstRect.create(static_cast<size_t*>(dstOrigin), static_cast<size_t*>(copyRegion),
dstRowPitch, dstSlicePitch)) {
return hipErrorInvalidValue;
}
return hipSuccess;
}
hipError_t ihipMemcpyHtoH(const void* srcHost, void* dstHost, amd::Coord3D srcOrigin,
amd::Coord3D dstOrigin, amd::Coord3D copyRegion, size_t srcRowPitch,
size_t srcSlicePitch, size_t dstRowPitch, size_t dstSlicePitch,
hip::Stream* stream) {
amd::BufferRect srcRect;
amd::BufferRect dstRect;
hipError_t status = ihipMemcpyHtoHValidate(srcHost, dstHost, srcOrigin,
dstOrigin, copyRegion, srcRowPitch, srcSlicePitch,
dstRowPitch, dstSlicePitch, srcRect, dstRect);
if (status != hipSuccess) {
return status;
}
if (stream) {
stream->finish();
}
@@ -2972,6 +2990,16 @@ hipError_t ihipDrvMemcpy3D_validate(const HIP_MEMCPY3D* pCopy) {
if (status != hipSuccess) {
return status;
}
} else if ((srcMemoryType == hipMemoryTypeHost) && (dstMemoryType == hipMemoryTypeHost)) {
amd::BufferRect srcRect;
amd::BufferRect dstRect;
status = ihipMemcpyHtoHValidate(pCopy->srcHost, pCopy->dstHost, srcOrigin, dstOrigin, copyRegion,
pCopy->srcPitch, pCopy->srcPitch * pCopy->srcHeight,
pCopy->dstPitch, pCopy->dstPitch * pCopy->dstHeight,
srcRect, dstRect);
if (status != hipSuccess) {
return status;
}
} else {
return hipErrorInvalidValue;
}