Create Root CSR only for Devices with Generic SubDevices

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

Author: BartoszDunajski

opencl/test/unit_test/device/sub_device_tests.cpp

@@ -244,7 +244,8 @@ TEST(RootDevicesTest, givenRootDeviceWithSubdevicesWhenCreateEnginesThenDeviceCr
 
     auto executionEnvironment = new MockExecutionEnvironment;
     MockDevice device(executionEnvironment, 0);
-    device.numSubDevices = 2;
+    device.createSubDevices();
+    EXPECT_EQ(2u, device.getNumAvailableDevices());
     EXPECT_EQ(0u, device.engines.size());
     device.createEngines();
     EXPECT_EQ(1u, device.engines.size());
@@ -305,6 +306,8 @@ TEST(SubDevicesTest, givenDebugFlagSetAndMoreThanOneCcsWhenCreatingRootDeviceWit
 
     EXPECT_EQ(ccsCount, rootDevice->getNumAvailableDevices());
 
+    EXPECT_FALSE(rootDevice->engines[0].osContext->isRootDevice());
+
     for (uint32_t i = 0; i < ccsCount; i++) {
         auto engineType = static_cast<aub_stream::EngineType>(aub_stream::EngineType::ENGINE_CCS + i);
         auto subDevice = static_cast<MockSubDevice *>(rootDevice->getDeviceById(i));
@@ -329,6 +332,7 @@ TEST(SubDevicesTest, givenDebugFlagSetAndSingleCcsWhenCreatingRootDeviceWithoutG
 
     auto &rootDevice = deviceFactory.rootDevices[0];
 
+    EXPECT_FALSE(rootDevice->engines[0].osContext->isRootDevice());
     EXPECT_EQ(1u, rootDevice->getNumAvailableDevices());
     EXPECT_FALSE(rootDevice->getDeviceById(0)->isSubDevice());
 }
@@ -346,11 +350,14 @@ TEST(SubDevicesTest, givenDebugFlagSetWhenCreatingRootDeviceWithGenericSubDevice
     UltDeviceFactory deviceFactory(1, 2, *executionEnvironment);
 
     auto &rootDevice = deviceFactory.rootDevices[0];
+    EXPECT_EQ(1u, rootDevice->engines.size());
+    EXPECT_TRUE(rootDevice->engines[0].osContext->isRootDevice());
 
     for (uint32_t i = 0; i < 2; i++) {
         auto subDevice = static_cast<MockSubDevice *>(rootDevice->getDeviceById(i));
         ASSERT_NE(nullptr, subDevice);
 
+        EXPECT_FALSE(subDevice->engines[0].osContext->isRootDevice());
         EXPECT_FALSE(subDevice->engineInstanced);
         EXPECT_EQ(1u, subDevice->getNumAvailableDevices());
         EXPECT_EQ(aub_stream::EngineType::NUM_ENGINES, subDevice->engineType);
@@ -373,10 +380,14 @@ TEST(SubDevicesTest, givenDebugFlagSetWhenCreatingRootDeviceWithGenericSubDevice
 
     auto &rootDevice = deviceFactory.rootDevices[0];
 
+    EXPECT_EQ(1u, rootDevice->engines.size());
+    EXPECT_TRUE(rootDevice->engines[0].osContext->isRootDevice());
+
     for (uint32_t i = 0; i < 2; i++) {
         auto subDevice = static_cast<MockSubDevice *>(rootDevice->getDeviceById(i));
         ASSERT_NE(nullptr, subDevice);
 
+        EXPECT_FALSE(subDevice->engines[0].osContext->isRootDevice());
         EXPECT_FALSE(subDevice->engineInstanced);
         EXPECT_EQ(ccsCount, subDevice->getNumAvailableDevices());
         EXPECT_EQ(aub_stream::EngineType::NUM_ENGINES, subDevice->engineType);
@@ -386,6 +397,7 @@ TEST(SubDevicesTest, givenDebugFlagSetWhenCreatingRootDeviceWithGenericSubDevice
             auto engineSubDevice = static_cast<MockSubDevice *>(subDevice->getDeviceById(j));
             ASSERT_NE(nullptr, engineSubDevice);
 
+            EXPECT_FALSE(engineSubDevice->engines[0].osContext->isRootDevice());
             EXPECT_TRUE(engineSubDevice->engineInstanced);
             EXPECT_EQ(1u, engineSubDevice->getNumAvailableDevices());
             EXPECT_EQ(engineType, engineSubDevice->engineType);

shared/source/device/device.cpp

@@ -118,6 +118,7 @@ bool Device::createGenericSubDevices() {
         subdevices[i] = subDevice;
     }
 
+    hasGenericSubDevices = true;
     return true;
 }
 

shared/source/device/device.h

@@ -155,6 +155,7 @@ class Device : public ReferenceTrackedObject<Device> {
     ExecutionEnvironment *executionEnvironment = nullptr;
     uint32_t defaultEngineIndex = 0;
     uint32_t numSubDevices = 0;
+    bool hasGenericSubDevices = false;
 
     std::atomic<uint32_t> selectorCopyEngine{0};
 

shared/source/device/root_device.cpp

@@ -44,12 +44,13 @@ void RootDevice::createBindlessHeapsHelper() {
 }
 
 bool RootDevice::createEngines() {
-    if (getNumSubDevices() < 2) {
-        return Device::createEngines();
-    } else {
+    if (hasGenericSubDevices) {
         this->engineGroups.resize(static_cast<uint32_t>(EngineGroupType::MaxEngineGroups));
         initializeRootCommandStreamReceiver();
+    } else {
+        return Device::createEngines();
     }
+
     return true;
 }
 

shared/test/common/mocks/mock_device.h

@@ -28,6 +28,7 @@ extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executio
                                                   const DeviceBitfield deviceBitfield);
 
 struct MockSubDevice : public SubDevice {
+    using Device::engines;
     using SubDevice::engineInstanced;
     using SubDevice::engineType;
     using SubDevice::getDeviceBitfield;
@@ -45,6 +46,7 @@ class MockDevice : public RootDevice {
     using Device::commandStreamReceivers;
     using Device::createDeviceInternals;
     using Device::createEngine;
+    using Device::createSubDevices;
     using Device::deviceInfo;
     using Device::engineGroups;
     using Device::engines;