From c027d2c4943c8fa4235b18ec21b0afdef7012693 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Tue, 8 Nov 2022 11:49:29 +0000 Subject: [PATCH] Remove not needed isL3Configurable helper function Related-To: NEO-6853 Signed-off-by: Kamil Kopryk Remove isL3Configurable function from - HwHelper - PreambleHelper --- opencl/test/unit_test/helpers/hw_helper_tests.cpp | 13 ------------- shared/source/gen8/preamble_gen8.cpp | 5 ----- shared/source/gen9/preamble_gen9.cpp | 5 ----- shared/source/helpers/hw_helper.h | 3 --- shared/source/helpers/hw_helper_base.inl | 5 ----- shared/source/helpers/preamble.h | 1 - shared/source/helpers/preamble_base.inl | 5 ----- shared/test/unit_test/gen11/test_preamble_gen11.cpp | 7 ------- .../unit_test/gen12lp/test_preamble_gen12lp.cpp | 7 ------- shared/test/unit_test/gen8/test_preamble_gen8.cpp | 13 ------------- shared/test/unit_test/gen9/preamble_tests_gen9.cpp | 13 ------------- .../unit_test/gen9/test_command_encoder_gen9.cpp | 3 ++- 12 files changed, 2 insertions(+), 78 deletions(-) diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index 806c1d681a..7999ee396e 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -742,19 +742,6 @@ HWTEST_F(HwHelperTest, DISABLED_profilingCreationOfRenderSurfaceStateVsMemcpyOfC } } -HWTEST_F(HwHelperTest, WhenTestingIfL3ConfigProgrammableThenCorrectValueIsReturned) { - bool preambleHelperL3Config; - bool isL3Programmable; - const HardwareInfo &hwInfo = *defaultHwInfo; - - preambleHelperL3Config = - PreambleHelper::isL3Configurable(*defaultHwInfo); - isL3Programmable = - HwHelperHw::get().isL3Configurable(hwInfo); - - EXPECT_EQ(preambleHelperL3Config, isL3Programmable); -} - TEST(HwHelperCacheFlushTest, givenEnableCacheFlushFlagIsEnableWhenPlatformDoesNotSupportThenOverrideAndReturnSupportTrue) { DebugManagerStateRestore restore; DebugManager.flags.EnableCacheFlushAfterWalker.set(1); diff --git a/shared/source/gen8/preamble_gen8.cpp b/shared/source/gen8/preamble_gen8.cpp index c3a5764868..525cc7f86a 100644 --- a/shared/source/gen8/preamble_gen8.cpp +++ b/shared/source/gen8/preamble_gen8.cpp @@ -34,11 +34,6 @@ uint32_t PreambleHelper::getL3Config(const HardwareInfo &hwInfo, bool us return l3Config; } -template <> -bool PreambleHelper::isL3Configurable(const HardwareInfo &hwInfo) { - return getL3Config(hwInfo, true) != getL3Config(hwInfo, false); -} - template <> void PreambleHelper::programPipelineSelect(LinearStream *pCommandStream, const PipelineSelectArgs &pipelineSelectArgs, diff --git a/shared/source/gen9/preamble_gen9.cpp b/shared/source/gen9/preamble_gen9.cpp index 23b8c7b633..585bc3ea0d 100644 --- a/shared/source/gen9/preamble_gen9.cpp +++ b/shared/source/gen9/preamble_gen9.cpp @@ -31,11 +31,6 @@ uint32_t PreambleHelper::getL3Config(const HardwareInfo &hwInfo, bool us return l3Config; } -template <> -bool PreambleHelper::isL3Configurable(const HardwareInfo &hwInfo) { - return getL3Config(hwInfo, true) != getL3Config(hwInfo, false); -} - template <> void PreambleHelper::programPipelineSelect(LinearStream *pCommandStream, const PipelineSelectArgs &pipelineSelectArgs, diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 71d6536480..b2ace9b14d 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -46,7 +46,6 @@ class HwHelper { virtual uint32_t getPitchAlignmentForImage(const HardwareInfo *hwInfo) const = 0; virtual uint32_t getMaxNumSamplers() const = 0; virtual void adjustDefaultEngineType(HardwareInfo *pHwInfo) = 0; - virtual bool isL3Configurable(const HardwareInfo &hwInfo) = 0; virtual SipKernelType getSipKernelType(bool debuggingActive) const = 0; virtual bool isLocalMemoryEnabled(const HardwareInfo &hwInfo) const = 0; virtual bool is1MbAlignmentSupported(const HardwareInfo &hwInfo, bool isCompressionEnabled) const = 0; @@ -216,8 +215,6 @@ class HwHelperHw : public HwHelper { void adjustDefaultEngineType(HardwareInfo *pHwInfo) override; - bool isL3Configurable(const HardwareInfo &hwInfo) override; - SipKernelType getSipKernelType(bool debuggingActive) const override; bool isLocalMemoryEnabled(const HardwareInfo &hwInfo) const override; diff --git a/shared/source/helpers/hw_helper_base.inl b/shared/source/helpers/hw_helper_base.inl index 01bfb873be..874272c386 100644 --- a/shared/source/helpers/hw_helper_base.inl +++ b/shared/source/helpers/hw_helper_base.inl @@ -54,11 +54,6 @@ bool HwHelperHw::isStatelessToStatefulWithOffsetSupported() const { return true; } -template -bool HwHelperHw::isL3Configurable(const HardwareInfo &hwInfo) { - return PreambleHelper::isL3Configurable(hwInfo); -} - template SipKernelType HwHelperHw::getSipKernelType(bool debuggingActive) const { if (!debuggingActive) { diff --git a/shared/source/helpers/preamble.h b/shared/source/helpers/preamble.h index d2b9e6a835..7367762dde 100644 --- a/shared/source/helpers/preamble.h +++ b/shared/source/helpers/preamble.h @@ -54,7 +54,6 @@ struct PreambleHelper { static void programKernelDebugging(LinearStream *pCommandStream); static void programSemaphoreDelay(LinearStream *pCommandStream); static uint32_t getL3Config(const HardwareInfo &hwInfo, bool useSLM); - static bool isL3Configurable(const HardwareInfo &hwInfo); static bool isSystolicModeConfigurable(const HardwareInfo &hwInfo); static size_t getAdditionalCommandsSize(const Device &device); static std::vector getSupportedThreadArbitrationPolicies(); diff --git a/shared/source/helpers/preamble_base.inl b/shared/source/helpers/preamble_base.inl index bf0fba51f9..e7f72e764a 100644 --- a/shared/source/helpers/preamble_base.inl +++ b/shared/source/helpers/preamble_base.inl @@ -101,11 +101,6 @@ size_t PreambleHelper::getKernelDebuggingCommandsSize(bool debuggingA return 0; } -template -bool PreambleHelper::isL3Configurable(const HardwareInfo &hwInfo) { - return false; -} - template void PreambleHelper::appendProgramVFEState(const HardwareInfo &hwInfo, const StreamProperties &streamProperties, void *cmd) {} diff --git a/shared/test/unit_test/gen11/test_preamble_gen11.cpp b/shared/test/unit_test/gen11/test_preamble_gen11.cpp index 7ed4335740..1fcf6dc5a9 100644 --- a/shared/test/unit_test/gen11/test_preamble_gen11.cpp +++ b/shared/test/unit_test/gen11/test_preamble_gen11.cpp @@ -42,13 +42,6 @@ GEN11TEST_F(IclSlm, givenGen11WhenProgramingL3ThenErrorDetectionBehaviorControlB EXPECT_TRUE((l3Config & errorDetectionBehaviorControlBit) != 0); } -GEN11TEST_F(IclSlm, WhenCheckingL3IsConfigurableThenExpectItToBeFalse) { - bool isL3Programmable = - PreambleHelper::isL3Configurable(*defaultHwInfo); - - EXPECT_FALSE(isL3Programmable); -} - typedef PreambleFixture Gen11UrbEntryAllocationSize; GEN11TEST_F(Gen11UrbEntryAllocationSize, WhenPreambleRetrievesUrbEntryAllocationSizeThenValueIsCorrect) { uint32_t actualVal = PreambleHelper::getUrbEntryAllocationSize(); diff --git a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp index aa125e76e2..40f8a53449 100644 --- a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp @@ -32,13 +32,6 @@ HWTEST2_F(TglLpSlm, givenTglLpWhenPreambleIsBeingProgrammedThenThreadArbitration EXPECT_EQ(0U, countMmio(cmdList.begin(), cmdList.end(), 0xE404)); } -HWTEST2_F(TglLpSlm, WhenCheckingL3IsConfigurableThenExpectItToBeFalse, IsTGLLP) { - bool isL3Programmable = - PreambleHelper::isL3Configurable(*defaultHwInfo); - - EXPECT_FALSE(isL3Programmable); -} - HWTEST2_F(TglLpSlm, WhenPreambleIsCreatedThenSlmIsDisabled, IsTGLLP) { typedef Gen12LpFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; LinearStream &cs = linearStream; diff --git a/shared/test/unit_test/gen8/test_preamble_gen8.cpp b/shared/test/unit_test/gen8/test_preamble_gen8.cpp index 666e8ac387..edcc7846bd 100644 --- a/shared/test/unit_test/gen8/test_preamble_gen8.cpp +++ b/shared/test/unit_test/gen8/test_preamble_gen8.cpp @@ -57,19 +57,6 @@ BDWTEST_F(Gen8L3Config, GivenlmWhenProgrammingL3ThenProgrammingIsCorrect) { EXPECT_TRUE((l3Config & errorDetectionBehaviorControlBit) != 0); } -BDWTEST_F(Gen8L3Config, WhenPreambleIsCreatedThenL3ProgrammingIsCorrect) { - bool l3ConfigDifference; - bool isL3Programmable; - - l3ConfigDifference = - PreambleHelper::getL3Config(*defaultHwInfo, true) != - PreambleHelper::getL3Config(*defaultHwInfo, false); - isL3Programmable = - PreambleHelper::isL3Configurable(*defaultHwInfo); - - EXPECT_EQ(l3ConfigDifference, isL3Programmable); -} - typedef PreambleFixture ThreadArbitrationGen8; BDWTEST_F(ThreadArbitrationGen8, givenPolicyWhenThreadArbitrationProgrammedThenDoNothing) { typedef Gen8Family::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; diff --git a/shared/test/unit_test/gen9/preamble_tests_gen9.cpp b/shared/test/unit_test/gen9/preamble_tests_gen9.cpp index 8721575eb5..03cb50fd14 100644 --- a/shared/test/unit_test/gen9/preamble_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/preamble_tests_gen9.cpp @@ -51,19 +51,6 @@ GEN9TEST_F(PreambleTestGen9, givenKernelDebuggingActiveAndDisabledPreemptionWhen SourceLevelDebuggerPreambleTest::givenKernelDebuggingActiveAndDisabledPreemptionWhenGetAdditionalCommandsSizeIsCalledThen2MiLoadRegisterImmCmdsAreInlcudedTest(); } -GEN9TEST_F(PreambleTestGen9, givenGen9ThenL3IsProgrammed) { - bool l3ConfigDifference; - bool isL3Programmable; - - l3ConfigDifference = - PreambleHelper::getL3Config(*defaultHwInfo, true) != - PreambleHelper::getL3Config(*defaultHwInfo, false); - isL3Programmable = - PreambleHelper::isL3Configurable(*defaultHwInfo); - - EXPECT_EQ(l3ConfigDifference, isL3Programmable); -} - using ThreadArbitrationGen9 = PreambleFixture; GEN9TEST_F(ThreadArbitrationGen9, givenPreambleWhenItIsProgrammedThenThreadArbitrationIsNotSet) { DebugManagerStateRestore dbgRestore; diff --git a/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp b/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp index 1c3cebd2e7..893e644424 100644 --- a/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp +++ b/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp @@ -44,7 +44,8 @@ GEN9TEST_F(CommandEncoderTest, givenNoSlmThenCorrectMmioIsSet) { auto itorLRI = find(commands.begin(), commands.end()); ASSERT_NE(itorLRI, commands.end()); auto cmd = genCmdCast(*itorLRI); - auto expectedData = PreambleHelper::isL3Configurable(cmdContainer.getDevice()->getHardwareInfo()) ? 0x80000340u : 0x60000321u; + auto isL3Configurable = (PreambleHelper::getL3Config(pDevice->getHardwareInfo(), true) != PreambleHelper::getL3Config(pDevice->getHardwareInfo(), false)); + auto expectedData = isL3Configurable ? 0x80000340u : 0x60000321u; EXPECT_EQ(cmd->getRegisterOffset(), 0x7034u); EXPECT_EQ(cmd->getDataDword(), expectedData); }