From f55ad93bafacebfdd8df7a5315620917e3d46d80 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 12 Nov 2024 11:13:52 +0000 Subject: [PATCH] fix: remove L3 config from release helper L3 bank count should be queried from KMD L3 bank size should be queried from device blob Signed-off-by: Mateusz Jablonski --- shared/source/helpers/hw_info.cpp | 7 ---- shared/source/release_helper/release_helper.h | 4 -- .../release_helper/release_helper_base.inl | 10 ----- .../test/common/mocks/mock_release_helper.h | 2 - .../test/unit_test/helpers/hw_info_tests.cpp | 40 +------------------ 5 files changed, 1 insertion(+), 62 deletions(-) diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp index 60d4c86a8a..380a6dcb4e 100644 --- a/shared/source/helpers/hw_info.cpp +++ b/shared/source/helpers/hw_info.cpp @@ -148,13 +148,6 @@ void setupDefaultGtSysInfo(HardwareInfo *hwInfo, const ReleaseHelper *releaseHel gtSysInfo->MaxDualSubSlicesSupported = gtSysInfo->DualSubSliceCount; } - if (releaseHelper->getL3BankCount() > 0) { - gtSysInfo->L3BankCount = releaseHelper->getL3BankCount(); - } - if (releaseHelper->getL3CacheBankSizeInKb() > 0) { - gtSysInfo->L3CacheSizeInKb = gtSysInfo->L3BankCount * releaseHelper->getL3CacheBankSizeInKb(); - } - gtSysInfo->ThreadCount = gtSysInfo->EUCount * releaseHelper->getNumThreadsPerEu(); } diff --git a/shared/source/release_helper/release_helper.h b/shared/source/release_helper/release_helper.h index a7eaa298ee..94fdcca0bf 100644 --- a/shared/source/release_helper/release_helper.h +++ b/shared/source/release_helper/release_helper.h @@ -55,8 +55,6 @@ class ReleaseHelper { virtual const ThreadsPerEUConfigs getThreadsPerEUConfigs(uint32_t numThreadsPerEu) const = 0; virtual const std::string getDeviceConfigString(uint32_t tileCount, uint32_t sliceCount, uint32_t subSliceCount, uint32_t euPerSubSliceCount) const = 0; virtual bool isRayTracingSupported() const = 0; - virtual uint32_t getL3BankCount() const = 0; - virtual uint64_t getL3CacheBankSizeInKb() const = 0; virtual uint32_t getAdditionalFp16Caps() const = 0; virtual uint32_t getAdditionalExtraCaps() const = 0; virtual uint32_t getStackSizePerRay() const = 0; @@ -97,8 +95,6 @@ class ReleaseHelperHw : public ReleaseHelper { const StackVec getThreadsPerEUConfigs(uint32_t numThreadsPerEu) const override; const std::string getDeviceConfigString(uint32_t tileCount, uint32_t sliceCount, uint32_t subSliceCount, uint32_t euPerSubSliceCount) const override; bool isRayTracingSupported() const override; - uint32_t getL3BankCount() const override; - uint64_t getL3CacheBankSizeInKb() const override; uint32_t getAdditionalFp16Caps() const override; uint32_t getAdditionalExtraCaps() const override; uint32_t getStackSizePerRay() const override; diff --git a/shared/source/release_helper/release_helper_base.inl b/shared/source/release_helper/release_helper_base.inl index 29c70aec40..ca97dab172 100644 --- a/shared/source/release_helper/release_helper_base.inl +++ b/shared/source/release_helper/release_helper_base.inl @@ -122,16 +122,6 @@ bool ReleaseHelperHw::isRayTracingSupported() const { return true; } -template -uint32_t ReleaseHelperHw::getL3BankCount() const { - return 0; -} - -template -uint64_t ReleaseHelperHw::getL3CacheBankSizeInKb() const { - return 0; -} - template uint32_t ReleaseHelperHw::getAdditionalFp16Caps() const { return 0u; diff --git a/shared/test/common/mocks/mock_release_helper.h b/shared/test/common/mocks/mock_release_helper.h index 4410e361cb..147d021386 100644 --- a/shared/test/common/mocks/mock_release_helper.h +++ b/shared/test/common/mocks/mock_release_helper.h @@ -35,8 +35,6 @@ class MockReleaseHelper : public ReleaseHelper { ADDMETHOD_CONST_NOBASE(getThreadsPerEUConfigs, const ThreadsPerEUConfigs, {}, (uint32_t numThreadsPerEu)); ADDMETHOD_CONST_NOBASE(getDeviceConfigString, const std::string, {}, (uint32_t tileCount, uint32_t sliceCount, uint32_t subSliceCount, uint32_t euPerSubSliceCount)); ADDMETHOD_CONST_NOBASE(isRayTracingSupported, bool, true, ()); - ADDMETHOD_CONST_NOBASE(getL3BankCount, uint32_t, 0u, ()); - ADDMETHOD_CONST_NOBASE(getL3CacheBankSizeInKb, uint64_t, {}, ()); ADDMETHOD_CONST_NOBASE(getAdditionalFp16Caps, uint32_t, {}, ()); ADDMETHOD_CONST_NOBASE(getAdditionalExtraCaps, uint32_t, {}, ()); ADDMETHOD_CONST_NOBASE(getStackSizePerRay, uint32_t, {}, ()); diff --git a/shared/test/unit_test/helpers/hw_info_tests.cpp b/shared/test/unit_test/helpers/hw_info_tests.cpp index e687b71a6b..ce20c955d2 100644 --- a/shared/test/unit_test/helpers/hw_info_tests.cpp +++ b/shared/test/unit_test/helpers/hw_info_tests.cpp @@ -6,48 +6,10 @@ */ #include "shared/source/helpers/hw_info.h" -#include "shared/test/common/helpers/gtest_helpers.h" -#include "shared/test/common/mocks/mock_release_helper.h" #include "shared/test/common/test_macros/test.h" + using namespace NEO; -TEST(HwInfoTest, givenReleaseHelperWithL3BankConfigWhenSetupDefaultHwInfoThenL3ConfigIsProperlySet) { - HardwareInfo hwInfo{}; - MockReleaseHelper releaseHelper; - - releaseHelper.getL3BankCountResult = 0; - releaseHelper.getL3CacheBankSizeInKbResult = 0; - - setupDefaultGtSysInfo(&hwInfo, &releaseHelper); - - EXPECT_EQ_VAL(0u, hwInfo.gtSystemInfo.L3BankCount); - EXPECT_EQ_VAL(1u, hwInfo.gtSystemInfo.L3CacheSizeInKb); - - releaseHelper.getL3BankCountResult = 0; - releaseHelper.getL3CacheBankSizeInKbResult = 4; - - setupDefaultGtSysInfo(&hwInfo, &releaseHelper); - - EXPECT_EQ_VAL(0u, hwInfo.gtSystemInfo.L3BankCount); - EXPECT_EQ_VAL(0u, hwInfo.gtSystemInfo.L3CacheSizeInKb); - - releaseHelper.getL3BankCountResult = 2; - releaseHelper.getL3CacheBankSizeInKbResult = 0; - - setupDefaultGtSysInfo(&hwInfo, &releaseHelper); - - EXPECT_EQ_VAL(2u, hwInfo.gtSystemInfo.L3BankCount); - EXPECT_EQ_VAL(1u, hwInfo.gtSystemInfo.L3CacheSizeInKb); - - releaseHelper.getL3BankCountResult = 3; - releaseHelper.getL3CacheBankSizeInKbResult = 3; - - setupDefaultGtSysInfo(&hwInfo, &releaseHelper); - - EXPECT_EQ_VAL(3u, hwInfo.gtSystemInfo.L3BankCount); - EXPECT_EQ_VAL(9u, hwInfo.gtSystemInfo.L3CacheSizeInKb); -} - TEST(HwInfoTest, whenSettingDefaultFeatureTableAndWorkaroundTableThenProperFieldsAreSet) { HardwareInfo hwInfo{}; FeatureTable expectedFeatureTable{};