Skip disabled engines when round robin over copy engines

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

Author: LukaszJobczyk

opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp

@@ -46,12 +46,13 @@ HWTEST2_F(EngineNodeHelperTestsXeHPAndLater, givenEnableCmdQRoundRobindBcsEngine
     DebugManager.flags.EnableCmdQRoundRobindBcsEngineAssign.set(1u);
     DeviceBitfield deviceBitfield = 0b10;
 
-    const auto hwInfo = pDevice->getHardwareInfo();
+    auto hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
+    hwInfo.featureTable.ftrBcsInfo.set(7);
     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))) {
+        while (!HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSubDeviceEngineSupported(hwInfo, deviceBitfield, static_cast<aub_stream::EngineType>(expectedEngineType)) || !hwInfo.featureTable.ftrBcsInfo.test(expectedEngineType - aub_stream::EngineType::ENGINE_BCS1 + 1)) {
             expectedEngineType++;
             if (static_cast<aub_stream::EngineType>(expectedEngineType) > aub_stream::EngineType::ENGINE_BCS8) {
                 expectedEngineType = aub_stream::EngineType::ENGINE_BCS1;

shared/source/helpers/engine_node_helper.cpp

@@ -162,8 +162,8 @@ aub_stream::EngineType selectLinkCopyEngine(const HardwareInfo &hwInfo, const De
     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));
+            engineType = static_cast<aub_stream::EngineType>(aub_stream::EngineType::ENGINE_BCS1 + (selectorCopyEngine.fetch_add(1u) % EngineHelpers::numLinkedCopyEngines));
+        } while (!HwHelper::get(hwInfo.platform.eRenderCoreFamily).isSubDeviceEngineSupported(hwInfo, deviceBitfield, engineType) || !hwInfo.featureTable.ftrBcsInfo.test(engineType - aub_stream::EngineType::ENGINE_BCS1 + 1));
 
         return engineType;
     }

shared/source/helpers/engine_node_helper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -64,6 +64,8 @@ constexpr bool isLinkBcs(aub_stream::EngineType engineType) {
     return engineType >= aub_stream::ENGINE_BCS1 && engineType <= aub_stream::ENGINE_BCS8;
 }
 
+constexpr uint32_t numLinkedCopyEngines = 8u;
+
 bool linkCopyEnginesSupported(const HardwareInfo &hwInfo, const DeviceBitfield &deviceBitfield);
 
 aub_stream::EngineType selectLinkCopyEngine(const HardwareInfo &hwInfo, const DeviceBitfield &deviceBitfield, std::atomic<uint32_t> &selectorCopyEngine);