Do not program thread arbitration policy on command list init and reset

This logic is now redundant and can be removed.

Related-To: NEO-6728

Signed-off-by: Filip Hazubski <[email protected]>

Author: fhazubski-Intel

level_zero/core/source/cmdlist/cmdlist_hw.h

@@ -239,7 +239,6 @@ struct CommandListCoreFamily : CommandListImp {
     void appendEventForProfilingCopyCommand(ze_event_handle_t hEvent, bool beforeWalker);
     void appendSignalEventPostWalker(ze_event_handle_t hEvent);
     void programStateBaseAddress(NEO::CommandContainer &container, bool genericMediaStateClearRequired);
-    void programThreadArbitrationPolicy(Device *device);
     void appendComputeBarrierCommand();
     NEO::PipeControlArgs createBarrierFlags();
     void appendMultiTileBarrier(NEO::Device &neoDevice);

level_zero/core/source/cmdlist/cmdlist_hw.inl

@@ -70,20 +70,6 @@ CommandListCoreFamily<gfxCoreFamily>::~CommandListCoreFamily() {
     this->patternAllocations.clear();
 }
 
-template <GFXCORE_FAMILY gfxCoreFamily>
-void CommandListCoreFamily<gfxCoreFamily>::programThreadArbitrationPolicy(Device *device) {
-    using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
-    auto &hwHelper = NEO::HwHelper::get(device->getNEODevice()->getHardwareInfo().platform.eRenderCoreFamily);
-    auto threadArbitrationPolicy = hwHelper.getDefaultThreadArbitrationPolicy();
-    if (NEO::DebugManager.flags.OverrideThreadArbitrationPolicy.get() != -1) {
-        threadArbitrationPolicy = static_cast<uint32_t>(NEO::DebugManager.flags.OverrideThreadArbitrationPolicy.get());
-    }
-    NEO::StreamProperties streamProperties{};
-    streamProperties.stateComputeMode.threadArbitrationPolicy.set(threadArbitrationPolicy);
-    NEO::EncodeComputeMode<GfxFamily>::programComputeModeCommand(*commandContainer.getCommandStream(), streamProperties.stateComputeMode,
-                                                                 this->device->getHwInfo());
-}
-
 template <GFXCORE_FAMILY gfxCoreFamily>
 ze_result_t CommandListCoreFamily<gfxCoreFamily>::reset() {
     printfFunctionContainer.clear();
@@ -115,7 +101,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::reset() {
             programStateBaseAddress(commandContainer, false);
         }
         commandContainer.setDirtyStateForAllHeaps(false);
-        programThreadArbitrationPolicy(device);
     }
 
     for (auto alloc : this->ownedPrivateAllocations) {
@@ -160,7 +145,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::initialize(Device *device, NEO
                 }
             }
             commandContainer.setDirtyStateForAllHeaps(false);
-            programThreadArbitrationPolicy(device);
         }
     }
 

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp

@@ -284,7 +284,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenMemoryCopyRegionHavingHostMemor
         cmdList, ptrOffset(commandContainer.getCommandStream()->getCpuBase(), 0), commandContainer.getCommandStream()->getUsed()));
 
     auto allPcCommands = findAll<PIPE_CONTROL *>(cmdList.begin(), cmdList.end());
-    EXPECT_EQ(8u, allPcCommands.size());
+    EXPECT_EQ(7u, allPcCommands.size());
 }
 
 HWTEST2_F(CommandListCreate, givenCommandListWhenMemoryCopyRegionHavingDeviceMemoryWithSignalAndWaitEventsUsingRenderEngineThenPipeControlIsNotFound, PlatformSupport) {
@@ -331,7 +331,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenMemoryCopyRegionHavingDeviceMem
         cmdList, ptrOffset(commandContainer.getCommandStream()->getCpuBase(), 0), commandContainer.getCommandStream()->getUsed()));
 
     auto allPcCommands = findAll<PIPE_CONTROL *>(cmdList.begin(), cmdList.end());
-    EXPECT_EQ(7u, allPcCommands.size());
+    EXPECT_EQ(6u, allPcCommands.size());
 
     context->freeMem(srcBuffer);
     context->freeMem(dstBuffer);
@@ -374,7 +374,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenMemoryFillHavingDeviceMemoryWit
         cmdList, ptrOffset(commandContainer.getCommandStream()->getCpuBase(), 0), commandContainer.getCommandStream()->getUsed()));
 
     auto allPcCommands = findAll<PIPE_CONTROL *>(cmdList.begin(), cmdList.end());
-    EXPECT_EQ(7u, allPcCommands.size());
+    EXPECT_EQ(6u, allPcCommands.size());
 
     context->freeMem(dstBuffer);
 }
@@ -417,7 +417,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenMemoryFillHavingSharedMemoryWit
         cmdList, ptrOffset(commandContainer.getCommandStream()->getCpuBase(), 0), commandContainer.getCommandStream()->getUsed()));
 
     auto allPcCommands = findAll<PIPE_CONTROL *>(cmdList.begin(), cmdList.end());
-    EXPECT_EQ(8u, allPcCommands.size());
+    EXPECT_EQ(7u, allPcCommands.size());
 
     context->freeMem(dstBuffer);
 }
@@ -460,7 +460,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenMemoryFillHavingHostMemoryWithS
         cmdList, ptrOffset(commandContainer.getCommandStream()->getCpuBase(), 0), commandContainer.getCommandStream()->getUsed()));
 
     auto allPcCommands = findAll<PIPE_CONTROL *>(cmdList.begin(), cmdList.end());
-    EXPECT_EQ(7u, allPcCommands.size());
+    EXPECT_EQ(6u, allPcCommands.size());
 
     context->freeMem(dstBuffer);
 }
@@ -506,7 +506,7 @@ HWTEST2_F(CommandListCreate, givenCommandListWhenMemoryFillHavingEventsWithDevic
     auto itor = find<SEMAPHORE_WAIT *>(cmdList.begin(), cmdList.end());
     EXPECT_NE(cmdList.end(), itor);
     auto allPcCommands = findAll<PIPE_CONTROL *>(cmdList.begin(), cmdList.end());
-    EXPECT_EQ(7u, allPcCommands.size());
+    EXPECT_EQ(6u, allPcCommands.size());
     auto cmd = genCmdCast<PIPE_CONTROL *>(*allPcCommands.back());
     EXPECT_TRUE(cmd->getDcFlushEnable());
 

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp

@@ -950,9 +950,6 @@ HWTEST2_F(HostPointerManagerCommandListTest, givenCommandListWhenMemoryFillWithS
     EXPECT_NE(cmdList.end(), itor);
     itor++;
     itor = find<PIPE_CONTROL *>(itor, cmdList.end());
-    EXPECT_NE(cmdList.end(), itor);
-    itor++;
-    itor = find<PIPE_CONTROL *>(itor, cmdList.end());
     EXPECT_EQ(cmdList.end(), itor);
 }