diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp index 3fb7e430bd..e5371a969a 100644 --- a/shared/source/execution_environment/execution_environment.cpp +++ b/shared/source/execution_environment/execution_environment.cpp @@ -199,14 +199,4 @@ 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 diff --git a/shared/source/execution_environment/execution_environment.h b/shared/source/execution_environment/execution_environment.h index 3be61668bc..0284e34177 100644 --- a/shared/source/execution_environment/execution_environment.h +++ b/shared/source/execution_environment/execution_environment.h @@ -27,7 +27,6 @@ class ExecutionEnvironment : public ReferenceTrackedObject virtual void prepareRootDeviceEnvironments(uint32_t numRootDevices); void prepareRootDeviceEnvironment(const uint32_t rootDeviceIndexForReInit); void parseAffinityMask(); - void adjustCcsCount() const; void sortNeoDevices(); void sortNeoDevicesDRM(); void sortNeoDevicesWDDM(); diff --git a/shared/source/os_interface/device_factory.cpp b/shared/source/os_interface/device_factory.cpp index db7b8e4c54..43f052a0fe 100644 --- a/shared/source/os_interface/device_factory.cpp +++ b/shared/source/os_interface/device_factory.cpp @@ -99,7 +99,6 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE } executionEnvironment.parseAffinityMask(); - executionEnvironment.adjustCcsCount(); executionEnvironment.calculateMaxOsContextCount(); return true; } @@ -159,7 +158,6 @@ bool DeviceFactory::prepareDeviceEnvironments(ExecutionEnvironment &executionEnv executionEnvironment.sortNeoDevices(); executionEnvironment.parseAffinityMask(); - executionEnvironment.adjustCcsCount(); executionEnvironment.calculateMaxOsContextCount(); return true; diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h index a9bea81957..fffcf558e3 100644 --- a/shared/source/os_interface/hw_info_config.h +++ b/shared/source/os_interface/hw_info_config.h @@ -132,7 +132,6 @@ 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; @@ -235,7 +234,6 @@ 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; diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl index a7f797d317..7bea59134a 100644 --- a/shared/source/os_interface/hw_info_config.inl +++ b/shared/source/os_interface/hw_info_config.inl @@ -480,6 +480,4 @@ uint32_t HwInfoConfigHw::getL1CachePolicy() const { return L1CachePolicyHelper::getL1CachePolicy(); } -template -void HwInfoConfigHw::adjustNumberOfCcs(HardwareInfo &hwInfo) const {} } // namespace NEO diff --git a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl index f391956ca7..5dfb53dd5a 100644 --- a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl +++ b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl @@ -193,9 +193,4 @@ bool HwInfoConfigHw::isComputeDispatchAllWalkerEnableInCfeStateRequi template <> bool HwInfoConfigHw::isIpSamplingSupported(const HardwareInfo &hwInfo) const { return PVC::isXt(hwInfo); -} - -template <> -void HwInfoConfigHw::adjustNumberOfCcs(HardwareInfo &hwInfo) const { - hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 1; } \ No newline at end of file diff --git a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt index d283fd5b05..937db3ee26 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt +++ b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt @@ -8,7 +8,6 @@ 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 diff --git a/shared/test/unit_test/xe_hpc_core/pvc/device_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/device_tests_pvc.cpp deleted file mode 100644 index da2c1b9f47..0000000000 --- a/shared/test/unit_test/xe_hpc_core/pvc/device_tests_pvc.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 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()); -}