Skip to content

Commit 6f0baae

Browse files
Add extra parameters verification method
Signed-off-by: Rafal Maziejuk <[email protected]> Related-To: NEO-4541
1 parent 0b4bc86 commit 6f0baae

File tree

7 files changed

+41
-0
lines changed

7 files changed

+41
-0
lines changed

opencl/test/unit_test/os_interface/hw_info_config_tests.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,3 +306,8 @@ HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfReturnedCmdSizeForMediaSa
306306
const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
307307
EXPECT_FALSE(hwInfoConfig.isReturnedCmdSizeForMediaSamplerAdjustmentRequired());
308308
}
309+
310+
HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfExtraParametersAreInvalidThenFalseIsReturned) {
311+
const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
312+
EXPECT_FALSE(hwInfoConfig.extraParametersInvalid(pInHwInfo));
313+
}

opencl/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsU
1212
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowRenderCompressionIsCalledThenTrueIsReturned, IGFX_XE_HP_CORE);
1313
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_XE_HP_CORE);
1414
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenCallingGetDeviceMemoryNameThenDdrIsReturned, IGFX_XE_HP_CORE);
15+
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfExtraParametersAreInvalidThenFalseIsReturned, IGFX_XE_HP_CORE);

opencl/test/unit_test/xe_hp_core/xehp/test_hw_info_config_xehp.inl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,24 @@ XEHPTEST_F(XeHPHwInfoConfig, givenXeHpWhenCallingGetDeviceMemoryNameThenHbmIsRet
7474
EXPECT_THAT(deviceMemoryName, testing::HasSubstr(std::string("HBM")));
7575
}
7676

77+
XEHPTEST_F(XeHPHwInfoConfig, givenA0OrA1SteppingWhenAskingIfExtraParametersAreInvalidThenReturnTrue) {
78+
auto hwInfoConfig = HwInfoConfig::get(productFamily);
79+
std::array<std::pair<uint32_t, bool>, 4> revisions = {
80+
{{REVISION_A0, true},
81+
{REVISION_A1, true},
82+
{REVISION_B, false},
83+
{REVISION_C, false}}};
84+
85+
for (const auto &[revision, paramBool] : revisions) {
86+
auto hwInfo = *defaultHwInfo;
87+
hwInfo.platform.usRevId = hwInfoConfig->getHwRevIdFromStepping(revision, hwInfo);
88+
89+
hwInfoConfig->configureHardwareCustom(&hwInfo, nullptr);
90+
91+
EXPECT_EQ(paramBool, hwInfoConfig->extraParametersInvalid(hwInfo));
92+
}
93+
}
94+
7795
using XeHPHwHelperTest = HwHelperTest;
7896

7997
XEHPTEST_F(XeHPHwHelperTest, givenXeHPMultiConfigWhenAllowRenderCompressionIsCalledThenCorrectValueIsReturned) {

shared/source/os_interface/hw_info_config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ class HwInfoConfig {
6868
virtual bool isAdditionalMediaSamplerProgrammingRequired() const = 0;
6969
virtual bool isInitialFlagsProgrammingRequired() const = 0;
7070
virtual bool isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const = 0;
71+
virtual bool extraParametersInvalid(const HardwareInfo &hwInfo) const = 0;
7172

7273
protected:
7374
virtual LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const = 0;
@@ -121,6 +122,7 @@ class HwInfoConfigHw : public HwInfoConfig {
121122
bool isAdditionalMediaSamplerProgrammingRequired() const override;
122123
bool isInitialFlagsProgrammingRequired() const override;
123124
bool isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const override;
125+
bool extraParametersInvalid(const HardwareInfo &hwInfo) const override;
124126

125127
protected:
126128
HwInfoConfigHw() = default;

shared/source/os_interface/hw_info_config.inl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,9 @@ bool HwInfoConfigHw<gfxProduct>::isReturnedCmdSizeForMediaSamplerAdjustmentRequi
221221
return false;
222222
}
223223

224+
template <PRODUCT_FAMILY gfxProduct>
225+
bool HwInfoConfigHw<gfxProduct>::extraParametersInvalid(const HardwareInfo &hwInfo) const {
226+
return false;
227+
}
228+
224229
} // namespace NEO

shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,8 @@ template <>
105105
bool HwInfoConfigHw<gfxProduct>::heapInLocalMem(const HardwareInfo &hwInfo) const {
106106
return !HwHelper::get(hwInfo.platform.eDisplayCoreFamily).isWorkaroundRequired(REVISION_A0, REVISION_B, hwInfo);
107107
}
108+
109+
template <>
110+
bool HwInfoConfigHw<gfxProduct>::extraParametersInvalid(const HardwareInfo &hwInfo) const {
111+
return HwHelper::get(hwInfo.platform.eDisplayCoreFamily).isWorkaroundRequired(REVISION_A0, REVISION_B, hwInfo);
112+
}

shared/test/common/mocks/mock_hw_info_config.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,9 @@ bool HwInfoConfigHw<IGFX_UNKNOWN>::isReturnedCmdSizeForMediaSamplerAdjustmentReq
207207
return false;
208208
}
209209

210+
template <>
211+
bool HwInfoConfigHw<IGFX_UNKNOWN>::extraParametersInvalid(const HardwareInfo &hwInfo) const {
212+
return false;
213+
}
214+
210215
} //namespace NEO

0 commit comments

Comments
 (0)