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

SWDEV-307642 - Fix memcpy directed tests failure

Browse Source 
Change-Id: I7a835a5a519b35fcda813c2acc1ac3cf5d0b5f23


[ROCm/clr commit: 63c6799130]
This commit is contained in:
anusha GodavarthySurya
2021-10-20 03:39:00 -07:00
committed by Anusha Godavarthy Surya
parent cfed4577c0
commit ad0dc7dd0e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/src/hip_graph_helper.hpp
+2 -2
View File
@@ -39,8 +39,8 @@ hipError_t ihipMemset3DCommand(std::vector<amd::Command*>& commands, hipPitchedP
hipError_t ihipMemcpySymbol_validate(const void* symbol, size_t sizeBytes, size_t offset, hipError_t ihipMemcpySymbol_validate(const void* symbol, size_t sizeBytes, size_t offset,
size_t& sym_size, hipDeviceptr_t& device_ptr); size_t& sym_size, hipDeviceptr_t& device_ptr);
hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D srcOrigin, hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D& srcOrigin,
amd::Coord3D dstOrigin, amd::Coord3D copyRegion, amd::Coord3D& dstOrigin, amd::Coord3D& copyRegion,
size_t dstRowPitch, size_t dstSlicePitch, amd::Memory*& dstMemory, size_t dstRowPitch, size_t dstSlicePitch, amd::Memory*& dstMemory,
amd::Image*& srcImage, amd::BufferRect& srcRect, amd::Image*& srcImage, amd::BufferRect& srcRect,
amd::BufferRect& dstRect); amd::BufferRect& dstRect);
projects/clr/hipamd/src/hip_memory.cpp
+9 -8
View File
@@ -1189,11 +1189,11 @@ hipError_t hipMemcpyDtoHAsync(void* dstHost,
HIP_RETURN_DURATION(ihipMemcpy(dstHost, srcDevice, ByteCount, hipMemcpyDeviceToHost, *hip::getQueue(stream), true)); HIP_RETURN_DURATION(ihipMemcpy(dstHost, srcDevice, ByteCount, hipMemcpyDeviceToHost, *hip::getQueue(stream), true));
} }
hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D srcOrigin, hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D& srcOrigin,
amd::Coord3D dstOrigin, amd::Coord3D copyRegion, amd::Coord3D& dstOrigin, amd::Coord3D& copyRegion,
size_t dstRowPitch, size_t dstSlicePitch, amd::Memory*& dstMemory, size_t dstRowPitch, size_t dstSlicePitch,
amd::Image*& srcImage, amd::BufferRect& srcRect, amd::Memory*& dstMemory, amd::Image*& srcImage,
amd::BufferRect& dstRect) { amd::BufferRect& srcRect, amd::BufferRect& dstRect) {
size_t dstOffset = 0; size_t dstOffset = 0;
dstMemory = getMemoryObject(dstDevice, dstOffset); dstMemory = getMemoryObject(dstDevice, dstOffset);
if (srcArray == nullptr || (dstMemory == nullptr)) { if (srcArray == nullptr || (dstMemory == nullptr)) {
@@ -1608,9 +1608,10 @@ hipError_t ihipMemcpyAtoACommand(amd::Command*& command, hipArray* srcArray, hip
return hipSuccess; return hipSuccess;
} }
hipError_t ihipMemcpyHtoAValidate(const void* srcHost, hipArray* dstArray, amd::Coord3D& srcOrigin, hipError_t ihipMemcpyHtoAValidate(const void* srcHost, hipArray* dstArray,
amd::Coord3D& dstOrigin, amd::Coord3D& copyRegion, amd::Coord3D& srcOrigin, amd::Coord3D& dstOrigin,
size_t srcRowPitch, size_t srcSlicePitch, amd::Image*& dstImage, amd::Coord3D& copyRegion, size_t srcRowPitch,
size_t srcSlicePitch, amd::Image*& dstImage,
amd::BufferRect& srcRect) { amd::BufferRect& srcRect) {
if ((srcHost == nullptr) || dstArray == nullptr) { if ((srcHost == nullptr) || dstArray == nullptr) {
return hipErrorInvalidValue; return hipErrorInvalidValue;