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

Simplify stepping conversion

Browse Source 
Related-To: NEO-5475

Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2021-02-15 19:29:02 +00:00
committed by Compute-Runtime-Automation
parent d8a1bb599e
commit a0d3e8b352
8 changed files with 54 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opencl/test/unit_test/aub/aub_center_tests.cpp
View File

@@ -77,6 +77,18 @@ TEST(AubCenter, GivenCsrHwAndNotEmptyAubFileNameWhenGettingAubStreamModeThenMode
}
TEST(AubCenter, WhenAubManagerIsCreatedThenCorrectSteppingIsSet) {
struct {
__REVID stepping;
uint32_t expectedAubStreamStepping;
} steppingPairsToTest[] = {
{REVISION_A0, AubMemDump::SteppingValues::A},
{REVISION_A1, AubMemDump::SteppingValues::A},
{REVISION_A3, AubMemDump::SteppingValues::A},
{REVISION_B, AubMemDump::SteppingValues::B},
{REVISION_C, AubMemDump::SteppingValues::C},
{REVISION_D, AubMemDump::SteppingValues::D},
{REVISION_K, AubMemDump::SteppingValues::K}};
DebugManagerStateRestore restorer;
DebugManager.flags.UseAubStream.set(true);
@@ -90,7 +102,7 @@ TEST(AubCenter, WhenAubManagerIsCreatedThenCorrectSteppingIsSet) {
hwInfo.platform.usRevId = hwRevId;
MockAubCenter aubCenter(&hwInfo, false, "", CommandStreamReceiverType::CSR_AUB);
EXPECT_EQ(steppingPair.aubStreamStepping, aubCenter.stepping);
EXPECT_EQ(steppingPair.expectedAubStreamStepping, aubCenter.stepping);
}
}

37
opencl/test/unit_test/helpers/hw_helper_tests.cpp
View File

@@ -882,16 +882,6 @@ HWTEST_F(HwHelperTest, givenVariousValuesWhenConvertingHwRevIdAndSteppingThenCon
auto steppingFromHwRevId = helper.getSteppingFromHwRevId(hardwareInfo);
if (steppingFromHwRevId != CommonConstants::invalidStepping) {
EXPECT_EQ(testValue, helper.getHwRevIdFromStepping(steppingFromHwRevId, hardwareInfo));
} else {
EXPECT_EQ(AubMemDump::SteppingValues::A, helper.getAubStreamSteppingFromHwRevId(hardwareInfo));
}
}
for (auto &steppingPair : steppingPairsToTest) {
auto hwRevIdFromStepping = helper.getHwRevIdFromStepping(steppingPair.stepping, hardwareInfo);
if (hwRevIdFromStepping != CommonConstants::invalidStepping) {
hardwareInfo.platform.usRevId = hwRevIdFromStepping;
EXPECT_EQ(steppingPair.aubStreamStepping, helper.getAubStreamSteppingFromHwRevId(hardwareInfo));
}
}
}
@@ -903,10 +893,35 @@ HWTEST_F(HwHelperTest, givenInvalidProductFamilyWhenConvertingHwRevIdAndStepping
EXPECT_EQ(CommonConstants::invalidStepping, helper.getHwRevIdFromStepping(testValue, hardwareInfo));
hardwareInfo.platform.usRevId = testValue;
EXPECT_EQ(CommonConstants::invalidStepping, helper.getSteppingFromHwRevId(hardwareInfo));
EXPECT_EQ(AubMemDump::SteppingValues::A, helper.getAubStreamSteppingFromHwRevId(hardwareInfo));
}
}
HWTEST_F(HwHelperTest, givenVariousValuesWhenGettingAubStreamSteppingFromHwRevIdThenReturnValuesAreCorrect) {
struct MockHwHelper : HwHelperHw<FamilyType> {
uint32_t getSteppingFromHwRevId(const HardwareInfo &hwInfo) const override {
return returnedStepping;
}
uint32_t returnedStepping = 0;
};
MockHwHelper mockHwHelper;
mockHwHelper.returnedStepping = REVISION_A0;
EXPECT_EQ(AubMemDump::SteppingValues::A, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
mockHwHelper.returnedStepping = REVISION_A1;
EXPECT_EQ(AubMemDump::SteppingValues::A, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
mockHwHelper.returnedStepping = REVISION_A3;
EXPECT_EQ(AubMemDump::SteppingValues::A, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
mockHwHelper.returnedStepping = REVISION_B;
EXPECT_EQ(AubMemDump::SteppingValues::B, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
mockHwHelper.returnedStepping = REVISION_C;
EXPECT_EQ(AubMemDump::SteppingValues::C, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
mockHwHelper.returnedStepping = REVISION_D;
EXPECT_EQ(AubMemDump::SteppingValues::D, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
mockHwHelper.returnedStepping = REVISION_K;
EXPECT_EQ(AubMemDump::SteppingValues::K, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
mockHwHelper.returnedStepping = CommonConstants::invalidStepping;
EXPECT_EQ(AubMemDump::SteppingValues::A, mockHwHelper.getAubStreamSteppingFromHwRevId(hardwareInfo));
}
HWTEST_F(HwHelperTest, givenDefaultHwHelperHwWhenIsForceEmuInt32DivRemSPWARequiredCalledThenFalseIsReturned) {
if (hardwareInfo.platform.eRenderCoreFamily == IGFX_GEN12LP_CORE) {
GTEST_SKIP();

12
opencl/test/unit_test/helpers/hw_helper_tests.h
View File

@@ -18,15 +18,3 @@ using namespace NEO;
using HwHelperTest = Test<ClDeviceFixture>;
void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo);
constexpr struct {
__REVID stepping;
uint32_t aubStreamStepping;
} steppingPairsToTest[] = {
{REVISION_A0, AubMemDump::SteppingValues::A},
{REVISION_A1, AubMemDump::SteppingValues::A},
{REVISION_A3, AubMemDump::SteppingValues::A},
{REVISION_B, AubMemDump::SteppingValues::B},
{REVISION_C, AubMemDump::SteppingValues::C},
{REVISION_D, AubMemDump::SteppingValues::D},
{REVISION_K, AubMemDump::SteppingValues::K}};