From 8b1d0cff83f3ae2d33c6ad36dd62845fdb77b346 Mon Sep 17 00:00:00 2001 From: Jatin Jaikishan Chaudhary Date: Mon, 6 Jan 2025 18:03:23 -0500 Subject: [PATCH] Revert "SWDEV-505971 - change setArgument arg from uint32_t to uint64_t" This reverts commit 0830d95f6d9f812e1da34781b6ef8bc639941f60. Reason for revert: There needs to be memcpy size change Change-Id: If4f51769731e54743ac705b19b4f81b2d5925d5a [ROCm/clr commit: 446ed661a0c60197810d630fe4b9f13192e752d4] --- projects/clr/rocclr/device/blit.hpp | 2 +- projects/clr/rocclr/device/pal/palblit.hpp | 2 +- projects/clr/rocclr/device/rocm/rocblit.cpp | 2 +- projects/clr/rocclr/device/rocm/rocblit.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/clr/rocclr/device/blit.hpp b/projects/clr/rocclr/device/blit.hpp index cc4ddda2dc..ec98886b38 100644 --- a/projects/clr/rocclr/device/blit.hpp +++ b/projects/clr/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, - uint64_t count + uint32_t count ) const = 0; //! Enables synchronization on blit operations diff --git a/projects/clr/rocclr/device/pal/palblit.hpp b/projects/clr/rocclr/device/pal/palblit.hpp index 0d73ba632c..7df8731328 100644 --- a/projects/clr/rocclr/device/pal/palblit.hpp +++ b/projects/clr/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, - uint64_t count) const { + uint32_t count) const { assert(!"Unimplemented"); return false; } diff --git a/projects/clr/rocclr/device/rocm/rocblit.cpp b/projects/clr/rocclr/device/rocm/rocblit.cpp index 5ef076673d..a9ffb4d95a 100644 --- a/projects/clr/rocclr/device/rocm/rocblit.cpp +++ b/projects/clr/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, - uint64_t count) const { + uint32_t count) const { amd::ScopedLock k(lockXferOps_); bool result = false; uint blitType = BatchMemOp; diff --git a/projects/clr/rocclr/device/rocm/rocblit.hpp b/projects/clr/rocclr/device/rocm/rocblit.hpp index 6a979ac5b4..1d9d0e670d 100644 --- a/projects/clr/rocclr/device/rocm/rocblit.hpp +++ b/projects/clr/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, uint64_t count) const; + virtual bool batchMemOps(const void* paramArray, size_t paramSize, uint32_t count) const; virtual amd::Monitor* lockXfer() const { return &lockXferOps_; }