From 501b613442b660ff1837cdb0b4d0a7eec455a784 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 12 Jan 2022 23:13:15 -0500 Subject: [PATCH] Revert "SWDEV-316155 - Fix for P2P sample failure" This reverts commit 74269eb547a66ee49269dfb81600f1e0aaeedd95. Reason for revert: Fixed via a different patch Change-Id: I1743afdd7b8516b39501839d74bbed6bdb797e0c [ROCm/clr commit: ff1f1ba867a81966bd068e9222c79b201c433875] --- projects/clr/hipamd/src/hip_memory.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp index 3eb4fb17cc..c4dc8ebff1 100644 --- a/projects/clr/hipamd/src/hip_memory.cpp +++ b/projects/clr/hipamd/src/hip_memory.cpp @@ -357,23 +357,6 @@ hipError_t ihipMemcpyCommand(amd::Command*& command, void* dst, const void* src, if ((srcMemory->getContext().devices()[0] != dstMemory->getContext().devices()[0]) && ((srcMemory->getContext().devices().size() == 1) && (dstMemory->getContext().devices().size() == 1))) { - amd::HostQueue* currNullStream = hip::getNullStream(); - if (currNullStream == &queue) { - if (queueDevice != srcMemory->getContext().devices()[0]) { - amd::HostQueue* pQueue = hip::getNullStream(srcMemory->getContext()); - amd::Command* cmd = pQueue->getLastQueuedCommand(true); - if (cmd != nullptr) { - waitList.push_back(cmd); - } - } - if (queueDevice != dstMemory->getContext().devices()[0]) { - amd::HostQueue* pQueue = hip::getNullStream(dstMemory->getContext()); - amd::Command* cmd = pQueue->getLastQueuedCommand(true); - if (cmd != nullptr) { - waitList.push_back(cmd); - } - } - } command = new amd::CopyMemoryP2PCommand(queue, CL_COMMAND_COPY_BUFFER, waitList, *srcMemory->asBuffer(), *dstMemory->asBuffer(), sOffset, dOffset, sizeBytes); if (command == nullptr) {