diff --git a/runtime/helpers/hw_helper.cpp b/runtime/helpers/hw_helper.cpp index 93b7dd15b8..ee0c27dc7a 100644 --- a/runtime/helpers/hw_helper.cpp +++ b/runtime/helpers/hw_helper.cpp @@ -28,36 +28,4 @@ HwHelper *hwHelperFactory[IGFX_MAX_CORE] = {}; HwHelper &HwHelper::get(GFXCORE_FAMILY gfxCore) { return *hwHelperFactory[gfxCore]; } - -uint32_t HwHelper::getBindingTableStateSurfaceStatePointer(void *pBindingTable, uint32_t index) { - return 0; -} -size_t HwHelper::getBindingTableStateSize() const { - return 0; -} -uint32_t HwHelper::getBindingTableStateAlignement() const { - return 0; -} - -size_t HwHelper::getInterfaceDescriptorDataSize() const { - return 0; -} - -size_t HwHelper::getMaxBarrierRegisterPerSlice() const { - return 0; -} - -void HwHelper::setCapabilityCoherencyFlag(const HardwareInfo *pHwInfo, bool &coherencyFlag) { -} - -bool HwHelper::setupPreemptionRegisters(HardwareInfo *pHwInfo, bool enable) { - return false; -} - -void HwHelper::adjustDefaultEngineType(HardwareInfo *pHwInfo) { -} - -void HwHelper::setupHardwareCapabilities(HardwareCapabilities *caps) { -} - } // namespace OCLRT diff --git a/runtime/helpers/hw_helper.h b/runtime/helpers/hw_helper.h index 6a6cdb12d1..4189aafbb2 100644 --- a/runtime/helpers/hw_helper.h +++ b/runtime/helpers/hw_helper.h @@ -33,15 +33,15 @@ struct HardwareCapabilities; class HwHelper { public: static HwHelper &get(GFXCORE_FAMILY gfxCore); - virtual uint32_t getBindingTableStateSurfaceStatePointer(void *pBindingTable, uint32_t index); - virtual size_t getBindingTableStateSize() const; - virtual uint32_t getBindingTableStateAlignement() const; - virtual size_t getInterfaceDescriptorDataSize() const; - virtual size_t getMaxBarrierRegisterPerSlice() const; - virtual void setCapabilityCoherencyFlag(const HardwareInfo *pHwInfo, bool &coherencyFlag); - virtual bool setupPreemptionRegisters(HardwareInfo *pHwInfo, bool enable); - virtual void adjustDefaultEngineType(HardwareInfo *pHwInfo); - virtual void setupHardwareCapabilities(HardwareCapabilities *caps); + virtual uint32_t getBindingTableStateSurfaceStatePointer(void *pBindingTable, uint32_t index) = 0; + virtual size_t getBindingTableStateSize() const = 0; + virtual uint32_t getBindingTableStateAlignement() const = 0; + virtual size_t getInterfaceDescriptorDataSize() const = 0; + virtual size_t getMaxBarrierRegisterPerSlice() const = 0; + virtual void setCapabilityCoherencyFlag(const HardwareInfo *pHwInfo, bool &coherencyFlag) = 0; + virtual bool setupPreemptionRegisters(HardwareInfo *pHwInfo, bool enable) = 0; + virtual void adjustDefaultEngineType(HardwareInfo *pHwInfo) = 0; + virtual void setupHardwareCapabilities(HardwareCapabilities *caps) = 0; protected: HwHelper(){}; diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/unit_tests/helpers/hw_helper_tests.cpp index e27f30b262..66389c1148 100644 --- a/unit_tests/helpers/hw_helper_tests.cpp +++ b/unit_tests/helpers/hw_helper_tests.cpp @@ -37,41 +37,11 @@ void HwHelperTest::SetUp() { void HwHelperTest::TearDown() { } -HWTEST_F(HwHelperTest, getReturnsValidHwHelper) { - auto helper = HwHelper::get(renderCoreFamily); - EXPECT_NE(nullptr, &helper); -} - HWTEST_F(HwHelperTest, getReturnsValidHwHelperHw) { auto &helper = HwHelper::get(renderCoreFamily); EXPECT_NE(nullptr, &helper); } -HWTEST_F(HwHelperTest, getBindingTableStateSurfaceStatePointerOnHwHelperReturnsZero) { - auto helper = HwHelper::get(renderCoreFamily); - EXPECT_EQ(0u, helper.getBindingTableStateSurfaceStatePointer(nullptr, 0)); -} - -HWTEST_F(HwHelperTest, getBindingTableStateSizeReturnsZero) { - auto helper = HwHelper::get(renderCoreFamily); - EXPECT_EQ(0u, helper.getBindingTableStateSize()); -} - -HWTEST_F(HwHelperTest, getBindingTableStateAlignement) { - auto helper = HwHelper::get(renderCoreFamily); - EXPECT_EQ(0u, helper.getBindingTableStateAlignement()); -} - -HWTEST_F(HwHelperTest, getInterfaceDescriptorDataSizeReturnsZero) { - auto helper = HwHelper::get(renderCoreFamily); - EXPECT_EQ(0u, helper.getInterfaceDescriptorDataSize()); -} - -HWTEST_F(HwHelperTest, getMaxBarriersPerSliceReturnsZero) { - auto helper = HwHelper::get(renderCoreFamily); - EXPECT_EQ(0u, helper.getMaxBarrierRegisterPerSlice()); -} - HWTEST_F(HwHelperTest, getBindingTableStateSurfaceStatePointerReturnsCorrectPointer) { using BINDING_TABLE_STATE = typename FamilyType::BINDING_TABLE_STATE; BINDING_TABLE_STATE bindingTableState[4]; @@ -105,42 +75,6 @@ HWTEST_F(HwHelperTest, getInterfaceDescriptorDataSizeReturnsCorrectSize) { EXPECT_EQ(sizeof(INTERFACE_DESCRIPTOR_DATA), helper.getInterfaceDescriptorDataSize()); } -HWTEST_F(HwHelperTest, setCapabilityCoherencyFlagDummy) { - bool coherency = false; - - auto helper = HwHelper::get(renderCoreFamily); - helper.setCapabilityCoherencyFlag(&hwInfo, coherency); -} - -HWTEST_F(HwHelperTest, setupPreemptionRegistersDummy) { - bool preemption = false; - auto helper = HwHelper::get(renderCoreFamily); - helper.setupPreemptionRegisters(&hwInfo, preemption); -} - -HWTEST_F(HwHelperTest, adjustDefaultEngineTypeDummy) { - auto helper = HwHelper::get(renderCoreFamily); - helper.adjustDefaultEngineType(&hwInfo); -} - -HWTEST_F(HwHelperTest, setupHardwareCapabilitiesDummy) { - auto helper = HwHelper::get(renderCoreFamily); - HardwareCapabilities hwCaps; - hwCaps.image3DMaxHeight = 123u; - hwCaps.image3DMaxWidth = 456u; - helper.setupHardwareCapabilities(&hwCaps); - - EXPECT_EQ(123u, hwCaps.image3DMaxHeight); - EXPECT_EQ(456u, hwCaps.image3DMaxWidth); - - hwCaps.image3DMaxHeight = 789u; - hwCaps.image3DMaxWidth = 987u; - helper.setupHardwareCapabilities(&hwCaps); - - EXPECT_EQ(789u, hwCaps.image3DMaxHeight); - EXPECT_EQ(987u, hwCaps.image3DMaxWidth); -} - TEST(DwordBuilderTest, setNonMaskedBits) { uint32_t dword = 0;