From a80dfcc64c53c0285af5846c75f150532e4a491e Mon Sep 17 00:00:00 2001 From: Maciej Bielski Date: Wed, 22 May 2024 13:06:01 +0000 Subject: [PATCH] fix: make EngineInfo::engines protected Make it accessible by respective getter. Related-To: NEO-9754 Signed-off-by: Maciej Bielski --- .../unit_tests/sources/engine/linux/test_zes_engine.cpp | 4 ++-- .../tools/source/sysman/engine/linux/os_engine_imp.cpp | 6 +++--- .../source/sysman/engine/linux/os_engine_imp_prelim.cpp | 8 ++++---- .../sources/sysman/engine/linux/test_zes_engine.cpp | 4 ++-- shared/source/os_interface/linux/engine_info.cpp | 4 ++++ shared/source/os_interface/linux/engine_info.h | 3 ++- .../os_interface/linux/drm_engine_info_prelim_tests.cpp | 2 +- .../os_interface/linux/drm_engine_info_tests.cpp | 2 +- .../os_interface/linux/ioctl_helper_tests_upstream.cpp | 4 ++-- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp index b62eb21fc8..3bb37d8d4f 100644 --- a/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp +++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/test_zes_engine.cpp @@ -222,7 +222,7 @@ TEST_F(ZesEngineFixtureI915, givenEngineInfoQuerySupportedWhenQueryingEngineInfo drm->sysmanQueryEngineInfo(); auto engineInfo = drm->getEngineInfo(); ASSERT_NE(nullptr, engineInfo); - EXPECT_EQ(2u, engineInfo->engines.size()); + EXPECT_EQ(2u, engineInfo->getEngineInfos().size()); } TEST_F(ZesEngineFixtureI915, GivenEngineInfoWithVideoQuerySupportedWhenQueryingEngineInfoWithVideoThenEngineInfoIsCreatedWithEngines) { @@ -234,7 +234,7 @@ TEST_F(ZesEngineFixtureI915, GivenEngineInfoWithVideoQuerySupportedWhenQueryingE drm->sysmanQueryEngineInfo(); auto engineInfo = drm->getEngineInfo(); ASSERT_NE(nullptr, engineInfo); - EXPECT_EQ(2u, engineInfo->engines.size()); + EXPECT_EQ(2u, engineInfo->getEngineInfos().size()); } TEST_F(ZesEngineFixtureI915, GivenEngineInfoWithVideoQueryFailsThenFailureIsReturned) { diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp index 3bcd5e5a4d..620c568a45 100644 --- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp +++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp @@ -92,11 +92,11 @@ LinuxEngineImp::~LinuxEngineImp() { } void LinuxEngineImp::getInstancesFromEngineInfo(NEO::EngineInfo *engineInfo, std::set> &engineGroupInstance) { - for (auto itr = engineInfo->engines.begin(); itr != engineInfo->engines.end(); ++itr) { - auto i915ToEngineMapRange = i915ToEngineMap.equal_range(static_cast<__u16>(itr->engine.engineClass)); + for (const auto &info : engineInfo->getEngineInfos()) { + auto i915ToEngineMapRange = i915ToEngineMap.equal_range(static_cast<__u16>(info.engine.engineClass)); for (auto l0EngineEntryInMap = i915ToEngineMapRange.first; l0EngineEntryInMap != i915ToEngineMapRange.second; l0EngineEntryInMap++) { auto l0EngineType = l0EngineEntryInMap->second; - engineGroupInstance.insert({l0EngineType, {static_cast(itr->engine.engineInstance), 0}}); + engineGroupInstance.insert({l0EngineType, {static_cast(info.engine.engineInstance), 0}}); } } } diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp b/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp index 38f86b456c..179782b2ae 100644 --- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp +++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp_prelim.cpp @@ -259,12 +259,12 @@ ze_result_t LinuxEngineImpPrelim::isEngineModuleSupported() { } void LinuxEngineImpPrelim::getInstancesFromEngineInfo(NEO::EngineInfo *engineInfo, std::set> &engineGroupInstance) { - for (auto itr = engineInfo->engines.begin(); itr != engineInfo->engines.end(); ++itr) { - uint32_t subDeviceId = engineInfo->getEngineTileIndex(itr->engine); - auto i915ToEngineMapRange = i915ToEngineMapPrelim.equal_range(static_cast<__u16>(itr->engine.engineClass)); + for (const auto &info : engineInfo->getEngineInfos()) { + uint32_t subDeviceId = engineInfo->getEngineTileIndex(info.engine); + auto i915ToEngineMapRange = i915ToEngineMapPrelim.equal_range(static_cast<__u16>(info.engine.engineClass)); for (auto l0EngineEntryInMap = i915ToEngineMapRange.first; l0EngineEntryInMap != i915ToEngineMapRange.second; l0EngineEntryInMap++) { auto l0EngineType = l0EngineEntryInMap->second; - engineGroupInstance.insert({l0EngineType, {static_cast(itr->engine.engineInstance), subDeviceId}}); + engineGroupInstance.insert({l0EngineType, {static_cast(info.engine.engineInstance), subDeviceId}}); engineGroupInstance.insert({LinuxEngineImpPrelim::getGroupFromEngineType(l0EngineType), {0u, subDeviceId}}); engineGroupInstance.insert({ZES_ENGINE_GROUP_ALL, {0u, subDeviceId}}); } diff --git a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine.cpp b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine.cpp index de54bd0b85..dd8da2cce6 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/engine/linux/test_zes_engine.cpp @@ -253,7 +253,7 @@ TEST_F(ZesEngineFixture, givenEngineInfoQuerySupportedWhenQueryingEngineInfoThen drm->sysmanQueryEngineInfo(); auto engineInfo = drm->getEngineInfo(); ASSERT_NE(nullptr, engineInfo); - EXPECT_EQ(2u, engineInfo->engines.size()); + EXPECT_EQ(2u, engineInfo->getEngineInfos().size()); } TEST_F(ZesEngineFixture, GivenEngineInfoWithVideoQuerySupportedWhenQueryingEngineInfoWithVideoThenEngineInfoIsCreatedWithEngines) { @@ -265,7 +265,7 @@ TEST_F(ZesEngineFixture, GivenEngineInfoWithVideoQuerySupportedWhenQueryingEngin drm->sysmanQueryEngineInfo(); auto engineInfo = drm->getEngineInfo(); ASSERT_NE(nullptr, engineInfo); - EXPECT_EQ(2u, engineInfo->engines.size()); + EXPECT_EQ(2u, engineInfo->getEngineInfos().size()); } TEST_F(ZesEngineFixture, GivenEngineInfoWithVideoQueryFailsThenFailureIsReturned) { diff --git a/shared/source/os_interface/linux/engine_info.cpp b/shared/source/os_interface/linux/engine_info.cpp index c0b07712b6..ecb6a5d4e1 100644 --- a/shared/source/os_interface/linux/engine_info.cpp +++ b/shared/source/os_interface/linux/engine_info.cpp @@ -228,6 +228,10 @@ bool EngineInfo::hasEngines() { return (tileToEngineMap.size() > 0LU); } +const std::vector &EngineInfo::getEngineInfos() const { + return engines; +} + // EngineIndex = (Base + EngineCounter - 1) aub_stream::EngineType EngineInfo::getBaseCopyEngineType(IoctlHelper *ioctlHelper, uint64_t capabilities, bool isIntegratedDevice) { if (!isIntegratedDevice) { diff --git a/shared/source/os_interface/linux/engine_info.h b/shared/source/os_interface/linux/engine_info.h index 7806e33542..c0ed34a7cd 100644 --- a/shared/source/os_interface/linux/engine_info.h +++ b/shared/source/os_interface/linux/engine_info.h @@ -36,7 +36,7 @@ struct EngineInfo { void getListOfEnginesOnATile(uint32_t tile, std::vector &listOfEngines); std::multimap getEngineTileInfo(); bool hasEngines(); - std::vector engines; + const std::vector &getEngineInfos() const; protected: static aub_stream::EngineType getBaseCopyEngineType(IoctlHelper *ioctlHelper, uint64_t capabilities, bool isIntegratedDevice); @@ -47,6 +47,7 @@ struct EngineInfo { void mapEngine(const NEO::IoctlHelper *ioctlHelper, const EngineClassInstance &engine, BcsInfoMask &bcsInfoMask, const NEO::RootDeviceEnvironment &rootDeviceEnvironment, const aub_stream::EngineType *&mappingCopyEngineIt, uint32_t &computeEnginesCounter, uint32_t tileId = 0u); + std::vector engines; std::vector tileToEngineToInstanceMap; std::multimap tileToEngineMap; }; diff --git a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp index 7cb759bdf7..9b80afd484 100644 --- a/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_prelim_tests.cpp @@ -117,7 +117,7 @@ TEST(DrmTest, givenEngineQueryOnIncorrectSetupWithZeroEnginesThenProperDebugMess testing::internal::CaptureStderr(); drm->queryEngineInfo(); - EXPECT_EQ(0u, drm->engineInfo.get()->engines.size()); + EXPECT_EQ(0u, drm->engineInfo.get()->getEngineInfos().size()); std::string output = testing::internal::GetCapturedStderr(); std::string expectedError = "FATAL: Engine info size is equal to 0.\n"; diff --git a/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp index 3ecca6c013..cd478ef8bd 100644 --- a/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp @@ -40,7 +40,7 @@ TEST(EngineInfoTest, givenEngineInfoQuerySupportedWhenQueryingEngineInfoThenEngi auto engineInfo = drm->getEngineInfo(); ASSERT_NE(nullptr, engineInfo); - EXPECT_EQ(2u, engineInfo->engines.size()); + EXPECT_EQ(2u, engineInfo->getEngineInfos().size()); } TEST(EngineInfoTest, whenQueryingEngineInfoWithoutMemoryInfoThenEngineInfoCreated) { diff --git a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp index d16d2790ae..e975704f4f 100644 --- a/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp +++ b/shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp @@ -586,7 +586,7 @@ TEST(IoctlHelperTestsUpstream, givenUpstreamWhenQueryEngineInfoWithoutDeviceMemo ASSERT_NE(nullptr, engineInfo); std::vector engines; engineInfo->getListOfEnginesOnATile(0, engines); - auto totalEnginesCount = engineInfo->engines.size(); + auto totalEnginesCount = engineInfo->getEngineInfos().size(); EXPECT_TRUE(engineInfo->hasEngines()); EXPECT_EQ(totalEnginesCount, engines.size()); } @@ -607,7 +607,7 @@ TEST(IoctlHelperTestsUpstream, givenUpstreamWhenQueryEngineInfoWithDeviceMemoryA auto engineInfo = drm->getEngineInfo(); std::vector engines; engineInfo->getListOfEnginesOnATile(0, engines); - auto totalEnginesCount = engineInfo->engines.size(); + auto totalEnginesCount = engineInfo->getEngineInfos().size(); ASSERT_NE(nullptr, engineInfo); EXPECT_EQ(totalEnginesCount, engines.size()); }