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

SWDEV-369581 - Convey copy API metadata to ROCclr

Browse Source 
Change-Id: I6fcd2c2dbec887199de538326a7826bd29a25ca0
This commit is contained in:
Ioannis Assiouras
2022-12-01 16:32:01 +00:00
parent 52878fd039
commit 337976febf
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hipamd/src/hip_graph_helper.hpp
+1 -1
View File
@@ -5,7 +5,7 @@ hipError_t ihipMemcpy3D_validate(const hipMemcpy3DParms* p);
hipError_t ihipMemcpy_validate(void* dst, const void* src, size_t sizeBytes, hipMemcpyKind kind); hipError_t ihipMemcpy_validate(void* dst, const void* src, size_t sizeBytes, hipMemcpyKind kind);
hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src, size_t sizeBytes, hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src, size_t sizeBytes,
hipMemcpyKind kind, amd::HostQueue& queue); hipMemcpyKind kind, amd::HostQueue& queue, bool isAsync = false);
hipError_t ihipLaunchKernel_validate(hipFunction_t f, uint32_t globalWorkSizeX, hipError_t ihipLaunchKernel_validate(hipFunction_t f, uint32_t globalWorkSizeX,
uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ,
hipamd/src/hip_memory.cpp
+29 -17
View File
@@ -330,13 +330,14 @@ hipError_t ihipMemcpy_validate(void* dst, const void* src, size_t sizeBytes,
} }
hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src, size_t sizeBytes, hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src, size_t sizeBytes,
hipMemcpyKind kind, amd::HostQueue& queue) { hipMemcpyKind kind, amd::HostQueue& queue, bool isAsync) {
amd::Command::EventWaitList waitList; amd::Command::EventWaitList waitList;
size_t sOffset = 0; size_t sOffset = 0;
amd::Memory* srcMemory = getMemoryObject(src, sOffset); amd::Memory* srcMemory = getMemoryObject(src, sOffset);
size_t dOffset = 0; size_t dOffset = 0;
amd::Memory* dstMemory = getMemoryObject(dst, dOffset); amd::Memory* dstMemory = getMemoryObject(dst, dOffset);
amd::Device* queueDevice = &queue.device(); amd::Device* queueDevice = &queue.device();
amd::CopyMetadata copyMetadata(isAsync, amd::CopyMetadata::CopyEnginePreference::SDMA);
if ((srcMemory == nullptr) && (dstMemory != nullptr)) { if ((srcMemory == nullptr) && (dstMemory != nullptr)) {
amd::HostQueue* pQueue = &queue; amd::HostQueue* pQueue = &queue;
if (queueDevice != dstMemory->getContext().devices()[0]) { if (queueDevice != dstMemory->getContext().devices()[0]) {
@@ -347,7 +348,7 @@ hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src,
} }
} }
command = new amd::WriteMemoryCommand(*pQueue, CL_COMMAND_WRITE_BUFFER, waitList, command = new amd::WriteMemoryCommand(*pQueue, CL_COMMAND_WRITE_BUFFER, waitList,
*dstMemory->asBuffer(), dOffset, sizeBytes, src); *dstMemory->asBuffer(), dOffset, sizeBytes, src, 0, 0, copyMetadata);
} else if ((srcMemory != nullptr) && (dstMemory == nullptr)) { } else if ((srcMemory != nullptr) && (dstMemory == nullptr)) {
amd::HostQueue* pQueue = &queue; amd::HostQueue* pQueue = &queue;
if (queueDevice != srcMemory->getContext().devices()[0]) { if (queueDevice != srcMemory->getContext().devices()[0]) {
@@ -358,7 +359,7 @@ hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src,
} }
} }
command = new amd::ReadMemoryCommand(*pQueue, CL_COMMAND_READ_BUFFER, waitList, command = new amd::ReadMemoryCommand(*pQueue, CL_COMMAND_READ_BUFFER, waitList,
*srcMemory->asBuffer(), sOffset, sizeBytes, dst); *srcMemory->asBuffer(), sOffset, sizeBytes, dst, 0, 0, copyMetadata);
} else if ((srcMemory != nullptr) && (dstMemory != nullptr)) { } else if ((srcMemory != nullptr) && (dstMemory != nullptr)) {
// Check if the queue device doesn't match the device on any memory object. // Check if the queue device doesn't match the device on any memory object.
// And any of them are not host allocation. // And any of them are not host allocation.
@@ -381,6 +382,7 @@ hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src,
amd::HostQueue* pQueue = &queue; amd::HostQueue* pQueue = &queue;
if ((srcMemory->getContext().devices()[0] == dstMemory->getContext().devices()[0]) && if ((srcMemory->getContext().devices()[0] == dstMemory->getContext().devices()[0]) &&
(queueDevice != srcMemory->getContext().devices()[0])) { (queueDevice != srcMemory->getContext().devices()[0])) {
copyMetadata.copyEnginePreference_ = amd::CopyMetadata::CopyEnginePreference::NONE;
pQueue = hip::getNullStream(srcMemory->getContext()); pQueue = hip::getNullStream(srcMemory->getContext());
amd::Command* cmd = queue.getLastQueuedCommand(true); amd::Command* cmd = queue.getLastQueuedCommand(true);
if (cmd != nullptr) { if (cmd != nullptr) {
@@ -406,7 +408,8 @@ hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src,
} }
} }
command = new amd::CopyMemoryCommand(*pQueue, CL_COMMAND_COPY_BUFFER, waitList, command = new amd::CopyMemoryCommand(*pQueue, CL_COMMAND_COPY_BUFFER, waitList,
*srcMemory->asBuffer(), *dstMemory->asBuffer(), sOffset, dOffset, sizeBytes); *srcMemory->asBuffer(), *dstMemory->asBuffer(), sOffset, dOffset, sizeBytes,
copyMetadata);
} }
} }
if (command == nullptr) { if (command == nullptr) {
@@ -451,7 +454,7 @@ hipError_t ihipMemcpy(void* dst, const void* src, size_t sizeBytes, hipMemcpyKin
isAsync = false; isAsync = false;
} }
amd::Command* command = nullptr; amd::Command* command = nullptr;
status = ihipMemcpyCommand(command, dst, src, sizeBytes, kind, queue); status = ihipMemcpyCommand(command, dst, src, sizeBytes, kind, queue, isAsync);
if (status != hipSuccess) { if (status != hipSuccess) {
return status; return status;
} }
@@ -1664,7 +1667,8 @@ hipError_t ihipMemcpyDtoHValidate(void* srcDevice, void* dstHost, amd::Coord3D&
hipError_t ihipMemcpyDtoHCommand(amd::Command*& command, void* srcDevice, void* dstHost, hipError_t ihipMemcpyDtoHCommand(amd::Command*& command, void* srcDevice, void* dstHost,
amd::Coord3D srcOrigin, amd::Coord3D dstOrigin, amd::Coord3D srcOrigin, amd::Coord3D dstOrigin,
amd::Coord3D copyRegion, size_t srcRowPitch, size_t srcSlicePitch, amd::Coord3D copyRegion, size_t srcRowPitch, size_t srcSlicePitch,
size_t dstRowPitch, size_t dstSlicePitch, amd::HostQueue* queue) { size_t dstRowPitch, size_t dstSlicePitch, amd::HostQueue* queue,
bool isAsync = false) {
amd::Memory* srcMemory; amd::Memory* srcMemory;
amd::BufferRect srcRect; amd::BufferRect srcRect;
amd::BufferRect dstRect; amd::BufferRect dstRect;
@@ -1675,9 +1679,11 @@ hipError_t ihipMemcpyDtoHCommand(amd::Command*& command, void* srcDevice, void*
return status; return status;
} }
amd::Coord3D srcStart(srcRect.start_, 0, 0); amd::Coord3D srcStart(srcRect.start_, 0, 0);
amd::CopyMetadata copyMetadata(isAsync, amd::CopyMetadata::CopyEnginePreference::SDMA);
amd::ReadMemoryCommand* readCommand = amd::ReadMemoryCommand* readCommand =
new amd::ReadMemoryCommand(*queue, CL_COMMAND_READ_BUFFER_RECT, amd::Command::EventWaitList{}, new amd::ReadMemoryCommand(*queue, CL_COMMAND_READ_BUFFER_RECT, amd::Command::EventWaitList{},
*srcMemory, srcStart, copyRegion, dstHost, srcRect, dstRect); *srcMemory, srcStart, copyRegion, dstHost, srcRect, dstRect,
copyMetadata);
if (readCommand == nullptr) { if (readCommand == nullptr) {
return hipErrorOutOfMemory; return hipErrorOutOfMemory;
@@ -1726,7 +1732,8 @@ hipError_t ihipMemcpyHtoDValidate(const void* srcHost, void* dstDevice, amd::Coo
hipError_t ihipMemcpyHtoDCommand(amd::Command*& command, const void* srcHost, void* dstDevice, hipError_t ihipMemcpyHtoDCommand(amd::Command*& command, const void* srcHost, void* dstDevice,
amd::Coord3D srcOrigin, amd::Coord3D dstOrigin, amd::Coord3D srcOrigin, amd::Coord3D dstOrigin,
amd::Coord3D copyRegion, size_t srcRowPitch, size_t srcSlicePitch, amd::Coord3D copyRegion, size_t srcRowPitch, size_t srcSlicePitch,
size_t dstRowPitch, size_t dstSlicePitch, amd::HostQueue* queue) { size_t dstRowPitch, size_t dstSlicePitch, amd::HostQueue* queue,
bool isAsync = false) {
amd::Memory* dstMemory; amd::Memory* dstMemory;
amd::BufferRect srcRect; amd::BufferRect srcRect;
amd::BufferRect dstRect; amd::BufferRect dstRect;
@@ -1738,9 +1745,10 @@ hipError_t ihipMemcpyHtoDCommand(amd::Command*& command, const void* srcHost, vo
return status; return status;
} }
amd::Coord3D dstStart(dstRect.start_, 0, 0); amd::Coord3D dstStart(dstRect.start_, 0, 0);
amd::CopyMetadata copyMetadata(isAsync, amd::CopyMetadata::CopyEnginePreference::SDMA);
amd::WriteMemoryCommand* writeCommand = new amd::WriteMemoryCommand( amd::WriteMemoryCommand* writeCommand = new amd::WriteMemoryCommand(
*queue, CL_COMMAND_WRITE_BUFFER_RECT, amd::Command::EventWaitList{}, *dstMemory, dstStart, *queue, CL_COMMAND_WRITE_BUFFER_RECT, amd::Command::EventWaitList{}, *dstMemory, dstStart,
copyRegion, srcHost, dstRect, srcRect); copyRegion, srcHost, dstRect, srcRect, copyMetadata);
if (writeCommand == nullptr) { if (writeCommand == nullptr) {
return hipErrorOutOfMemory; return hipErrorOutOfMemory;
@@ -1878,7 +1886,7 @@ hipError_t ihipMemcpyHtoAValidate(const void* srcHost, hipArray* dstArray,
hipError_t ihipMemcpyHtoACommand(amd::Command*& command, const void* srcHost, hipArray* dstArray, hipError_t ihipMemcpyHtoACommand(amd::Command*& command, const void* srcHost, hipArray* dstArray,
amd::Coord3D srcOrigin, amd::Coord3D dstOrigin, amd::Coord3D srcOrigin, amd::Coord3D dstOrigin,
amd::Coord3D copyRegion, size_t srcRowPitch, size_t srcSlicePitch, amd::Coord3D copyRegion, size_t srcRowPitch, size_t srcSlicePitch,
amd::HostQueue* queue) { amd::HostQueue* queue, bool isAsync = false) {
amd::Image* dstImage; amd::Image* dstImage;
amd::BufferRect srcRect; amd::BufferRect srcRect;
@@ -1888,9 +1896,11 @@ hipError_t ihipMemcpyHtoACommand(amd::Command*& command, const void* srcHost, hi
return status; return status;
} }
amd::CopyMetadata copyMetadata(isAsync, amd::CopyMetadata::CopyEnginePreference::SDMA);
amd::WriteMemoryCommand* writeMemCmd = new amd::WriteMemoryCommand( amd::WriteMemoryCommand* writeMemCmd = new amd::WriteMemoryCommand(
*queue, CL_COMMAND_WRITE_IMAGE, amd::Command::EventWaitList{}, *dstImage, dstOrigin, *queue, CL_COMMAND_WRITE_IMAGE, amd::Command::EventWaitList{}, *dstImage, dstOrigin,
copyRegion, static_cast<const char*>(srcHost) + srcRect.start_, srcRowPitch, srcSlicePitch); copyRegion, static_cast<const char*>(srcHost) + srcRect.start_, srcRowPitch, srcSlicePitch,
copyMetadata);
if (writeMemCmd == nullptr) { if (writeMemCmd == nullptr) {
return hipErrorOutOfMemory; return hipErrorOutOfMemory;
@@ -1937,9 +1947,10 @@ hipError_t ihipMemcpyAtoHValidate(hipArray* srcArray, void* dstHost, amd::Coord3
hipError_t ihipMemcpyAtoHCommand(amd::Command*& command, hipArray* srcArray, void* dstHost, hipError_t ihipMemcpyAtoHCommand(amd::Command*& command, hipArray* srcArray, void* dstHost,
amd::Coord3D srcOrigin, amd::Coord3D dstOrigin, amd::Coord3D srcOrigin, amd::Coord3D dstOrigin,
amd::Coord3D copyRegion, size_t dstRowPitch, size_t dstSlicePitch, amd::Coord3D copyRegion, size_t dstRowPitch, size_t dstSlicePitch,
amd::HostQueue* queue) { amd::HostQueue* queue, bool isAsync = false) {
amd::Image* srcImage; amd::Image* srcImage;
amd::BufferRect dstRect; amd::BufferRect dstRect;
amd::CopyMetadata copyMetadata(isAsync, amd::CopyMetadata::CopyEnginePreference::SDMA);
hipError_t status = ihipMemcpyAtoHValidate(srcArray, dstHost, srcOrigin, dstOrigin, copyRegion, hipError_t status = ihipMemcpyAtoHValidate(srcArray, dstHost, srcOrigin, dstOrigin, copyRegion,
dstRowPitch, dstSlicePitch, srcImage, dstRect); dstRowPitch, dstSlicePitch, srcImage, dstRect);
@@ -1949,7 +1960,8 @@ hipError_t ihipMemcpyAtoHCommand(amd::Command*& command, hipArray* srcArray, voi
amd::ReadMemoryCommand* readMemCmd = new amd::ReadMemoryCommand( amd::ReadMemoryCommand* readMemCmd = new amd::ReadMemoryCommand(
*queue, CL_COMMAND_READ_IMAGE, amd::Command::EventWaitList{}, *srcImage, srcOrigin, *queue, CL_COMMAND_READ_IMAGE, amd::Command::EventWaitList{}, *srcImage, srcOrigin,
copyRegion, static_cast<char*>(dstHost) + dstRect.start_, dstRowPitch, dstSlicePitch); copyRegion, static_cast<char*>(dstHost) + dstRect.start_, dstRowPitch, dstSlicePitch,
copyMetadata);
if (readMemCmd == nullptr) { if (readMemCmd == nullptr) {
return hipErrorOutOfMemory; return hipErrorOutOfMemory;
@@ -2385,7 +2397,7 @@ hipError_t ihipMemcpyDtoH(void* srcDevice, void* dstHost, amd::Coord3D srcOrigin
amd::Command* command; amd::Command* command;
hipError_t status = ihipMemcpyDtoHCommand(command, srcDevice, dstHost, srcOrigin, dstOrigin, hipError_t status = ihipMemcpyDtoHCommand(command, srcDevice, dstHost, srcOrigin, dstOrigin,
copyRegion, srcRowPitch, srcSlicePitch, dstRowPitch, copyRegion, srcRowPitch, srcSlicePitch, dstRowPitch,
dstSlicePitch, hip::getQueue(stream)); dstSlicePitch, hip::getQueue(stream), isAsync);
if (status != hipSuccess) return status; if (status != hipSuccess) return status;
return ihipMemcpyCmdEnqueue(command, isAsync); return ihipMemcpyCmdEnqueue(command, isAsync);
} }
@@ -2396,7 +2408,7 @@ hipError_t ihipMemcpyHtoD(const void* srcHost, void* dstDevice, amd::Coord3D src
amd::Command* command; amd::Command* command;
hipError_t status = ihipMemcpyHtoDCommand(command, srcHost, dstDevice, srcOrigin, dstOrigin, hipError_t status = ihipMemcpyHtoDCommand(command, srcHost, dstDevice, srcOrigin, dstOrigin,
copyRegion, srcRowPitch, srcSlicePitch, dstRowPitch, copyRegion, srcRowPitch, srcSlicePitch, dstRowPitch,
dstSlicePitch, hip::getQueue(stream)); dstSlicePitch, hip::getQueue(stream), isAsync);
if (status != hipSuccess) return status; if (status != hipSuccess) return status;
return ihipMemcpyCmdEnqueue(command, isAsync); return ihipMemcpyCmdEnqueue(command, isAsync);
} }
@@ -2415,7 +2427,7 @@ hipError_t ihipMemcpyHtoA(const void* srcHost, hipArray* dstArray, amd::Coord3D
amd::Command* command; amd::Command* command;
hipError_t status = hipError_t status =
ihipMemcpyHtoACommand(command, srcHost, dstArray, srcOrigin, dstOrigin, copyRegion, ihipMemcpyHtoACommand(command, srcHost, dstArray, srcOrigin, dstOrigin, copyRegion,
srcRowPitch, srcSlicePitch, hip::getQueue(stream)); srcRowPitch, srcSlicePitch, hip::getQueue(stream), isAsync);
if (status != hipSuccess) return status; if (status != hipSuccess) return status;
return ihipMemcpyCmdEnqueue(command, isAsync); return ihipMemcpyCmdEnqueue(command, isAsync);
} }
@@ -2425,7 +2437,7 @@ hipError_t ihipMemcpyAtoH(hipArray* srcArray, void* dstHost, amd::Coord3D srcOri
amd::Command* command; amd::Command* command;
hipError_t status = hipError_t status =
ihipMemcpyAtoHCommand(command, srcArray, dstHost, srcOrigin, dstOrigin, copyRegion, ihipMemcpyAtoHCommand(command, srcArray, dstHost, srcOrigin, dstOrigin, copyRegion,
dstRowPitch, dstSlicePitch, hip::getQueue(stream)); dstRowPitch, dstSlicePitch, hip::getQueue(stream), isAsync);
if (status != hipSuccess) return status; if (status != hipSuccess) return status;
return ihipMemcpyCmdEnqueue(command, isAsync); return ihipMemcpyCmdEnqueue(command, isAsync);
} }