Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-11-15 10:14:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Limit number of CCS engines on PVC"

Browse Source 
This reverts commit 8f8370be32.

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-08-08 16:50:09 +02:00
committed by Compute-Runtime-Automation
parent ed0c36117e
commit 3b3d40252e
8 changed files with 0 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shared/source/execution_environment/execution_environment.cpp
View File

@@ -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

1
shared/source/execution_environment/execution_environment.h
View File

@@ -27,7 +27,6 @@ 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();

2
shared/source/os_interface/device_factory.cpp
View File

@@ -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;

2
shared/source/os_interface/hw_info_config.h
View File

@@ -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;

2
shared/source/os_interface/hw_info_config.inl
View File

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

5
shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl
View File

@@ -193,9 +193,4 @@ 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;
}

1
shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
View File

@@ -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

43
shared/test/unit_test/xe_hpc_core/pvc/device_tests_pvc.cpp
View File

@@ -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<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());
}