From a6f2a2c2afa388e69bc7389622dfec480a2f35bb Mon Sep 17 00:00:00 2001 From: Jatin Chaudhary Date: Fri, 20 Dec 2024 11:46:42 +0000 Subject: [PATCH] SWDEV-505971 - change setArgument arg from uint32_t to uint64_t We are passing this arg as an address, and memcpy complains about overreading (8 bytes instead of 4). Change-Id: Ica9207f6c5f6056a4bfc968280c76e779ded13ae --- rocclr/device/blit.hpp | 2 +- rocclr/device/pal/palblit.hpp | 2 +- rocclr/device/rocm/rocblit.cpp | 2 +- rocclr/device/rocm/rocblit.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rocclr/device/blit.hpp b/rocclr/device/blit.hpp index ec98886b38..cc4ddda2dc 100644 --- a/rocclr/device/blit.hpp +++ b/rocclr/device/blit.hpp @@ -236,7 +236,7 @@ class BlitManager : public amd::HeapObject { //! Stream batch memory operation virtual bool batchMemOps(const void* paramArray, size_t paramSize, - uint32_t count + uint64_t count ) const = 0; //! Enables synchronization on blit operations diff --git a/rocclr/device/pal/palblit.hpp b/rocclr/device/pal/palblit.hpp index 7df8731328..0d73ba632c 100644 --- a/rocclr/device/pal/palblit.hpp +++ b/rocclr/device/pal/palblit.hpp @@ -478,7 +478,7 @@ class KernelBlitManager : public DmaBlitManager { //! Batch memory ops- Submits batch of streamWaits and streamWrite operations. virtual bool batchMemOps(const void* paramArray, size_t paramSize, - uint32_t count) const { + uint64_t count) const { assert(!"Unimplemented"); return false; } diff --git a/rocclr/device/rocm/rocblit.cpp b/rocclr/device/rocm/rocblit.cpp index a9ffb4d95a..5ef076673d 100644 --- a/rocclr/device/rocm/rocblit.cpp +++ b/rocclr/device/rocm/rocblit.cpp @@ -2513,7 +2513,7 @@ bool KernelBlitManager::streamOpsWait(device::Memory& memory, uint64_t value, si // ================================================================================================ bool KernelBlitManager::batchMemOps(const void* paramArray, size_t paramSize, - uint32_t count) const { + uint64_t count) const { amd::ScopedLock k(lockXferOps_); bool result = false; uint blitType = BatchMemOp; diff --git a/rocclr/device/rocm/rocblit.hpp b/rocclr/device/rocm/rocblit.hpp index 1d9d0e670d..6a979ac5b4 100644 --- a/rocclr/device/rocm/rocblit.hpp +++ b/rocclr/device/rocm/rocblit.hpp @@ -505,7 +505,7 @@ class KernelBlitManager : public DmaBlitManager { ) const; //! Batch memory ops- Submits batch of streamWaits and streamWrite operations. - virtual bool batchMemOps(const void* paramArray, size_t paramSize, uint32_t count) const; + virtual bool batchMemOps(const void* paramArray, size_t paramSize, uint64_t count) const; virtual amd::Monitor* lockXfer() const { return &lockXferOps_; }