Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use enum class instead of enum for DeviceHierarchyMode

Browse Source 
Related-To: GSD-9560
Signed-off-by: Jaroslaw Warchulski <jaroslaw.warchulski@intel.com>
This commit is contained in:
Jaroslaw Warchulski
2025-01-16 14:25:29 +00:00
committed by Compute-Runtime-Automation
parent 7d8e08f00b
commit 4dd1c80362
18 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/source/device/device.cpp
View File

@ -93,7 +93,7 @@ bool Device::genericSubDevicesAllowed() {
deviceBitfield = maxNBitValue(subDeviceCount);
deviceBitfield &= deviceMask;
numSubDevices = static_cast<uint32_t>(deviceBitfield.count());
if (numSubDevices == 1 && (executionEnvironment->getDeviceHierarchyMode() != COMBINED || subDeviceCount == 1)) {
if (numSubDevices == 1 && (executionEnvironment->getDeviceHierarchyMode() != DeviceHierarchyMode::combined || subDeviceCount == 1)) {
numSubDevices = 0;
}

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

@ -220,7 +220,7 @@ void ExecutionEnvironment::parseAffinityMask() {
}
// If the user has requested FLAT or COMBINED device hierarchy models, then report all the sub devices as devices.
bool exposeSubDevices = this->deviceHierarchyMode != COMPOSITE;
bool exposeSubDevices = this->deviceHierarchyMode != DeviceHierarchyMode::composite;
// Reserve at least for a size equal to rootDeviceEnvironments.size() times four,
// which is enough for typical configurations
@ -316,11 +316,11 @@ void ExecutionEnvironment::setDeviceHierarchyMode(const GfxCoreHelper &gfxCoreHe
NEO::EnvironmentVariableReader envReader;
std::string deviceHierarchyMode = envReader.getSetting("ZE_FLAT_DEVICE_HIERARCHY", std::string(""));
if (strcmp(deviceHierarchyMode.c_str(), "COMPOSITE") == 0) {
this->deviceHierarchyMode = COMPOSITE;
this->deviceHierarchyMode = DeviceHierarchyMode::composite;
} else if (strcmp(deviceHierarchyMode.c_str(), "FLAT") == 0) {
this->deviceHierarchyMode = FLAT;
this->deviceHierarchyMode = DeviceHierarchyMode::flat;
} else if (strcmp(deviceHierarchyMode.c_str(), "COMBINED") == 0) {
this->deviceHierarchyMode = COMBINED;
this->deviceHierarchyMode = DeviceHierarchyMode::combined;
} else {
this->deviceHierarchyMode = gfxCoreHelper.getDefaultDeviceHierarchy();
}

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

@ -87,7 +87,7 @@ class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment>
bool metricsEnabled = false;
bool fp64EmulationEnabled = false;
DeviceHierarchyMode deviceHierarchyMode = COMPOSITE;
DeviceHierarchyMode deviceHierarchyMode = DeviceHierarchyMode::composite;
DebuggingMode debuggingEnabledMode = DebuggingMode::disabled;
std::unordered_map<uint32_t, uint32_t> rootDeviceNumCcsMap;
std::mutex initializeDirectSubmissionControllerMutex;

8
shared/source/helpers/device_hierarchy_mode.h
View File

@ -8,9 +8,9 @@
#pragma once
namespace NEO {
enum DeviceHierarchyMode {
COMPOSITE,
FLAT,
COMBINED
enum class DeviceHierarchyMode : uint32_t {
composite,
flat,
combined
};
};

2
shared/source/helpers/gfx_core_helper_base.inl
View File

@ -682,7 +682,7 @@ uint32_t GfxCoreHelperHw<GfxFamily>::calculateNumThreadsPerThreadGroup(uint32_t
template <typename GfxFamily>
DeviceHierarchyMode GfxCoreHelperHw<GfxFamily>::getDefaultDeviceHierarchy() const {
return COMPOSITE;
return DeviceHierarchyMode::composite;
}
template <typename GfxFamily>

2
shared/source/xe_hpc_core/gfx_core_helper_xe_hpc_core.cpp
View File

@ -300,7 +300,7 @@ bool GfxCoreHelperHw<Family>::isRelaxedOrderingSupported() const {
template <>
DeviceHierarchyMode GfxCoreHelperHw<Family>::getDefaultDeviceHierarchy() const {
return FLAT;
return DeviceHierarchyMode::flat;
}
} // namespace NEO

4
shared/test/unit_test/execution_environment/execution_environment_tests.cpp
View File

@ -558,7 +558,7 @@ TEST(ExecutionEnvironment, givenCorrectZeAffinityMaskWithFlatOrCombinedHierarchy
auto hwInfo = *defaultHwInfo;
DeviceHierarchyMode deviceHierarchyModes[] = {FLAT, COMBINED};
DeviceHierarchyMode deviceHierarchyModes[] = {DeviceHierarchyMode::flat, DeviceHierarchyMode::combined};
for (auto deviceHierarchyMode : deviceHierarchyModes) {
MockExecutionEnvironment executionEnvironment(&hwInfo);
executionEnvironment.incRefInternal();
@ -579,7 +579,7 @@ TEST(ExecutionEnvironment, givenIncorrectZeAffinityMaskWithFlatOrCombinedHierarc
auto hwInfo = *defaultHwInfo;
DeviceHierarchyMode deviceHierarchyModes[] = {FLAT, COMBINED};
DeviceHierarchyMode deviceHierarchyModes[] = {DeviceHierarchyMode::flat, DeviceHierarchyMode::combined};
for (auto deviceHierarchyMode : deviceHierarchyModes) {
MockExecutionEnvironment executionEnvironment(&hwInfo);
executionEnvironment.incRefInternal();

2
shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
View File

@ -1696,7 +1696,7 @@ HWTEST_F(GfxCoreHelperTest, givenFlagRemoveRestrictionsOnNumberOfThreadsInGpgpuT
HWTEST2_F(GfxCoreHelperTest, whenGetDefaultDeviceHierarchyThenReturnCompositeHierarchy, IsNotXeHpcCore) {
const auto &gfxCoreHelper = getHelper<GfxCoreHelper>();
auto defaultDeviceHierarchy = gfxCoreHelper.getDefaultDeviceHierarchy();
EXPECT_EQ(COMPOSITE, defaultDeviceHierarchy);
EXPECT_EQ(DeviceHierarchyMode::composite, defaultDeviceHierarchy);
}
HWTEST_F(GfxCoreHelperTest, givenContextGroupDisabledWhenContextGroupContextsCountAndSecondaryContextsSupportQueriedThenZeroCountAndFalseIsReturned) {

2
shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp
View File

@ -113,5 +113,5 @@ XE_HPC_CORETEST_F(GfxCoreHelperXeHpcCoreTest, whenGetDefaultDeviceHierarchyThenR
auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<GfxCoreHelper>();
auto defaultDeviceHierarchy = gfxCoreHelper.getDefaultDeviceHierarchy();
EXPECT_EQ(FLAT, defaultDeviceHierarchy);
EXPECT_EQ(DeviceHierarchyMode::flat, defaultDeviceHierarchy);
}