Rename command list tracking debug flag and variables

zzdanowicz · Compute-Runtime-Automation · commit f0888fece2c0 · 2022-09-26T18:59:39.000+02:00
This change reflects exact nature of debug variable and what is code
actually doing

Related-To: NEO-7187

Signed-off-by: Zbigniew Zdanowicz &lt;zbigniew.zdanowicz@intel.com&gt;
diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h
@@ -67,6 +67,7 @@ struct CommandList : _ze_command_list_handle_t {
         CommandType type = Invalid;
     };
     using CommandsToPatch = StackVec<CommandToPatch, 16>;
+    using CmdListReturnPoints = StackVec<CmdListReturnPoint, 32>;
 
     virtual ze_result_t close() = 0;
     virtual ze_result_t destroy() = 0;
@@ -265,7 +266,7 @@ struct CommandList : _ze_command_list_handle_t {
         return commandsToPatch;
     }
 
-    std::vector<CmdListReturnPoint> &getReturnPoints() {
+    CmdListReturnPoints &getReturnPoints() {
         return returnPoints;
     }
 
@@ -305,7 +306,7 @@ struct CommandList : _ze_command_list_handle_t {
     std::map<const void *, NEO::GraphicsAllocation *> hostPtrMap;
     std::vector<NEO::GraphicsAllocation *> ownedPrivateAllocations;
     std::vector<NEO::GraphicsAllocation *> patternAllocations;
-    std::vector<CmdListReturnPoint> returnPoints;
+    CmdListReturnPoints returnPoints;
 
     NEO::StreamProperties requiredStreamState{};
     NEO::StreamProperties finalStreamState{};
@@ -320,7 +321,7 @@ struct CommandList : _ze_command_list_handle_t {
     bool containsCooperativeKernelsFlag = false;
     bool containsStatelessUncachedResource = false;
     bool performMemoryPrefetch = false;
-    bool multiReturnPointCommandList = false;
+    bool frontEndStateTracking = false;
     bool systolicModeSupport = false;
     bool pipelineSelectStateTracking = false;
     bool stateComputeModeTracking = false;
diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl
@@ -123,9 +123,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::initialize(Device *device, NEO
     this->commandListPreemptionMode = device->getDevicePreemptionMode();
     this->engineGroupType = engineGroupType;
     this->flags = flags;
-    if (this->multiReturnPointCommandList) {
-        this->returnPoints.reserve(32);
-    }
+
     auto &hwInfo = device->getHwInfo();
     this->systolicModeSupport = NEO::PreambleHelper<GfxFamily>::isSystolicModeConfigurable(hwInfo);
 
@@ -2352,7 +2350,7 @@ void CommandListCoreFamily<gfxCoreFamily>::updateStreamProperties(Kernel &kernel
             NEO::PreambleHelper<GfxFamily>::programVfeState(pVfeState, hwInfo, 0, 0, device->getMaxNumHwThreads(), finalStreamState, nullptr);
             commandsToPatch.push_back({pVfeStateAddress, pVfeState, CommandToPatch::FrontEndState});
         }
-        if (this->multiReturnPointCommandList) {
+        if (this->frontEndStateTracking) {
             auto &stream = *commandContainer.getCommandStream();
             NEO::EncodeBatchBufferStartOrEnd<GfxFamily>::programBatchBufferEnd(stream);
 
diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp
@@ -27,7 +27,7 @@
 namespace L0 {
 
 CommandList::CommandList(uint32_t numIddsPerBlock) : commandContainer(numIddsPerBlock) {
-    multiReturnPointCommandList = L0HwHelper::enableMultiReturnPointCommandList();
+    frontEndStateTracking = L0HwHelper::enableFrontEndStateTracking();
     pipelineSelectStateTracking = L0HwHelper::enablePipelineSelectStateTracking();
     stateComputeModeTracking = L0HwHelper::enableStateComputeModeTracking();
 }
diff --git a/level_zero/core/source/cmdqueue/cmdqueue.cpp b/level_zero/core/source/cmdqueue/cmdqueue.cpp
@@ -29,7 +29,7 @@ namespace L0 {
 CommandQueueAllocatorFn commandQueueFactory[IGFX_MAX_PRODUCT] = {};
 
 bool CommandQueue::frontEndTrackingEnabled() const {
-    return NEO::DebugManager.flags.AllowPatchingVfeStateInCommandLists.get() || this->multiReturnPointCommandList;
+    return NEO::DebugManager.flags.AllowPatchingVfeStateInCommandLists.get() || this->frontEndStateTracking;
 }
 
 CommandQueueImp::CommandQueueImp(Device *device, NEO::CommandStreamReceiver *csr, const ze_command_queue_desc_t *desc)
@@ -44,7 +44,7 @@ CommandQueueImp::CommandQueueImp(Device *device, NEO::CommandStreamReceiver *csr
         useKmdWaitFunction = !!(overrideUseKmdWaitFunction);
     }
 
-    multiReturnPointCommandList = L0HwHelper::enableMultiReturnPointCommandList();
+    frontEndStateTracking = L0HwHelper::enableFrontEndStateTracking();
     pipelineSelectStateTracking = L0HwHelper::enablePipelineSelectStateTracking();
     stateComputeModeTracking = L0HwHelper::enableStateComputeModeTracking();
 }
diff --git a/level_zero/core/source/cmdqueue/cmdqueue.h b/level_zero/core/source/cmdqueue/cmdqueue.h
@@ -67,7 +67,7 @@ struct CommandQueue : _ze_command_queue_handle_t {
     bool commandQueueDebugCmdsProgrammed = false;
     bool isCopyOnlyCommandQueue = false;
     bool internalUsage = false;
-    bool multiReturnPointCommandList = false;
+    bool frontEndStateTracking = false;
     bool pipelineSelectStateTracking = false;
     bool stateComputeModeTracking = false;
 };
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.h b/level_zero/core/source/cmdqueue/cmdqueue_hw.h
@@ -70,6 +70,16 @@ struct CommandQueueHw : public CommandQueueImp {
 
         inline bool isNEODebuggerActive(Device *device);
 
+        NEO::StreamProperties cmdListBeginState{};
+
+        size_t spaceForResidency = 0;
+        NEO::PreemptionMode preemptionMode{};
+        NEO::PreemptionMode statePreemption{};
+        uint32_t perThreadScratchSpaceSize = 0;
+        uint32_t perThreadPrivateScratchSize = 0;
+        int32_t engineInstanced = -1;
+        UnifiedMemoryControls unifiedMemoryControls{};
+
         bool anyCommandListWithCooperativeKernels = false;
         bool anyCommandListWithoutCooperativeKernels = false;
         bool anyCommandListRequiresDisabledEUFusion = false;
@@ -78,13 +88,6 @@ struct CommandQueueHw : public CommandQueueImp {
         bool containsAnyRegularCmdList = false;
         bool gsbaStateDirty = false;
         bool frontEndStateDirty = false;
-        size_t spaceForResidency = 0;
-        NEO::StreamProperties cmdListBeginState{};
-        NEO::PreemptionMode preemptionMode{};
-        NEO::PreemptionMode statePreemption{};
-        uint32_t perThreadScratchSpaceSize = 0;
-        uint32_t perThreadPrivateScratchSize = 0;
-        int32_t engineInstanced = -1;
         const bool isPreemptionModeInitial{false};
         bool isDevicePreemptionModeMidThread{};
         bool isDebugEnabled{};
@@ -94,7 +97,6 @@ struct CommandQueueHw : public CommandQueueImp {
         bool isDirectSubmissionEnabled{};
         bool isDispatchTaskCountPostSyncRequired{};
         bool hasIndirectAccess{};
-        UnifiedMemoryControls unifiedMemoryControls;
     };
 
     ze_result_t validateCommandListsParams(CommandListExecutionContext &ctx,
diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl
@@ -391,7 +391,7 @@ size_t CommandQueueHw<gfxCoreFamily>::estimateFrontEndCmdSizeForMultipleCommandL
         estimatedSize += singleFrontEndCmdSize;
         isFrontEndStateDirty = false;
     }
-    if (this->multiReturnPointCommandList) {
+    if (this->frontEndStateTracking) {
         uint32_t frontEndChanges = commandList->getReturnPointsSize();
         estimatedSize += (frontEndChanges * singleFrontEndCmdSize);
         estimatedSize += (frontEndChanges * NEO::EncodeBatchBufferStartOrEnd<GfxFamily>::getBatchBufferStartSize());
@@ -1164,8 +1164,9 @@ void CommandQueueHw<gfxCoreFamily>::programOneCmdListPipelineSelect(CommandList
     csrState.pipelineSelect.setProperties(cmdListRequired.pipelineSelect);
 
     if (!preambleSet || csrState.pipelineSelect.isDirty()) {
+        bool systolic = csrState.pipelineSelect.systolicMode.value == 1 ? true : false;
         NEO::PipelineSelectArgs args = {
-            !!csrState.pipelineSelect.systolicMode.value,
+            systolic,
             false,
             false,
             commandList->getSystolicModeSupport()};
diff --git a/level_zero/core/source/hw_helpers/l0_hw_helper.cpp b/level_zero/core/source/hw_helpers/l0_hw_helper.cpp
@@ -15,10 +15,10 @@ L0HwHelper &L0HwHelper::get(GFXCORE_FAMILY gfxCore) {
     return *l0HwHelperFactory[gfxCore];
 }
 
-bool L0HwHelper::enableMultiReturnPointCommandList() {
+bool L0HwHelper::enableFrontEndStateTracking() {
     constexpr bool defaultValue = false;
-    if (NEO::DebugManager.flags.MultiReturnPointCommandList.get() != -1) {
-        return !!NEO::DebugManager.flags.MultiReturnPointCommandList.get();
+    if (NEO::DebugManager.flags.EnableFrontEndTracking.get() != -1) {
+        return !!NEO::DebugManager.flags.EnableFrontEndTracking.get();
     }
     return defaultValue;
 }
diff --git a/level_zero/core/source/hw_helpers/l0_hw_helper.h b/level_zero/core/source/hw_helpers/l0_hw_helper.h
@@ -30,7 +30,7 @@ struct EventPool;
 class L0HwHelper {
   public:
     static L0HwHelper &get(GFXCORE_FAMILY gfxCore);
-    static bool enableMultiReturnPointCommandList();
+    static bool enableFrontEndStateTracking();
     static bool enablePipelineSelectStateTracking();
     static bool enableStateComputeModeTracking();
     virtual void setAdditionalGroupProperty(ze_command_queue_group_properties_t &groupProperty, NEO::EngineGroupT &group) const = 0;
diff --git a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp
@@ -117,7 +117,7 @@ void ModuleMutableCommandListFixture::tearDown() {
 }
 
 void MultiReturnCommandListFixture::setUp() {
-    DebugManager.flags.MultiReturnPointCommandList.set(1);
+    DebugManager.flags.EnableFrontEndTracking.set(1);
     ModuleMutableCommandListFixture::setUp(REVISION_B);
 }
 
diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h
@@ -54,13 +54,13 @@ struct WhiteBox<::L0::CommandListCoreFamily<gfxCoreFamily>>
     using BaseClass::estimateBufferSizeMultiTileBarrier;
     using BaseClass::finalStreamState;
     using BaseClass::flags;
+    using BaseClass::frontEndStateTracking;
     using BaseClass::getAlignedAllocation;
     using BaseClass::getAllocationFromHostPtrMap;
     using BaseClass::getHostPtrAlloc;
     using BaseClass::hostPtrMap;
     using BaseClass::indirectAllocationsAllowed;
     using BaseClass::initialize;
-    using BaseClass::multiReturnPointCommandList;
     using BaseClass::partitionCount;
     using BaseClass::patternAllocations;
     using BaseClass::pipelineSelectStateTracking;
@@ -122,8 +122,8 @@ struct WhiteBox<L0::CommandListCoreFamilyImmediate<gfxCoreFamily>>
     using BaseClass::commandsToPatch;
     using BaseClass::csr;
     using BaseClass::finalStreamState;
+    using BaseClass::frontEndStateTracking;
     using BaseClass::isFlushTaskSubmissionEnabled;
-    using BaseClass::multiReturnPointCommandList;
     using BaseClass::partitionCount;
     using BaseClass::pipelineSelectStateTracking;
     using BaseClass::requiredStreamState;
@@ -147,9 +147,9 @@ struct WhiteBox<::L0::CommandList> : public ::L0::CommandListImp {
     using BaseClass::commandContainer;
     using BaseClass::commandListPreemptionMode;
     using BaseClass::csr;
+    using BaseClass::frontEndStateTracking;
     using BaseClass::initialize;
     using BaseClass::isFlushTaskSubmissionEnabled;
-    using BaseClass::multiReturnPointCommandList;
     using BaseClass::nonImmediateLogicalStateHelper;
     using BaseClass::partitionCount;
     using BaseClass::pipelineSelectStateTracking;
diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h b/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h
@@ -33,8 +33,8 @@ struct WhiteBox<::L0::CommandQueue> : public ::L0::CommandQueueImp {
     using BaseClass::synchronizeByPollingForTaskCount;
     using BaseClass::taskCount;
     using CommandQueue::activeSubDevices;
+    using CommandQueue::frontEndStateTracking;
     using CommandQueue::internalUsage;
-    using CommandQueue::multiReturnPointCommandList;
     using CommandQueue::partitionCount;
     using CommandQueue::pipelineSelectStateTracking;
     using CommandQueue::stateComputeModeTracking;
@@ -66,8 +66,8 @@ struct MockCommandQueueHw : public L0::CommandQueueHw<gfxCoreFamily> {
     using BaseClass::prepareAndSubmitBatchBuffer;
     using BaseClass::printfKernelContainer;
     using L0::CommandQueue::activeSubDevices;
+    using L0::CommandQueue::frontEndStateTracking;
     using L0::CommandQueue::internalUsage;
-    using L0::CommandQueue::multiReturnPointCommandList;
     using L0::CommandQueue::partitionCount;
     using L0::CommandQueue::pipelineSelectStateTracking;
     using L0::CommandQueue::preemptionCmdSyncProgramming;
diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp
@@ -2001,11 +2001,13 @@ HWTEST2_F(CommandListCreate, givenNullEventWhenAppendEventAfterWalkerThenNothing
     EXPECT_EQ(commandList->commandContainer.getCommandStream()->getUsed(), usedBefore);
 }
 
-TEST_F(CommandListCreate, givenCreatedCommandListWhenGettingMultiReturnPointFlagThenDefaultValuseIsFalse) {
+TEST_F(CommandListCreate, givenCreatedCommandListWhenGettingTrackingFlagsThenDefaultValuseIsFalse) {
     ze_result_t returnValue;
     std::unique_ptr<L0::ult::CommandList> commandList(whiteboxCast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue)));
     ASSERT_NE(nullptr, commandList.get());
-    EXPECT_FALSE(commandList->multiReturnPointCommandList);
+    EXPECT_FALSE(commandList->frontEndStateTracking);
+    EXPECT_FALSE(commandList->pipelineSelectStateTracking);
+    EXPECT_FALSE(commandList->stateComputeModeTracking);
 }
 
 } // namespace ult
diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp
@@ -558,12 +558,12 @@ HWTEST2_F(CmdlistAppendLaunchKernelTests,
 
 using MultiReturnCommandListTest = Test<MultiReturnCommandListFixture>;
 
-HWTEST2_F(MultiReturnCommandListTest, givenMultiReturnIsUsedWhenPropertyDisableEuFusionSupportedThenExpectReturnPointsAndBbEndProgramming, IsAtLeastSkl) {
+HWTEST2_F(MultiReturnCommandListTest, givenFrontEndTrackingIsUsedWhenPropertyDisableEuFusionSupportedThenExpectReturnPointsAndBbEndProgramming, IsAtLeastSkl) {
     using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END;
     NEO::FrontEndPropertiesSupport fePropertiesSupport = {};
     NEO::HwInfoConfig::get(productFamily)->fillFrontEndPropertiesSupportStructure(fePropertiesSupport, device->getHwInfo());
 
-    EXPECT_TRUE(commandList->multiReturnPointCommandList);
+    EXPECT_TRUE(commandList->frontEndStateTracking);
 
     auto &cmdStream = *commandList->commandContainer.getCommandStream();
     auto &cmdBuffers = commandList->commandContainer.getCmdBufferAllocations();
@@ -724,12 +724,12 @@ HWTEST2_F(MultiReturnCommandListTest, givenMultiReturnIsUsedWhenPropertyDisableE
     }
 }
 
-HWTEST2_F(MultiReturnCommandListTest, givenMultiReturnIsUsedWhenPropertyComputeDispatchAllWalkerSupportedThenExpectReturnPointsAndBbEndProgramming, IsAtLeastSkl) {
+HWTEST2_F(MultiReturnCommandListTest, givenFrontEndTrackingIsUsedWhenPropertyComputeDispatchAllWalkerSupportedThenExpectReturnPointsAndBbEndProgramming, IsAtLeastSkl) {
     using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END;
     NEO::FrontEndPropertiesSupport fePropertiesSupport = {};
     NEO::HwInfoConfig::get(productFamily)->fillFrontEndPropertiesSupportStructure(fePropertiesSupport, device->getHwInfo());
 
-    EXPECT_TRUE(commandList->multiReturnPointCommandList);
+    EXPECT_TRUE(commandList->frontEndStateTracking);
 
     NEO::DebugManager.flags.AllowMixingRegularAndCooperativeKernels.set(1);
 
@@ -886,16 +886,16 @@ HWTEST2_F(MultiReturnCommandListTest, givenMultiReturnIsUsedWhenPropertyComputeD
 }
 
 HWTEST2_F(MultiReturnCommandListTest,
-          givenMultiReturnCmdListIsExecutedWhenPropertyDisableEuFusionSupportedThenExpectFrontEndProgrammingInCmdQueue, IsAtLeastSkl) {
+          givenFrontEndTrackingCmdListIsExecutedWhenPropertyDisableEuFusionSupportedThenExpectFrontEndProgrammingInCmdQueue, IsAtLeastSkl) {
     using VFE_STATE_TYPE = typename FamilyType::VFE_STATE_TYPE;
     using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START;
     using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END;
 
     NEO::FrontEndPropertiesSupport fePropertiesSupport = {};
     NEO::HwInfoConfig::get(productFamily)->fillFrontEndPropertiesSupportStructure(fePropertiesSupport, device->getHwInfo());
 
-    EXPECT_TRUE(commandList->multiReturnPointCommandList);
-    EXPECT_TRUE(commandQueue->multiReturnPointCommandList);
+    EXPECT_TRUE(commandList->frontEndStateTracking);
+    EXPECT_TRUE(commandQueue->frontEndStateTracking);
 
     auto &cmdListStream = *commandList->commandContainer.getCommandStream();
     auto &cmdListBuffers = commandList->commandContainer.getCmdBufferAllocations();
@@ -1135,7 +1135,7 @@ HWTEST2_F(MultiReturnCommandListTest,
 }
 
 HWTEST2_F(MultiReturnCommandListTest,
-          givenMultiReturnCmdListIsExecutedWhenPropertyComputeDispatchAllWalkerSupportedThenExpectFrontEndProgrammingInCmdQueue, IsAtLeastSkl) {
+          givenFrontEndTrackingCmdListIsExecutedWhenPropertyComputeDispatchAllWalkerSupportedThenExpectFrontEndProgrammingInCmdQueue, IsAtLeastSkl) {
     using VFE_STATE_TYPE = typename FamilyType::VFE_STATE_TYPE;
     using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START;
     using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END;
@@ -1145,8 +1145,8 @@ HWTEST2_F(MultiReturnCommandListTest,
 
     NEO::DebugManager.flags.AllowMixingRegularAndCooperativeKernels.set(1);
 
-    EXPECT_TRUE(commandList->multiReturnPointCommandList);
-    EXPECT_TRUE(commandQueue->multiReturnPointCommandList);
+    EXPECT_TRUE(commandList->frontEndStateTracking);
+    EXPECT_TRUE(commandQueue->frontEndStateTracking);
 
     auto &cmdListStream = *commandList->commandContainer.getCommandStream();
     auto &cmdListBuffers = commandList->commandContainer.getCmdBufferAllocations();
@@ -1389,8 +1389,8 @@ HWTEST2_F(MultiReturnCommandListTest, givenCmdQueueAndImmediateCmdListUseSameCsr
     NEO::FrontEndPropertiesSupport fePropertiesSupport = {};
     NEO::HwInfoConfig::get(productFamily)->fillFrontEndPropertiesSupportStructure(fePropertiesSupport, device->getHwInfo());
 
-    EXPECT_TRUE(commandList->multiReturnPointCommandList);
-    EXPECT_TRUE(commandListImmediate->multiReturnPointCommandList);
+    EXPECT_TRUE(commandList->frontEndStateTracking);
+    EXPECT_TRUE(commandListImmediate->frontEndStateTracking);
 
     auto &regularCmdListStream = *commandList->commandContainer.getCommandStream();
 
@@ -1514,8 +1514,8 @@ HWTEST2_F(MultiReturnCommandListTest, givenCmdQueueAndImmediateCmdListUseSameCsr
     NEO::FrontEndPropertiesSupport fePropertiesSupport = {};
     NEO::HwInfoConfig::get(productFamily)->fillFrontEndPropertiesSupportStructure(fePropertiesSupport, device->getHwInfo());
 
-    EXPECT_TRUE(commandList->multiReturnPointCommandList);
-    EXPECT_TRUE(commandListImmediate->multiReturnPointCommandList);
+    EXPECT_TRUE(commandList->frontEndStateTracking);
+    EXPECT_TRUE(commandListImmediate->frontEndStateTracking);
 
     auto cmdQueueCsr = commandQueue->getCsr();
     auto &csrProperties = cmdQueueCsr->getStreamProperties();
diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp
@@ -1798,7 +1798,7 @@ TEST_F(CommandQueueCreate, givenOverrideCmdQueueSyncModeToSynchronousWhenCommand
     commandQueue->destroy();
 }
 
-TEST_F(CommandQueueCreate, givenCreatedCommandQueueWhenGettingMultiReturnPointFlagThenDefaultValuseIsFalse) {
+TEST_F(CommandQueueCreate, givenCreatedCommandQueueWhenGettingTrackingFlagsThenDefaultValuseIsFalse) {
     const ze_command_queue_desc_t desc{};
     ze_result_t returnValue;
     auto commandQueue = whiteboxCast(CommandQueue::create(productFamily,
@@ -1811,7 +1811,9 @@ TEST_F(CommandQueueCreate, givenCreatedCommandQueueWhenGettingMultiReturnPointFl
 
     EXPECT_EQ(returnValue, ZE_RESULT_SUCCESS);
     ASSERT_NE(nullptr, commandQueue);
-    EXPECT_FALSE(commandQueue->multiReturnPointCommandList);
+    EXPECT_FALSE(commandQueue->frontEndStateTracking);
+    EXPECT_FALSE(commandQueue->pipelineSelectStateTracking);
+    EXPECT_FALSE(commandQueue->stateComputeModeTracking);
 
     commandQueue->destroy();
 }
diff --git a/shared/source/command_container/cmdcontainer.h b/shared/source/command_container/cmdcontainer.h
diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl
diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`namespace L0 {`
`28`	`28`
`29`	`29`	`CommandList::CommandList(uint32_t numIddsPerBlock) : commandContainer(numIddsPerBlock) {`
`30`		`- multiReturnPointCommandList = L0HwHelper::enableMultiReturnPointCommandList();`
	`30`	`+ frontEndStateTracking = L0HwHelper::enableFrontEndStateTracking();`
`31`	`31`	`pipelineSelectStateTracking = L0HwHelper::enablePipelineSelectStateTracking();`
`32`	`32`	`stateComputeModeTracking = L0HwHelper::enableStateComputeModeTracking();`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace L0 {`
`29`	`29`	`CommandQueueAllocatorFn commandQueueFactory[IGFX_MAX_PRODUCT] = {};`
`30`	`30`
`31`	`31`	`bool CommandQueue::frontEndTrackingEnabled() const {`
`32`		`- return NEO::DebugManager.flags.AllowPatchingVfeStateInCommandLists.get() \|\| this->multiReturnPointCommandList;`
	`32`	`+ return NEO::DebugManager.flags.AllowPatchingVfeStateInCommandLists.get() \|\| this->frontEndStateTracking;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`CommandQueueImp::CommandQueueImp(Device device, NEO::CommandStreamReceiver csr, const ze_command_queue_desc_t *desc)`
`@@ -44,7 +44,7 @@ CommandQueueImp::CommandQueueImp(Device device, NEO::CommandStreamReceiver csr`
`44`	`44`	`useKmdWaitFunction = !!(overrideUseKmdWaitFunction);`
`45`	`45`	`}`
`46`	`46`
`47`		`- multiReturnPointCommandList = L0HwHelper::enableMultiReturnPointCommandList();`
	`47`	`+ frontEndStateTracking = L0HwHelper::enableFrontEndStateTracking();`
`48`	`48`	`pipelineSelectStateTracking = L0HwHelper::enablePipelineSelectStateTracking();`
`49`	`49`	`stateComputeModeTracking = L0HwHelper::enableStateComputeModeTracking();`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ L0HwHelper &L0HwHelper::get(GFXCORE_FAMILY gfxCore) {`
`15`	`15`	`return *l0HwHelperFactory[gfxCore];`
`16`	`16`	`}`
`17`	`17`
`18`		`-bool L0HwHelper::enableMultiReturnPointCommandList() {`
	`18`	`+bool L0HwHelper::enableFrontEndStateTracking() {`
`19`	`19`	`constexpr bool defaultValue = false;`
`20`		`- if (NEO::DebugManager.flags.MultiReturnPointCommandList.get() != -1) {`
`21`		`- return !!NEO::DebugManager.flags.MultiReturnPointCommandList.get();`
	`20`	`+ if (NEO::DebugManager.flags.EnableFrontEndTracking.get() != -1) {`
	`21`	`+ return !!NEO::DebugManager.flags.EnableFrontEndTracking.get();`
`22`	`22`	`}`
`23`	`23`	`return defaultValue;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ void ModuleMutableCommandListFixture::tearDown() {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`void MultiReturnCommandListFixture::setUp() {`
`120`		`- DebugManager.flags.MultiReturnPointCommandList.set(1);`
	`120`	`+ DebugManager.flags.EnableFrontEndTracking.set(1);`
`121`	`121`	`ModuleMutableCommandListFixture::setUp(REVISION_B);`
`122`	`122`	`}`
`123`	`123`