diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h b/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h index e24dcb095b..2fcc5f605f 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h +++ b/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h @@ -81,5 +81,10 @@ struct MockCommandQueueHw : public L0::CommandQueueHw { NEO::ResidencyContainer residencyContainerSnapshot; }; +struct Deleter { + void operator()(CommandQueueImp *cmdQ) { + cmdQ->destroy(); + } +}; } // namespace ult } // namespace L0 diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp index 24dd74e599..a75cb91be1 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp @@ -20,12 +20,6 @@ namespace ult { using L0DebuggerTest = Test; -struct Deleter { - void operator()(CommandQueueImp *cmdQ) { - cmdQ->destroy(); - } -}; - TEST_F(L0DebuggerTest, givenL0DebuggerWhenCallingIsLegacyThenFalseIsReturned) { EXPECT_FALSE(neoDevice->getDebugger()->isLegacy()); } diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp index 4038aa88e5..d8e0ad5ba1 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp @@ -417,12 +417,6 @@ HWTEST2_F(L0DebuggerInternalUsageTest, givenUseCsrImmediateSubmissionDisabledCom commandList->destroy(); } -struct Deleter { - void operator()(CommandQueueImp *cmdQ) { - cmdQ->destroy(); - } -}; - HWTEST2_F(L0DebuggerInternalUsageTest, givenDebuggingEnabledWhenInternalCmdQIsUsedThenDebuggerPathsAreNotExecuted, IsAtLeastSkl) { ze_command_queue_desc_t queueDesc = {}; diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp index 934ab7fde3..f520fb35fb 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp @@ -164,12 +164,6 @@ HWTEST2_F(SLDebuggerInternalUsageTest, givenDebuggingEnabledWhenInternalCmdQIsUs using STATE_SIP = typename FamilyType::STATE_SIP; ze_command_queue_desc_t queueDesc = {}; - struct Deleter { - void operator()(CommandQueueImp *cmdQ) { - cmdQ->destroy(); - } - }; - device->setPreemptionMode(NEO::PreemptionMode::Disabled); std::unique_ptr, Deleter> commandQueue(new MockCommandQueueHw(deviceL0, device->getDefaultEngine().commandStreamReceiver, &queueDesc));