Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: two engineInstanced-methods removed 

Related-To: NEO-12594

Signed-off-by: Wojciech Konior <wojciech.konior@intel.com>
This commit is contained in:
Wojciech Konior 2024-10-11 16:47:02 +00:00 committed by Compute-Runtime-Automation
parent 5899e926fa
commit 8a6626da23
3 changed files with 1 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
opencl/test/unit_test/device/sub_device_tests.cpp
View File

@ -412,25 +412,6 @@ struct DeviceTests : public ::testing::Test {
return (numCcs == expectedNumCcs);
}
template <typename MockDeviceT>
bool hasEngineInstancedEngines(MockDeviceT *device, aub_stream::EngineType engineType) {
if (device->getAllEngines().size() != 1) {
return false;
}
OsContext *defaultOsContext = device->getDefaultEngine().osContext;
EXPECT_EQ(engineType, defaultOsContext->getEngineType());
EXPECT_EQ(EngineUsage::regular, defaultOsContext->getEngineUsage());
EXPECT_TRUE(defaultOsContext->isDefaultContext());
auto &engine = device->getAllEngines()[0];
EXPECT_EQ(engine.getEngineType(), engineType);
EXPECT_TRUE(engine.osContext->isRegular());
return true;
}
DebugManagerStateRestore restorer;
std::unique_ptr<UltDeviceFactory> deviceFactory;
MockDevice *rootDevice = nullptr;
@ -555,71 +536,6 @@ TEST_F(DeviceTests, givenMultipleClSubDevicesWhenCallingGetSubDeviceThenReturnCo
EXPECT_EQ(clSubDevice.get(), clSubDevice->getNearestGenericSubDevice(0));
}
TEST_F(DeviceTests, givenAffinityMaskSetWhenCreatingDevicesThenFilterMaskedDevices) {
constexpr uint32_t genericDevicesCount = 3;
constexpr uint32_t ccsCount = 4;
constexpr bool supportedGenericSubDevices[3] = {true, false, true};
debugManager.flags.ZE_AFFINITY_MASK.set("0.0.0, 0.0.1, 0.0.2, 0.2.2, 0.2.3, 0.1.5");
if (!createDevices(genericDevicesCount, ccsCount)) {
GTEST_SKIP();
}
EXPECT_TRUE(hasRootCsrOnly(rootDevice));
for (uint32_t i = 0; i < genericDevicesCount; i++) {
if (!supportedGenericSubDevices[i]) {
EXPECT_EQ(nullptr, rootDevice->getSubDevice(i));
continue;
}
auto subDevice = static_cast<MockSubDevice *>(rootDevice->getSubDevice(i));
ASSERT_NE(nullptr, subDevice);
EXPECT_FALSE(subDevice->allEngines[0].osContext->isRootDevice());
EXPECT_EQ(0u, subDevice->getNumSubDevices());
EXPECT_EQ(0u, subDevice->getNumGenericSubDevices());
EXPECT_TRUE(hasAllEngines(subDevice));
}
}
TEST_F(DeviceTests, givenAffinityMaskForSingle3rdLevelDeviceWhenCreatingDevicesThenCreate2ndLevel) {
constexpr uint32_t genericDevicesCount = 2;
constexpr uint32_t ccsCount = 2;
constexpr uint32_t create2ndLevel[2] = {false, true};
debugManager.flags.ZE_AFFINITY_MASK.set("0.0, 0.1.1");
if (!createDevices(genericDevicesCount, ccsCount)) {
GTEST_SKIP();
}
EXPECT_TRUE(hasRootCsrOnly(rootDevice));
for (uint32_t i = 0; i < genericDevicesCount; i++) {
auto subDevice = static_cast<MockSubDevice *>(rootDevice->getSubDevice(i));
ASSERT_NE(nullptr, subDevice);
EXPECT_FALSE(subDevice->allEngines[0].osContext->isRootDevice());
if (create2ndLevel[i]) {
EXPECT_EQ(0u, subDevice->getNumGenericSubDevices());
EXPECT_EQ(0u, subDevice->getNumSubDevices());
continue;
}
EXPECT_TRUE(hasAllEngines(subDevice));
EXPECT_EQ(0u, subDevice->getNumGenericSubDevices());
EXPECT_EQ(0u, subDevice->getNumSubDevices());
}
}
TEST_F(DeviceTests, givenAffinityMaskForSecondLevelOnSingleTileDeviceWithoutDebugFlagWhenCreatingThenDontEnableAllSubDevices) {
constexpr uint32_t genericDevicesCount = 1;
constexpr uint32_t ccsCount = 2;

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

@ -295,11 +295,6 @@ void ExecutionEnvironment::parseAffinityMask() {
affinityMaskHelper[rootDeviceIndex].enableGenericSubDevice(subDeviceIndex); // Mask: X.Y
} else {
UNRECOVERABLE_IF(subEntries.size() != 3);
uint32_t ccsIndex = StringHelpers::toUint32t(subEntries[2]);
if (ccsIndex < hwInfo->gtSystemInfo.CCSInfo.NumberOfCCSEnabled) {
affinityMaskHelper[rootDeviceIndex].enableEngineInstancedSubDevice(subDeviceIndex, ccsIndex); // Mask: X.Y.Z
}
}
}
} else {

6
shared/source/helpers/affinity_mask.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2023 Intel Corporation
* Copyright (C) 2021-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -35,10 +35,6 @@ class AffinityMaskHelper {
enableGenericSubDevice(subDeviceIndex, std::numeric_limits<uint32_t>::max());
}
void enableEngineInstancedSubDevice(uint32_t subDeviceIndex, uint32_t engineIndex) {
enableGenericSubDevice(subDeviceIndex, (1u << engineIndex));
}
void enableAllGenericSubDevices(uint32_t subDeviceCount) {
for (uint32_t i = 0; i < subDeviceCount; i++) {
enableGenericSubDevice(i);