From b157c8eeeac6e0b5a67c410ca5ee3de12d2213d8 Mon Sep 17 00:00:00 2001 From: Saleel Kudchadker Date: Wed, 2 Nov 2022 19:51:33 -0700 Subject: [PATCH] SWDEV-301667 - Improve logging Change-Id: Ifa6da876b85cb503967cf09aac6d477b10db8e63 [ROCm/clr commit: feca11d5e3931705c649efc56c208dc44ab0509d] --- projects/clr/rocclr/device/rocm/rocblit.cpp | 7 +++++-- projects/clr/rocclr/device/rocm/rocvirtual.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/clr/rocclr/device/rocm/rocblit.cpp b/projects/clr/rocclr/device/rocm/rocblit.cpp index b759a479ee..bf94cb2527 100644 --- a/projects/clr/rocclr/device/rocm/rocblit.cpp +++ b/projects/clr/rocclr/device/rocm/rocblit.cpp @@ -1812,12 +1812,15 @@ bool KernelBlitManager::writeBuffer(const void* srcHost, device::Memory& dstMemo bool result = false; if (dev().info().largeBar_ && size[0] <= kMaxH2dMemcpySize) { - if ((dstMemory.owner()->getHostMem() == nullptr) && (dstMemory.owner()->getSvmPtr() != nullptr)) { + if ((dstMemory.owner()->getHostMem() == nullptr) && + (dstMemory.owner()->getSvmPtr() != nullptr)) { // CPU read ahead, hence release GPU memory + ClPrint(amd::LOG_DEBUG, amd::LOG_COPY, "Host memcpy for map wait_event"); gpu().releaseGpuMemoryFence(); char* dst = reinterpret_cast(dstMemory.owner()->getSvmPtr()); std::memcpy(dst + origin[0], srcHost, size[0]); - // Set hasPendingDispatch_ flag. Then releaseGpuMemoryFence() will use barrier to invalidate cache + // Set hasPendingDispatch_ flag. Then releaseGpuMemoryFence() will use barrier + // to invalidate cache gpu().hasPendingDispatch(); gpu().releaseGpuMemoryFence(); return true; diff --git a/projects/clr/rocclr/device/rocm/rocvirtual.cpp b/projects/clr/rocclr/device/rocm/rocvirtual.cpp index 5454bab8cf..c85a4851c0 100644 --- a/projects/clr/rocclr/device/rocm/rocvirtual.cpp +++ b/projects/clr/rocclr/device/rocm/rocvirtual.cpp @@ -146,7 +146,7 @@ void Timestamp::checkGpuTime() { start = std::min(time.start, start); end = std::max(time.end, end); ClPrint(amd::LOG_INFO, amd::LOG_SIG, "Signal = (0x%lx), start = %ld, " - "end = %ld", it->signal_.handle, start, end); + "end = %ld time taken= %ld ns", it->signal_.handle, start, end, end - start); } it->done_ = true; }