When select copy engine round robin over all copy engines

Signed-off-by: Lukasz Jobczyk <[email protected]>

Author: LukaszJobczyk

opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -39,4 +39,31 @@ HWTEST2_F(EngineNodeHelperTestsXeHPAndLater, givenDebugVariableSetWhenAskingForE
             EXPECT_ANY_THROW(EngineHelpers::getBcsEngineType(hwInfo, deviceBitfield, selectorCopyEngine, false));
         }
     }
+}
+
+HWTEST2_F(EngineNodeHelperTestsXeHPAndLater, givenEnableCmdQRoundRobindBcsEngineAssignWhenSelectLinkCopyEngineThenRoundRobinOverAllAvailableLinkedCopyEngines, IsAtLeastXeHpCore) {
+    DebugManagerStateRestore restore;
+    DebugManager.flags.EnableCmdQRoundRobindBcsEngineAssign.set(1u);
+    DeviceBitfield deviceBitfield = 0b10;
+
+    const auto hwInfo = pDevice->getHardwareInfo();
+    auto &selectorCopyEngine = pDevice->getNearestGenericSubDevice(0)->getSelectorCopyEngine();
+
+    int32_t expectedEngineType = aub_stream::EngineType::ENGINE_BCS1;
+    for (int32_t i = 0; i <= 20; i++) {
+        while (!HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSubDeviceEngineSupported(hwInfo, deviceBitfield, static_cast<aub_stream::EngineType>(expectedEngineType))) {
+            expectedEngineType++;
+            if (static_cast<aub_stream::EngineType>(expectedEngineType) > aub_stream::EngineType::ENGINE_BCS8) {
+                expectedEngineType = aub_stream::EngineType::ENGINE_BCS1;
+            }
+        }
+
+        auto engineType = EngineHelpers::selectLinkCopyEngine(hwInfo, deviceBitfield, selectorCopyEngine.selector);
+        EXPECT_EQ(engineType, static_cast<aub_stream::EngineType>(expectedEngineType));
+
+        expectedEngineType++;
+        if (static_cast<aub_stream::EngineType>(expectedEngineType) > aub_stream::EngineType::ENGINE_BCS8) {
+            expectedEngineType = aub_stream::EngineType::ENGINE_BCS1;
+        }
+    }
 }

opencl/test/unit_test/test_files/igdrcl.config

@@ -314,6 +314,7 @@ OverrideUseKmdWaitFunction = -1
 EnableCacheFlushAfterWalkerForAllQueues = -1
 Force32BitDriverSupport = -1
 EnableCmdQRoundRobindEngineAssign = -1
+EnableCmdQRoundRobindBcsEngineAssign = -1
 OverrideCmdQueueSynchronousMode = -1
 UseAtomicsForSelfCleanupSection = -1
 HBMSizePerTileInGigabytes = 0

shared/source/debug_settings/debug_variables_base.inl

@@ -336,6 +336,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, EnableUserFenceUseCtxId, -1, "-1: default (disab
 DECLARE_DEBUG_VARIABLE(int32_t, SetKmdWaitTimeout, -1, "-1: default (infinity), >0: amount of time units for wait function timeout")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideNotifyEnableForTagUpdatePostSync, -1, "-1: default (usage determined by user fence wait call), 0: disable use of NotifyEnable flag, 1: enable use NotifyEnable flag")
 DECLARE_DEBUG_VARIABLE(int32_t, EnableCmdQRoundRobindEngineAssign, -1, "-1: default, 0: disable, 1: enable")
+DECLARE_DEBUG_VARIABLE(int32_t, EnableCmdQRoundRobindBcsEngineAssign, -1, "-1: default, 0: disable, 1: enable")
 DECLARE_DEBUG_VARIABLE(int32_t, Force32BitDriverSupport, -1, "-1: default, 0: disable, 1: enable, Forces the driver to support 32 bit.")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideSystolicPipelineSelect, -1, "set SYSTOLIC MODE ENABLE in PIPELINE_SELECT cmd, -1:default, 0:disable, 1:enable")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideSystolicInComputeWalker, -1, "set SYSTOLIC MODE ENABLE in COMPUTE_WALKER cmd, -1:default, 0:disable, 1:enable")

shared/source/helpers/engine_node_helper.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -153,6 +153,21 @@ bool linkCopyEnginesSupported(const HardwareInfo &hwInfo, const DeviceBitfield &
 }
 
 aub_stream::EngineType selectLinkCopyEngine(const HardwareInfo &hwInfo, const DeviceBitfield &deviceBitfield, std::atomic<uint32_t> &selectorCopyEngine) {
+    auto enableCmdQRoundRobindBcsEngineAssign = false;
+
+    if (DebugManager.flags.EnableCmdQRoundRobindBcsEngineAssign.get() != -1) {
+        enableCmdQRoundRobindBcsEngineAssign = DebugManager.flags.EnableCmdQRoundRobindBcsEngineAssign.get();
+    }
+
+    if (enableCmdQRoundRobindBcsEngineAssign) {
+        aub_stream::EngineType engineType;
+        do {
+            engineType = static_cast<aub_stream::EngineType>(aub_stream::EngineType::ENGINE_BCS1 + (selectorCopyEngine.fetch_add(1u) % 8));
+        } while (!HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSubDeviceEngineSupported(hwInfo, deviceBitfield, engineType));
+
+        return engineType;
+    }
+
     const aub_stream::EngineType engine1 = HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSubDeviceEngineSupported(hwInfo, deviceBitfield, aub_stream::ENGINE_BCS1)
                                                ? aub_stream::ENGINE_BCS1
                                                : aub_stream::ENGINE_BCS4;