From 8a1dc7e8a929a1b006117ebb6dd8b4fb982b3657 Mon Sep 17 00:00:00 2001
From: Kamil Kopryk <kamil.kopryk@intel.com>
Date: Wed, 10 Sep 2025 08:32:48 +0000
Subject: [PATCH] refactor: remove not used command queue member

Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
---
 opencl/source/command_queue/command_queue.cpp |  1 -
 opencl/source/command_queue/command_queue.h   | 24 +++++++------------
 .../command_queue_hw_1_tests.cpp              |  4 ----
 .../test/unit_test/mocks/mock_command_queue.h |  2 --
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp
index cfaa0dc5b6..960f5fd2b5 100644
--- a/opencl/source/command_queue/command_queue.cpp
+++ b/opencl/source/command_queue/command_queue.cpp
@@ -1286,7 +1286,6 @@ void CommandQueue::processProperties(const cl_queue_properties *properties) {
             }
         }
     }
-    requiresCacheFlushAfterWalker = device && (device->getDeviceInfo().parentDevice != nullptr);
 }
 
 void CommandQueue::overrideEngine(aub_stream::EngineType engineType, EngineUsage engineUsage) {
diff --git a/opencl/source/command_queue/command_queue.h b/opencl/source/command_queue/command_queue.h
index 2b3cc649e4..07e0ce45ec 100644
--- a/opencl/source/command_queue/command_queue.h
+++ b/opencl/source/command_queue/command_queue.h
@@ -354,10 +354,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
     cl_uint getQueueIndexWithinFamily() const { return queueIndexWithinFamily; }
     bool isQueueFamilySelected() const { return queueFamilySelected; }
 
-    bool getRequiresCacheFlushAfterWalker() const {
-        return requiresCacheFlushAfterWalker;
-    }
-
     template <typename PtrType>
     static PtrType convertAddressWithOffsetToGpuVa(PtrType ptr, InternalMemoryType memoryType, GraphicsAllocation &allocation);
 
@@ -519,7 +515,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
     cl_command_queue_capabilities_intel queueCapabilities = CL_QUEUE_DEFAULT_CAPABILITIES_INTEL;
     cl_uint queueFamilyIndex = 0;
     cl_uint queueIndexWithinFamily = 0;
-    bool queueFamilySelected = false;
 
     QueuePriority priority = QueuePriority::medium;
     QueueThrottle throttle = QueueThrottle::MEDIUM;
@@ -527,13 +522,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
     uint64_t sliceCount = QueueSliceCount::defaultSliceCount;
     std::array<CopyEngineState, bcsInfoMaskSize> bcsStates = {};
 
-    bool perfCountersEnabled = false;
-    bool isInternalUsage = false;
-    bool isCopyOnly = false;
-    bool bcsAllowed = false;
-    bool bcsInitialized = false;
-
-    bool bcsSplitInitialized = false;
     BcsInfoMask splitEngines = EngineHelpers::oddLinkedCopyEnginesMask;
     BcsInfoMask h2dEngines = NEO::EngineHelpers::h2dCopyEngineMask;
     BcsInfoMask d2hEngines = NEO::EngineHelpers::d2hCopyEngineMask;
@@ -541,9 +529,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
 
     LinearStream *commandStream = nullptr;
 
-    bool isSpecialCommandQueue = false;
-    bool requiresCacheFlushAfterWalker = false;
-
     std::unique_ptr<TimestampPacketContainer> deferredTimestampPackets;
     std::unique_ptr<TimestampPacketContainer> deferredMultiRootSyncNodes;
     std::unique_ptr<TimestampPacketContainer> timestampPacketContainer;
@@ -553,6 +538,15 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
         TimestampPacketContainer lastSignalledPacket;
     };
     std::array<BcsTimestampPacketContainers, bcsInfoMaskSize> bcsTimestampPacketContainers;
+
+    bool perfCountersEnabled = false;
+    bool isInternalUsage = false;
+    bool isCopyOnly = false;
+    bool bcsAllowed = false;
+    bool bcsInitialized = false;
+    bool isSpecialCommandQueue = false;
+    bool bcsSplitInitialized = false;
+    bool queueFamilySelected = false;
     bool stallingCommandsOnNextFlushRequired = false;
     bool dcFlushRequiredOnStallingCommandsOnNextFlush = false;
     bool isCacheFlushOnNextBcsWriteRequired = false;
diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp
index 4e5b6bb587..0b033f5fe6 100644
--- a/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp
+++ b/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp
@@ -1242,10 +1242,6 @@ HWTEST_F(CommandQueueHwTest, givenKernelSplitEnqueueReadBufferWhenBlockedThenEnq
     pCmdQ->isQueueBlocked();
 }
 
-HWTEST_F(CommandQueueHwTest, givenDefaultHwCommandQueueThenCacheFlushAfterWalkerIsNotNeeded) {
-    EXPECT_FALSE(pCmdQ->getRequiresCacheFlushAfterWalker());
-}
-
 HWTEST_F(CommandQueueHwTest, givenSizeWhenForceStatelessIsCalledThenCorrectValueIsReturned) {
 
     if (is32bit) {
diff --git a/opencl/test/unit_test/mocks/mock_command_queue.h b/opencl/test/unit_test/mocks/mock_command_queue.h
index 0dda9f9cd5..96de379e91 100644
--- a/opencl/test/unit_test/mocks/mock_command_queue.h
+++ b/opencl/test/unit_test/mocks/mock_command_queue.h
@@ -45,7 +45,6 @@ class MockCommandQueue : public CommandQueue {
     using CommandQueue::queueFamilyIndex;
     using CommandQueue::queueFamilySelected;
     using CommandQueue::queueIndexWithinFamily;
-    using CommandQueue::requiresCacheFlushAfterWalker;
     using CommandQueue::splitBarrierRequired;
     using CommandQueue::throttle;
     using CommandQueue::timestampPacketContainer;
@@ -295,7 +294,6 @@ class MockCommandQueueHw : public CommandQueueHw<GfxFamily> {
     using BaseClass::prepareCsrDependency;
     using BaseClass::processDispatchForKernels;
     using BaseClass::relaxedOrderingForGpgpuAllowed;
-    using BaseClass::requiresCacheFlushAfterWalker;
     using BaseClass::splitBarrierRequired;
     using BaseClass::taskCount;
     using BaseClass::throttle;