From 522249e233b5793afd89e87739495007f1f83711 Mon Sep 17 00:00:00 2001 From: Adam Cetnerowski Date: Wed, 21 Oct 2020 09:49:11 +0200 Subject: [PATCH] ULT renaming: Gen-specific Preamble tests Related-To: NEO-2236 Change-Id: I4d197009d61c0ce74d21571126969d6694ae0c90 Signed-off-by: Adam Cetnerowski --- .../test/unit_test/gen11/test_preamble_gen11.cpp | 14 +++++++------- .../unit_test/gen12lp/test_preamble_gen12lp.cpp | 10 +++++----- shared/test/unit_test/gen8/test_preamble_gen8.cpp | 12 ++++++------ .../test/unit_test/gen9/skl/test_preamble_skl.cpp | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/shared/test/unit_test/gen11/test_preamble_gen11.cpp b/shared/test/unit_test/gen11/test_preamble_gen11.cpp index 49110ea2c9..708464a85b 100644 --- a/shared/test/unit_test/gen11/test_preamble_gen11.cpp +++ b/shared/test/unit_test/gen11/test_preamble_gen11.cpp @@ -15,7 +15,7 @@ using namespace NEO; typedef PreambleFixture IclSlm; -GEN11TEST_F(IclSlm, shouldBeEnabledOnGen11) { +GEN11TEST_F(IclSlm, WhenL3ConfigIsDispatchedThenProperRegisterAddressAndValueAreProgrammed) { typedef ICLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); @@ -40,7 +40,7 @@ GEN11TEST_F(IclSlm, givenGen11WhenProgramingL3ThenErrorDetectionBehaviorControlB EXPECT_TRUE((l3Config & errorDetectionBehaviorControlBit) != 0); } -GEN11TEST_F(IclSlm, givenGen11IsL3Programing) { +GEN11TEST_F(IclSlm, WhenCheckingL3IsConfigurableThenExpectItToBeFalse) { bool isL3Programmable = PreambleHelper::isL3Configurable(*defaultHwInfo); @@ -48,13 +48,13 @@ GEN11TEST_F(IclSlm, givenGen11IsL3Programing) { } typedef PreambleFixture Gen11UrbEntryAllocationSize; -GEN11TEST_F(Gen11UrbEntryAllocationSize, getUrbEntryAllocationSize) { +GEN11TEST_F(Gen11UrbEntryAllocationSize, WhenPreambleRetrievesUrbEntryAllocationSizeThenValueIsCorrect) { uint32_t actualVal = PreambleHelper::getUrbEntryAllocationSize(); EXPECT_EQ(0x782u, actualVal); } typedef PreambleVfeState Gen11PreambleVfeState; -GEN11TEST_F(Gen11PreambleVfeState, WaOff) { +GEN11TEST_F(Gen11PreambleVfeState, GivenWaOffWhenProgrammingVfeStateThenProgrammingIsCorrect) { typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL; testWaTable->waSendMIFLUSHBeforeVFE = 0; LinearStream &cs = linearStream; @@ -72,7 +72,7 @@ GEN11TEST_F(Gen11PreambleVfeState, WaOff) { EXPECT_EQ(1u, pc.getCommandStreamerStallEnable()); } -GEN11TEST_F(Gen11PreambleVfeState, WaOn) { +GEN11TEST_F(Gen11PreambleVfeState, GivenWaOnWhenProgrammingVfeStateThenProgrammingIsCorrect) { typedef typename ICLFamily::PIPE_CONTROL PIPE_CONTROL; testWaTable->waSendMIFLUSHBeforeVFE = 1; LinearStream &cs = linearStream; @@ -91,7 +91,7 @@ GEN11TEST_F(Gen11PreambleVfeState, WaOn) { } typedef PreambleFixture PreemptionWatermarkGen11; -GEN11TEST_F(PreemptionWatermarkGen11, givenPreambleThenPreambleWorkAroundsIsNotProgrammed) { +GEN11TEST_F(PreemptionWatermarkGen11, WhenPreambleIsCreatedThenWorkAroundsIsNotProgrammed) { PreambleHelper::programGenSpecificPreambleWorkArounds(&linearStream, *defaultHwInfo); parseCommands(linearStream); @@ -137,6 +137,6 @@ GEN11TEST_F(ThreadArbitrationGen11, givenPreambleWhenItIsProgrammedThenThreadArb EXPECT_EQ(sizeof(MI_LOAD_REGISTER_IMM) + sizeof(PIPE_CONTROL), PreambleHelper::getThreadArbitrationCommandsSize()); } -GEN11TEST_F(ThreadArbitrationGen11, defaultArbitrationPolicy) { +GEN11TEST_F(ThreadArbitrationGen11, GivenDefaultWhenProgrammingPreambleThenArbitrationPolicyIsRoundRobin) { EXPECT_EQ(ThreadArbitrationPolicy::RoundRobinAfterDependency, HwHelperHw::get().getDefaultThreadArbitrationPolicy()); } diff --git a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp index 2a011ba56d..21f56c9b12 100644 --- a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp @@ -32,14 +32,14 @@ HWTEST2_F(TglLpSlm, givenTglLpWhenPreambleIsBeingProgrammedThenThreadArbitration EXPECT_EQ(0U, countMmio(cmdList.begin(), cmdList.end(), 0xE404)); } -HWTEST2_F(TglLpSlm, givenTglLpIsL3Programing, IsTGLLP) { +HWTEST2_F(TglLpSlm, WhenCheckingL3IsConfigurableThenExpectItToBeFalse, IsTGLLP) { bool isL3Programmable = PreambleHelper::isL3Configurable(*defaultHwInfo); EXPECT_FALSE(isL3Programmable); } -HWTEST2_F(TglLpSlm, shouldNotBeEnabledOnGen12, IsTGLLP) { +HWTEST2_F(TglLpSlm, WhenPreambleIsCreatedThenSlmIsDisabled, IsTGLLP) { typedef TGLLPFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(pDevice->getHardwareInfo(), true); @@ -52,13 +52,13 @@ HWTEST2_F(TglLpSlm, shouldNotBeEnabledOnGen12, IsTGLLP) { } typedef PreambleFixture Gen12LpUrbEntryAllocationSize; -HWTEST2_F(Gen12LpUrbEntryAllocationSize, getUrbEntryAllocationSize, IsTGLLP) { +HWTEST2_F(Gen12LpUrbEntryAllocationSize, WhenPreambleIsCreatedThenUrbEntryAllocationSizeIsCorrect, IsTGLLP) { uint32_t actualVal = PreambleHelper::getUrbEntryAllocationSize(); EXPECT_EQ(1024u, actualVal); } typedef PreambleVfeState Gen12LpPreambleVfeState; -HWTEST2_F(Gen12LpPreambleVfeState, WaOff, IsTGLLP) { +HWTEST2_F(Gen12LpPreambleVfeState, GivenWaOffWhenProgrammingVfeStateThenProgrammingIsCorrect, IsTGLLP) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; testWaTable->waSendMIFLUSHBeforeVFE = 0; LinearStream &cs = linearStream; @@ -176,7 +176,7 @@ GEN12LPTEST_F(ThreadArbitrationGen12Lp, givenPolicyWhenThreadArbitrationProgramm } typedef PreambleFixture PreemptionWatermarkGen12LP; -GEN12LPTEST_F(PreemptionWatermarkGen12LP, givenPreambleThenPreambleWorkAroundsIsNotProgrammed) { +GEN12LPTEST_F(PreemptionWatermarkGen12LP, WhenPreambleIsCreatedThenPreambleWorkAroundsIsNotProgrammed) { PreambleHelper::programGenSpecificPreambleWorkArounds(&linearStream, pDevice->getHardwareInfo()); parseCommands(linearStream); diff --git a/shared/test/unit_test/gen8/test_preamble_gen8.cpp b/shared/test/unit_test/gen8/test_preamble_gen8.cpp index a5411fab27..7dbaae37c9 100644 --- a/shared/test/unit_test/gen8/test_preamble_gen8.cpp +++ b/shared/test/unit_test/gen8/test_preamble_gen8.cpp @@ -16,7 +16,7 @@ using namespace NEO; typedef PreambleFixture BdwSlm; -BDWTEST_F(BdwSlm, shouldBeEnabledOnGen8) { +BDWTEST_F(BdwSlm, WhenL3ConfigIsDispatchedThenProperRegisterAddressAndValueAreProgrammed) { typedef BDWFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); @@ -35,7 +35,7 @@ BDWTEST_F(BdwSlm, shouldBeEnabledOnGen8) { typedef PreambleFixture Gen8L3Config; -BDWTEST_F(Gen8L3Config, checkNoSLM) { +BDWTEST_F(Gen8L3Config, GivenNoSlmWhenProgrammingL3ThenProgrammingIsCorrect) { bool slmUsed = false; uint32_t l3Config = 0; @@ -46,7 +46,7 @@ BDWTEST_F(Gen8L3Config, checkNoSLM) { EXPECT_TRUE((l3Config & errorDetectionBehaviorControlBit) != 0); } -BDWTEST_F(Gen8L3Config, checkSLM) { +BDWTEST_F(Gen8L3Config, GivenlmWhenProgrammingL3ThenProgrammingIsCorrect) { bool slmUsed = true; uint32_t l3Config = 0; @@ -57,7 +57,7 @@ BDWTEST_F(Gen8L3Config, checkSLM) { EXPECT_TRUE((l3Config & errorDetectionBehaviorControlBit) != 0); } -BDWTEST_F(Gen8L3Config, givenGen8IsL3Programing) { +BDWTEST_F(Gen8L3Config, WhenPreambleIsCreatedThenL3ProgrammingIsCorrect) { bool l3ConfigDifference; bool isL3Programmable; @@ -86,12 +86,12 @@ BDWTEST_F(ThreadArbitrationGen8, givenPolicyWhenThreadArbitrationProgrammedThenD } typedef PreambleFixture Gen8UrbEntryAllocationSize; -BDWTEST_F(Gen8UrbEntryAllocationSize, getUrbEntryAllocationSize) { +BDWTEST_F(Gen8UrbEntryAllocationSize, WhenPreambleIsCreatedThenUrbEntryAllocationSizeIsCorrect) { uint32_t actualVal = PreambleHelper::getUrbEntryAllocationSize(); EXPECT_EQ(0x782u, actualVal); } -BDWTEST_F(PreambleVfeState, basic) { +BDWTEST_F(PreambleVfeState, WhenProgrammingVfeStateThenProgrammingIsCorrect) { typedef BDWFamily::PIPE_CONTROL PIPE_CONTROL; LinearStream &cs = linearStream; diff --git a/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp b/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp index 1842b5fc94..bdf82538ae 100644 --- a/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp +++ b/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp @@ -17,7 +17,7 @@ using namespace NEO; typedef PreambleFixture SklSlm; -SKLTEST_F(SklSlm, shouldBeEnabledOnGen9) { +SKLTEST_F(SklSlm, WhenL3ConfigIsDispatchedThenProperRegisterAddressAndValueAreProgrammed) { typedef SKLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; uint32_t l3Config = PreambleHelper::getL3Config(*defaultHwInfo, true); @@ -37,7 +37,7 @@ SKLTEST_F(SklSlm, shouldBeEnabledOnGen9) { typedef PreambleFixture Gen9L3Config; -SKLTEST_F(Gen9L3Config, checkNoSLM) { +SKLTEST_F(Gen9L3Config, GivenNoSlmWhenProgrammingL3ThenProgrammingIsCorrect) { bool slmUsed = false; uint32_t l3Config = 0; @@ -53,7 +53,7 @@ SKLTEST_F(Gen9L3Config, checkNoSLM) { EXPECT_TRUE((l3Config & errorDetectionBehaviorControlBit) != 0); } -SKLTEST_F(Gen9L3Config, checkSLM) { +SKLTEST_F(Gen9L3Config, GivenSlmWhenProgrammingL3ThenProgrammingIsCorrect) { bool slmUsed = true; uint32_t l3Config = 0; @@ -99,11 +99,11 @@ SKLTEST_F(ThreadArbitration, givenPreambleWhenItIsProgrammedThenThreadArbitratio EXPECT_EQ(sizeof(MI_LOAD_REGISTER_IMM) + sizeof(PIPE_CONTROL), PreambleHelper::getThreadArbitrationCommandsSize()); } -SKLTEST_F(ThreadArbitration, defaultArbitrationPolicy) { +SKLTEST_F(ThreadArbitration, GivenDefaultWhenProgrammingPreambleThenArbitrationPolicyIsRoundRobin) { EXPECT_EQ(ThreadArbitrationPolicy::RoundRobin, HwHelperHw::get().getDefaultThreadArbitrationPolicy()); } -GEN9TEST_F(PreambleVfeState, WaOff) { +GEN9TEST_F(PreambleVfeState, GivenWaOffWhenProgrammingVfeStateThenProgrammingIsCorrect) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; testWaTable->waSendMIFLUSHBeforeVFE = 0; LinearStream &cs = linearStream; @@ -121,7 +121,7 @@ GEN9TEST_F(PreambleVfeState, WaOff) { EXPECT_EQ(1u, pc.getCommandStreamerStallEnable()); } -GEN9TEST_F(PreambleVfeState, WaOn) { +GEN9TEST_F(PreambleVfeState, GivenWaOnWhenProgrammingVfeStateThenProgrammingIsCorrect) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; testWaTable->waSendMIFLUSHBeforeVFE = 1; LinearStream &cs = linearStream;