From 8a6626da23c22d829980c144b011f97ca9db33dd Mon Sep 17 00:00:00 2001 From: Wojciech Konior Date: Fri, 11 Oct 2024 16:47:02 +0000 Subject: [PATCH] refactor: two engineInstanced-methods removed Related-To: NEO-12594 Signed-off-by: Wojciech Konior --- .../unit_test/device/sub_device_tests.cpp | 84 ------------------- .../execution_environment.cpp | 5 -- shared/source/helpers/affinity_mask.h | 6 +- 3 files changed, 1 insertion(+), 94 deletions(-) diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index 4c3ce96ea2..197c5fc787 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -412,25 +412,6 @@ struct DeviceTests : public ::testing::Test { return (numCcs == expectedNumCcs); } - template - 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 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(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(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; diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp index 0fbc092ae5..bd3e5a049d 100644 --- a/shared/source/execution_environment/execution_environment.cpp +++ b/shared/source/execution_environment/execution_environment.cpp @@ -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 { diff --git a/shared/source/helpers/affinity_mask.h b/shared/source/helpers/affinity_mask.h index fc3f337907..6295765636 100644 --- a/shared/source/helpers/affinity_mask.h +++ b/shared/source/helpers/affinity_mask.h @@ -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::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);