Revert "fix: choose proper csr for low priority immediate command lists"

Signed-off-by: Michal Mrozek <[email protected]>

Author: MichalMrozek

level_zero/core/source/device/device_imp.cpp

@@ -303,7 +303,7 @@ ze_result_t DeviceImp::createCommandQueue(const ze_command_queue_desc_t *desc,
     bool isCopyOnly = NEO::EngineHelper::isCopyOnlyEngineType(
         getEngineGroupTypeForOrdinal(commandQueueDesc.ordinal));
 
-    if (isSuitableForLowPriority(commandQueueDesc.priority, isCopyOnly)) {
+    if (commandQueueDesc.priority == ZE_COMMAND_QUEUE_PRIORITY_PRIORITY_LOW && !isCopyOnly) {
         getCsrForLowPriority(&csr);
     } else {
         auto ret = getCsrForOrdinalAndIndexWithPriority(&csr, commandQueueDesc.ordinal, commandQueueDesc.index, commandQueueDesc.priority);
@@ -1676,9 +1676,6 @@ ze_result_t DeviceImp::getCsrForOrdinalAndIndexWithPriority(NEO::CommandStreamRe
                 }
             }
         }
-    } else if (isSuitableForLowPriority(priority, NEO::EngineHelper::isCopyOnlyEngineType(
-                                                      getEngineGroupTypeForOrdinal(ordinal)))) {
-        return getCsrForLowPriority(csr);
     }
 
     return getCsrForOrdinalAndIndex(csr, ordinal, index);
@@ -1703,10 +1700,6 @@ ze_result_t DeviceImp::getCsrForLowPriority(NEO::CommandStreamReceiver **csr) {
     return ZE_RESULT_ERROR_UNKNOWN;
 }
 
-bool DeviceImp::isSuitableForLowPriority(ze_command_queue_priority_t priority, bool copyOnly) {
-    return (priority == ZE_COMMAND_QUEUE_PRIORITY_PRIORITY_LOW && !copyOnly);
-}
-
 DebugSession *DeviceImp::getDebugSession(const zet_debug_config_t &config) {
     return debugSession.get();
 }

level_zero/core/source/device/device_imp.h

@@ -114,7 +114,6 @@ struct DeviceImp : public Device, NEO::NonCopyableOrMovableClass {
     ze_result_t getCsrForOrdinalAndIndex(NEO::CommandStreamReceiver **csr, uint32_t ordinal, uint32_t index) override;
     ze_result_t getCsrForOrdinalAndIndexWithPriority(NEO::CommandStreamReceiver **csr, uint32_t ordinal, uint32_t index, ze_command_queue_priority_t priority) override;
     ze_result_t getCsrForLowPriority(NEO::CommandStreamReceiver **csr) override;
-    bool isSuitableForLowPriority(ze_command_queue_priority_t priority, bool copyOnly);
     NEO::GraphicsAllocation *obtainReusableAllocation(size_t requiredSize, NEO::AllocationType type) override;
     void storeReusableAllocation(NEO::GraphicsAllocation &alloc) override;
     NEO::Device *getActiveDevice() const;

level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp

@@ -879,28 +879,6 @@ TEST_F(DeferredContextCreationDeviceCreateCommandQueueTest, givenLowPriorityEngi
     commandQueue->destroy();
 }
 
-using DeviceCreateCommandQueueTest = Test<DeviceFixture>;
-TEST_F(DeviceCreateCommandQueueTest, givenLowPriorityDescWhenCreateImmediateCommandListThenLowPriorityCsrIsAssigned) {
-    ze_command_queue_desc_t desc{};
-    desc.ordinal = 0u;
-    desc.index = 0u;
-    desc.priority = ZE_COMMAND_QUEUE_PRIORITY_PRIORITY_LOW;
-
-    ze_command_list_handle_t commandListHandle = {};
-
-    ze_result_t res = device->createCommandListImmediate(&desc, &commandListHandle);
-
-    EXPECT_EQ(ZE_RESULT_SUCCESS, res);
-    auto commandList = static_cast<CommandListImp *>(L0::CommandList::fromHandle(commandListHandle));
-
-    EXPECT_NE(commandList, nullptr);
-    EXPECT_TRUE(commandList->getCsr()->getOsContext().isLowPriority());
-    NEO::CommandStreamReceiver *csr = nullptr;
-    device->getCsrForLowPriority(&csr);
-    EXPECT_EQ(commandList->getCsr(), csr);
-    commandList->destroy();
-}
-
 TEST_F(DeviceCreateCommandQueueTest, givenNormalPriorityDescWhenCreateCommandQueueIsCalledWithValidArgumentThenCsrIsAssignedWithOrdinalAndIndex) {
     ze_command_queue_desc_t desc{};
     desc.ordinal = 0u;