Second level affinity mask support

Signed-off-by: Bartosz Dunajski <[email protected]>

Author: BartoszDunajski

opencl/test/unit_test/device/sub_device_tests.cpp

@@ -799,6 +799,25 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSecondLevelOnSingleTileDe
 
     DebugManager.flags.AllowSingleTileEngineInstancedSubDevices.set(true);
 
+    DebugManager.flags.ZE_AFFINITY_MASK.set("0.0, 0.4");
+
+    if (!createDevices(genericDevicesCount, ccsCount)) {
+        GTEST_SKIP();
+    }
+
+    EXPECT_FALSE(hasRootCsrOnly(rootDevice));
+
+    EXPECT_TRUE(rootDevice->isEngineInstanced());
+    EXPECT_EQ(0u, rootDevice->getNumGenericSubDevices());
+    EXPECT_EQ(0u, rootDevice->getNumSubDevices());
+}
+
+TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSecondLevelOnSingleTileDeviceSingleEngineWhenCreatingThenDontEnableEngineInstancedDevices) {
+    constexpr uint32_t genericDevicesCount = 1;
+    constexpr uint32_t ccsCount = 1;
+
+    DebugManager.flags.AllowSingleTileEngineInstancedSubDevices.set(true);
+
     DebugManager.flags.ZE_AFFINITY_MASK.set("0.0");
 
     if (!createDevices(genericDevicesCount, ccsCount)) {
@@ -809,7 +828,7 @@ TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSecondLevelOnSingleTileDe
 
     EXPECT_FALSE(rootDevice->isEngineInstanced());
     EXPECT_EQ(0u, rootDevice->getNumGenericSubDevices());
-    EXPECT_EQ(ccsCount, rootDevice->getNumSubDevices());
+    EXPECT_EQ(0u, rootDevice->getNumSubDevices());
 }
 
 TEST_F(EngineInstancedDeviceTests, givenAffinityMaskForSecondLevelOnSingleTileDeviceWithoutDebugFlagWhenCreatingThenDontEnableAllEngineInstancedDevices) {

shared/source/execution_environment/execution_environment.cpp

@@ -136,7 +136,17 @@ void ExecutionEnvironment::parseAffinityMask() {
             if (subEntries.size() > 1) {
                 uint32_t subDeviceIndex = StringHelpers::toUint32t(subEntries[1]);
 
-                if (subDeviceIndex < subDevicesCount) {
+                bool enableSecondLevelEngineInstanced = ((subDevicesCount == 1) &&
+                                                         (hwInfo->gtSystemInfo.CCSInfo.NumberOfCCSEnabled > 1) &&
+                                                         DebugManager.flags.AllowSingleTileEngineInstancedSubDevices.get());
+
+                if (enableSecondLevelEngineInstanced) {
+                    UNRECOVERABLE_IF(subEntries.size() != 2);
+
+                    if (subDeviceIndex < hwInfo->gtSystemInfo.CCSInfo.NumberOfCCSEnabled) {
+                        affinityMaskHelper[rootDeviceIndex].enableEngineInstancedSubDevice(0, subDeviceIndex); // Mask: X.Y
+                    }
+                } else if (subDeviceIndex < subDevicesCount) {
                     if (subEntries.size() == 2) {
                         affinityMaskHelper[rootDeviceIndex].enableGenericSubDevice(subDeviceIndex); // Mask: X.Y
                     } else {