diff --git a/level_zero/core/source/cmdlist/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h index 79027afc5e..ee148f48e2 100644 --- a/level_zero/core/source/cmdlist/cmdlist.h +++ b/level_zero/core/source/cmdlist/cmdlist.h @@ -30,7 +30,7 @@ struct CommandList : _ze_command_list_handle_t { static constexpr uint32_t defaultNumIddsPerBlock = maxNumInterfaceDescriptorsPerMediaInterfaceDescriptorLoad; static constexpr uint32_t commandListimmediateIddsPerBlock = 1u; - CommandList() {} + CommandList() = delete; CommandList(uint32_t numIddsPerBlock) : commandContainer(numIddsPerBlock) {} template diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.h b/level_zero/core/source/cmdlist/cmdlist_hw.h index 90576f7f38..e3419c0f1c 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.h +++ b/level_zero/core/source/cmdlist/cmdlist_hw.h @@ -34,8 +34,6 @@ struct CommandListCoreFamily : CommandListImp { using INTERFACE_DESCRIPTOR_DATA = typename GfxFamily::INTERFACE_DESCRIPTOR_DATA; using CommandListImp::CommandListImp; - CommandListCoreFamily() {} - CommandListCoreFamily(uint32_t numIddsPerBlock) : CommandListImp(numIddsPerBlock) {} bool initialize(Device *device) override; virtual void programL3(bool isSLMused); diff --git a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h index f0052c600d..bd92d7e495 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h +++ b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h @@ -20,8 +20,6 @@ struct CommandListCoreFamilyImmediate : public CommandListCoreFamily(numIddsPerBlock) {} ze_result_t appendLaunchKernel(ze_kernel_handle_t hKernel, const ze_group_count_t *pThreadGroupDimensions, diff --git a/level_zero/core/source/cmdlist/cmdlist_imp.h b/level_zero/core/source/cmdlist/cmdlist_imp.h index cc9725e62c..e60c4a1587 100644 --- a/level_zero/core/source/cmdlist/cmdlist_imp.h +++ b/level_zero/core/source/cmdlist/cmdlist_imp.h @@ -13,8 +13,8 @@ namespace L0 { struct CommandListImp : CommandList { - CommandListImp() {} - CommandListImp(uint32_t numIddsPerBlock) : CommandList(numIddsPerBlock) {} + using CommandList::CommandList; + ze_result_t destroy() override; ze_result_t appendMetricMemoryBarrier() override; diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.cpp b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.cpp index 3345cbdcce..74692c7e8d 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.cpp +++ b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.cpp @@ -12,7 +12,7 @@ namespace L0 { namespace ult { -WhiteBox<::L0::CommandList>::WhiteBox(Device *device) {} +WhiteBox<::L0::CommandList>::WhiteBox(Device *device) : BaseClass(BaseClass::defaultNumIddsPerBlock) {} WhiteBox<::L0::CommandList>::~WhiteBox() {} diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h index 787b388a23..d546040b50 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h +++ b/level_zero/core/test/unit_tests/mocks/mock_cmdlist.h @@ -33,7 +33,7 @@ struct WhiteBox<::L0::CommandListCoreFamily> using BaseClass::appendLaunchKernelWithParams; using BaseClass::commandListPreemptionMode; - WhiteBox() : ::L0::CommandListCoreFamily() {} + WhiteBox() : ::L0::CommandListCoreFamily(BaseClass::defaultNumIddsPerBlock) {} virtual ~WhiteBox() {} }; @@ -43,6 +43,7 @@ using CommandListCoreFamily = WhiteBox<::L0::CommandListCoreFamily struct WhiteBox<::L0::CommandList> : public ::L0::CommandListImp { using BaseClass = ::L0::CommandListImp; + using BaseClass::BaseClass; using BaseClass::commandContainer; using BaseClass::commandListPreemptionMode; using BaseClass::initialize; diff --git a/level_zero/core/test/unit_tests/white_box.h b/level_zero/core/test/unit_tests/white_box.h index 2785041681..7b27db9feb 100644 --- a/level_zero/core/test/unit_tests/white_box.h +++ b/level_zero/core/test/unit_tests/white_box.h @@ -11,7 +11,9 @@ namespace L0 { namespace ult { template -struct WhiteBox : public Type {}; +struct WhiteBox : public Type { + using Type::Type; +}; template WhiteBox *whitebox_cast(Type *obj) {