Limit number of CCS engines on PVC

Expose only one CCS engine

Related-To: NEO-7195
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

shared/source/execution_environment/execution_environment.cpp

@@ -199,4 +199,14 @@ void ExecutionEnvironment::parseAffinityMask() {
 
     rootDeviceEnvironments.swap(filteredEnvironments);
 }
+
+void ExecutionEnvironment::adjustCcsCount() const {
+    for (auto &rootDeviceEnvironment : rootDeviceEnvironments) {
+        UNRECOVERABLE_IF(!rootDeviceEnvironment);
+        auto hwInfo = rootDeviceEnvironment->getMutableHardwareInfo();
+        auto hwInfoConfig = HwInfoConfig::get(hwInfo->platform.eProductFamily);
+        hwInfoConfig->adjustNumberOfCcs(*hwInfo);
+    }
+}
+
 } // namespace NEO

shared/source/execution_environment/execution_environment.h

@@ -27,6 +27,7 @@ class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment>
     virtual void prepareRootDeviceEnvironments(uint32_t numRootDevices);
     void prepareRootDeviceEnvironment(const uint32_t rootDeviceIndexForReInit);
     void parseAffinityMask();
+    void adjustCcsCount() const;
     void sortNeoDevices();
     void sortNeoDevicesDRM();
     void sortNeoDevicesWDDM();

shared/source/os_interface/device_factory.cpp

@@ -99,6 +99,7 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE
     }
 
     executionEnvironment.parseAffinityMask();
+    executionEnvironment.adjustCcsCount();
     executionEnvironment.calculateMaxOsContextCount();
     return true;
 }
@@ -158,6 +159,7 @@ bool DeviceFactory::prepareDeviceEnvironments(ExecutionEnvironment &executionEnv
 
     executionEnvironment.sortNeoDevices();
     executionEnvironment.parseAffinityMask();
+    executionEnvironment.adjustCcsCount();
     executionEnvironment.calculateMaxOsContextCount();
 
     return true;

shared/source/os_interface/hw_info_config.h

@@ -132,6 +132,7 @@ class HwInfoConfig {
     virtual bool isAssignEngineRoundRobinSupported() const = 0;
     virtual uint32_t getL1CachePolicy() const = 0;
     virtual bool isEvictionWhenNecessaryFlagSupported() const = 0;
+    virtual void adjustNumberOfCcs(HardwareInfo &hwInfo) const = 0;
 
     MOCKABLE_VIRTUAL ~HwInfoConfig() = default;
 
@@ -234,6 +235,7 @@ class HwInfoConfigHw : public HwInfoConfig {
     bool isAssignEngineRoundRobinSupported() const override;
     uint32_t getL1CachePolicy() const override;
     bool isEvictionWhenNecessaryFlagSupported() const override;
+    void adjustNumberOfCcs(HardwareInfo &hwInfo) const override;
 
   protected:
     HwInfoConfigHw() = default;

shared/source/os_interface/hw_info_config.inl

@@ -480,4 +480,6 @@ uint32_t HwInfoConfigHw<gfxProduct>::getL1CachePolicy() const {
     return L1CachePolicyHelper<gfxProduct>::getL1CachePolicy();
 }
 
+template <PRODUCT_FAMILY gfxProduct>
+void HwInfoConfigHw<gfxProduct>::adjustNumberOfCcs(HardwareInfo &hwInfo) const {}
 } // namespace NEO

shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl

@@ -193,4 +193,9 @@ bool HwInfoConfigHw<gfxProduct>::isComputeDispatchAllWalkerEnableInCfeStateRequi
 template <>
 bool HwInfoConfigHw<gfxProduct>::isIpSamplingSupported(const HardwareInfo &hwInfo) const {
     return PVC::isXt(hwInfo);
+}
+
+template <>
+void HwInfoConfigHw<gfxProduct>::adjustNumberOfCcs(HardwareInfo &hwInfo) const {
+    hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 1;
 }

shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt

@@ -8,6 +8,7 @@ if(TESTS_PVC)
   set(NEO_SHARED_TESTS_PVC
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/device_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp

shared/test/unit_test/xe_hpc_core/pvc/device_tests_pvc.cpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
+#include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/ult_hw_config.h"
+#include "shared/test/common/mocks/mock_device.h"
+#include "shared/test/common/mocks/mock_execution_environment.h"
+#include "shared/test/common/mocks/ult_device_factory.h"
+#include "shared/test/common/test_macros/header/per_product_test_definitions.h"
+#include "shared/test/common/test_macros/test.h"
+
+using namespace NEO;
+
+using DeviceTestsPvc = ::testing::Test;
+
+PVCTEST_F(DeviceTestsPvc, WhenDeviceIsCreatedThenOnlyOneCcsEngineIsExposed) {
+    VariableBackup<UltHwConfig> backup(&ultHwConfig);
+    ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false;
+    DebugManagerStateRestore restorer;
+    DebugManager.flags.SetCommandStreamReceiver.set(1);
+    auto hwInfo = *defaultHwInfo;
+
+    hwInfo.featureTable.flags.ftrCCSNode = 1;
+    hwInfo.gtSystemInfo.CCSInfo.IsValid = 1;
+    hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
+
+    MockExecutionEnvironment executionEnvironment(&hwInfo);
+    executionEnvironment.incRefInternal();
+
+    UltDeviceFactory deviceFactory{1, 0, executionEnvironment};
+
+    auto device = deviceFactory.rootDevices[0];
+
+    auto computeEngineGroupIndex = device->getEngineGroupIndexFromEngineGroupType(EngineGroupType::Compute);
+    auto computeEngineGroup = device->getRegularEngineGroups()[computeEngineGroupIndex];
+    EXPECT_EQ(1u, computeEngineGroup.engines.size());
+}