Add root CSR to engine groups

Signed-off-by: Maciej Dziuban <[email protected]>
Related-To: NEO-5120

Author: DziubanMaciejIntel

opencl/source/cl_device/cl_device_caps.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -361,24 +361,16 @@ void ClDevice::initializeCaps() {
     }
 
     const std::vector<std::vector<EngineControl>> &queueFamilies = this->getDevice().getEngineGroups();
-    if (queueFamilies.size() > 0) {
-        for (int queueFamilyIndex = 0; queueFamilyIndex < static_cast<int>(EngineGroupType::MaxEngineGroups); queueFamilyIndex++) {
-            const std::vector<EngineControl> &enginesInFamily = queueFamilies.at(queueFamilyIndex);
-            if (enginesInFamily.size() > 0) {
-                const auto engineGroupType = static_cast<EngineGroupType>(queueFamilyIndex);
-                cl_queue_family_properties_intel properties;
-                properties.capabilities = getQueueFamilyCapabilities(engineGroupType);
-                properties.count = static_cast<cl_uint>(enginesInFamily.size());
-                properties.properties = deviceInfo.queueOnHostProperties;
-                deviceInfo.queueFamilyProperties.push_back(properties);
-            }
+    for (size_t queueFamilyIndex = 0u; queueFamilyIndex < queueFamilies.size(); queueFamilyIndex++) {
+        const std::vector<EngineControl> &enginesInFamily = queueFamilies.at(queueFamilyIndex);
+        if (enginesInFamily.size() > 0) {
+            const auto engineGroupType = static_cast<EngineGroupType>(queueFamilyIndex);
+            cl_queue_family_properties_intel properties;
+            properties.capabilities = getQueueFamilyCapabilities(engineGroupType);
+            properties.count = static_cast<cl_uint>(enginesInFamily.size());
+            properties.properties = deviceInfo.queueOnHostProperties;
+            deviceInfo.queueFamilyProperties.push_back(properties);
         }
-    } else {
-        cl_queue_family_properties_intel properties;
-        properties.capabilities = CL_QUEUE_DEFAULT_CAPABILITIES_INTEL;
-        properties.count = 1;
-        properties.properties = deviceInfo.queueOnHostProperties;
-        deviceInfo.queueFamilyProperties.push_back(properties);
     }
 
     deviceInfo.preemptionSupported = false;

opencl/test/unit_test/command_queue/command_queue_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -1347,6 +1347,8 @@ struct CommandQueueOnSpecificEngineTests : ::testing::Test {
 
         EngineGroupType getEngineGroupType(aub_stream::EngineType engineType, const HardwareInfo &hwInfo) const override {
             switch (engineType) {
+            case aub_stream::ENGINE_RCS:
+                return EngineGroupType::RenderCompute;
             case aub_stream::ENGINE_CCS:
                 return EngineGroupType::Compute;
             case aub_stream::ENGINE_BCS:

opencl/test/unit_test/device/device_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -350,6 +350,13 @@ TEST(DeviceCreation, givenDeviceWhenCheckingParentDeviceThenCorrectValueIsReturn
     EXPECT_EQ(deviceFactory.rootDevices[1], deviceFactory.subDevices[3]->getParentDevice());
 }
 
+TEST(DeviceCreation, givenRootDeviceWithSubDevicesWhenCheckingEngineGroupsThenItHasOneNonEmptyGroup) {
+    UltDeviceFactory deviceFactory{1, 2};
+    EXPECT_EQ(static_cast<size_t>(EngineGroupType::MaxEngineGroups), deviceFactory.rootDevices[0]->getEngineGroups().size());
+    EXPECT_NE(nullptr, deviceFactory.rootDevices[0]->getNonEmptyEngineGroup(0));
+    EXPECT_EQ(nullptr, deviceFactory.rootDevices[0]->getNonEmptyEngineGroup(1));
+}
+
 using DeviceHwTest = ::testing::Test;
 
 HWTEST_F(DeviceHwTest, givenHwHelperInputWhenInitializingCsrThenCreatePageTableManagerIfNeeded) {

opencl/test/unit_test/device/get_device_info_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -696,6 +696,8 @@ class MockHwHelper : public HwHelperHw<GfxFamily> {
 
     EngineGroupType getEngineGroupType(aub_stream::EngineType engineType, const HardwareInfo &hwInfo) const override {
         switch (engineType) {
+        case aub_stream::ENGINE_RCS:
+            return EngineGroupType::RenderCompute;
         case aub_stream::ENGINE_CCS:
             return EngineGroupType::Compute;
         case aub_stream::ENGINE_BCS:

shared/source/device/root_device.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -99,6 +99,7 @@ bool RootDevice::createEngines() {
     if (getNumSubDevices() < 2) {
         return Device::createEngines();
     } else {
+        this->engineGroups.resize(static_cast<uint32_t>(EngineGroupType::MaxEngineGroups));
         initializeRootCommandStreamReceiver();
     }
     return true;
@@ -118,7 +119,10 @@ void RootDevice::initializeRootCommandStreamReceiver() {
     rootCommandStreamReceiver->initializeTagAllocation();
     rootCommandStreamReceiver->createGlobalFenceAllocation();
     commandStreamReceivers.push_back(std::move(rootCommandStreamReceiver));
-    engines.emplace_back(commandStreamReceivers.back().get(), osContext);
+
+    EngineControl engine{commandStreamReceivers.back().get(), osContext};
+    engines.push_back(engine);
+    addEngineToEngineGroup(engine);
 }
 
 } // namespace NEO

shared/test/unit_test/mocks/mock_device.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -31,6 +31,7 @@ MockDevice::MockDevice()
     this->executionEnvironment->memoryManager = std::move(this->mockMemoryManager);
     this->engines.resize(1);
     this->engines[0] = {commandStreamReceiver, nullptr};
+    this->engineGroups.resize(static_cast<uint32_t>(EngineGroupType::MaxEngineGroups));
     initializeCaps();
 }
 
@@ -45,6 +46,7 @@ MockDevice::MockDevice(ExecutionEnvironment *executionEnvironment, uint32_t root
     bool aubUsage = (testMode == TestMode::AubTests) || (testMode == TestMode::AubTestsWithTbx);
     this->mockMemoryManager.reset(new MemoryManagerCreate<OsAgnosticMemoryManager>(false, enableLocalMemory, aubUsage, *executionEnvironment));
     this->osTime = MockOSTime::create();
+    this->engineGroups.resize(static_cast<uint32_t>(EngineGroupType::MaxEngineGroups));
     executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->setHwInfo(&hwInfo);
     executionEnvironment->initializeMemoryManager();
     initializeCaps();