intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove L3 config from release helper

Browse Source 
L3 bank count should be queried from KMD
L3 bank size should be queried from device blob

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2024-11-12 11:13:52 +00:00
committed by Compute-Runtime-Automation
parent 7f3896d05f
commit f55ad93baf
5 changed files with 1 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shared/source/helpers/hw_info.cpp
View File

@@ -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();
}

4
shared/source/release_helper/release_helper.h
View File

@@ -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<uint32_t, 6> 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;

10
shared/source/release_helper/release_helper_base.inl
View File

@@ -122,16 +122,6 @@ bool ReleaseHelperHw<releaseType>::isRayTracingSupported() const {
return true;
}
template <ReleaseType releaseType>
uint32_t ReleaseHelperHw<releaseType>::getL3BankCount() const {
return 0;
}
template <ReleaseType releaseType>
uint64_t ReleaseHelperHw<releaseType>::getL3CacheBankSizeInKb() const {
return 0;
}
template <ReleaseType releaseType>
uint32_t ReleaseHelperHw<releaseType>::getAdditionalFp16Caps() const {
return 0u;

2
shared/test/common/mocks/mock_release_helper.h
View File

@@ -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, {}, ());

40
shared/test/unit_test/helpers/hw_info_tests.cpp
View File

@@ -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{};