From 3e01da3dac9dfeac3e0560eb5f6b5fa681b1f534 Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <Ioannis.Assiouras@amd.com>
Date: Tue, 4 Feb 2025 17:14:33 +0000
Subject: [PATCH] SWDEV-513323 - Fix for BatchMemOp on devices with no image
 support

BatchMemop should be positioned before the image support kernels
because the total number of kernels is determined by BlitLinearTotal,
when there is no image support on the device.

Change-Id: I8e53caf744ba54259ac04bad1762eef21806f3f2
---
 rocclr/device/rocm/rocblit.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rocclr/device/rocm/rocblit.hpp b/rocclr/device/rocm/rocblit.hpp
index 7e92feb574..d67104aec2 100644
--- a/rocclr/device/rocm/rocblit.hpp
+++ b/rocclr/device/rocm/rocblit.hpp
@@ -277,13 +277,13 @@ class KernelBlitManager : public DmaBlitManager {
     Scheduler,
     GwsInit,
     InitHeap,
+    BatchMemOp,
     BlitLinearTotal,
     FillImage = BlitLinearTotal,
     BlitCopyImage,
     BlitCopyImage1DA,
     BlitCopyImageToBuffer,
     BlitCopyBufferToImage,
-    BatchMemOp,
     BlitTotal
   };
 
@@ -593,10 +593,10 @@ static const char* BlitName[KernelBlitManager::BlitTotal] = {
     "__amd_rocclr_copyBufferRect",    "__amd_rocclr_copyBufferRectAligned",
     "__amd_rocclr_streamOpsWrite",    "__amd_rocclr_streamOpsWait",
     "__amd_rocclr_scheduler",         "__amd_rocclr_gwsInit",
-    "__amd_rocclr_initHeap",          "__amd_rocclr_fillImage",
-    "__amd_rocclr_copyImage",         "__amd_rocclr_copyImage1DA",
-    "__amd_rocclr_copyImageToBuffer", "__amd_rocclr_copyBufferToImage",
-    "__amd_rocclr_batchMemOp"};
+    "__amd_rocclr_initHeap",          "__amd_rocclr_batchMemOp",
+    "__amd_rocclr_fillImage",         "__amd_rocclr_copyImage",
+    "__amd_rocclr_copyImage1DA",      "__amd_rocclr_copyImageToBuffer",
+    "__amd_rocclr_copyBufferToImage"};
 
 inline void KernelBlitManager::setArgument(amd::Kernel* kernel, size_t index,
                                            size_t size, const void* value, size_t offset,