diff --git a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp index 344a2069a0..92e45f7b12 100644 --- a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp @@ -63,9 +63,7 @@ struct DebuggerSingleAddressSpaceAubFixture : public DebuggerAubFixture { }; using DebuggerSingleAddressSpaceAub = Test; -using PlatformsSupportingSingleAddressSpace = MatchAny; - -HWTEST2_F(DebuggerSingleAddressSpaceAub, GivenSingleAddressSpaceWhenCmdListIsExecutedThenSbaAddressesAreTracked, PlatformsSupportingSingleAddressSpace) { +HWTEST_F(DebuggerSingleAddressSpaceAub, GivenSingleAddressSpaceWhenCmdListIsExecutedThenSbaAddressesAreTracked) { if (neoDevice->getCompilerProductHelper().isHeaplessModeEnabled(*defaultHwInfo)) { GTEST_SKIP(); } diff --git a/level_zero/core/test/aub_tests/xe_hpg/test_excludes_xe_hpg.cpp b/level_zero/core/test/aub_tests/xe_hpg/test_excludes_xe_hpg.cpp index bcb644f565..454e8abdc7 100644 --- a/level_zero/core/test/aub_tests/xe_hpg/test_excludes_xe_hpg.cpp +++ b/level_zero/core/test/aub_tests/xe_hpg/test_excludes_xe_hpg.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ namespace L0 { namespace ult { -HWTEST_EXCLUDE_PRODUCT(DebuggerSingleAddressSpaceAub, GivenSingleAddressSpaceWhenCmdListIsExecutedThenSbaAddressesAreTracked_PlatformsSupportingSingleAddressSpace, IGFX_XE_HPG_CORE); +HWTEST_EXCLUDE_PRODUCT(DebuggerSingleAddressSpaceAub, GivenSingleAddressSpaceWhenCmdListIsExecutedThenSbaAddressesAreTracked, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(DebuggerGlobalAllocatorAub, GivenKernelWithScratchWhenCmdListExecutedThenSbaAddressesAreTracked_PlatformsSupportingGlobalBindless, IGFX_XE_HPG_CORE); } // namespace ult diff --git a/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp b/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp index a79c87881f..67e170c4ea 100644 --- a/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp +++ b/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp @@ -100,7 +100,7 @@ class MockExternalSemaphoreEvent : public MockEvent { uint32_t hostSynchronizeCalledTimes = 0; }; -HWTEST2_F(ExternalSemaphoreMTTest, givenSemaphoreSignalOperationEventWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreMTTest, givenSemaphoreSignalOperationEventWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned) { auto externalSemaphore = std::make_unique(); externalSemaphore->neoExternalSemaphore = std::make_unique(); @@ -129,7 +129,7 @@ HWTEST2_F(ExternalSemaphoreMTTest, givenSemaphoreSignalOperationEventWhenExterna lock.unlock(); } -HWTEST2_F(ExternalSemaphoreMTTest, givenHostSynchronizeFailsWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreMTTest, givenHostSynchronizeFailsWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned) { auto externalSemaphore = std::make_unique(); externalSemaphore->neoExternalSemaphore = std::make_unique(); @@ -161,7 +161,7 @@ HWTEST2_F(ExternalSemaphoreMTTest, givenHostSynchronizeFailsWhenExternalSemaphor EXPECT_EQ(proxyEvent->hostSynchronizeCalledTimes, 1u); } -HWTEST2_F(ExternalSemaphoreMTTest, givenNEOExternalSemaphoreWhenAppendWaitExternalSemaphoresExpIsCalledThenExpectedSemaphoreStateIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreMTTest, givenNEOExternalSemaphoreWhenAppendWaitExternalSemaphoresExpIsCalledThenExpectedSemaphoreStateIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); diff --git a/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp b/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp index 434e1958a9..e6015dcdf6 100644 --- a/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp +++ b/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp @@ -124,7 +124,7 @@ class MockExternalSemaphoreEvent : public MockEvent { uint32_t hostSynchronizeCalledTimes = 0; }; -HWTEST2_F(WddmExternalSemaphoreMTTest, givenEnqueueSignalFailsWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned, MatchAny) { +HWTEST_F(WddmExternalSemaphoreMTTest, givenEnqueueSignalFailsWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned) { auto mockGdi = new MockFailGdi(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -171,7 +171,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenEnqueueSignalFailsWhenExternalSemaph EXPECT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(WddmExternalSemaphoreMTTest, givenSemaphoreSignalOperationEventWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned, MatchAny) { +HWTEST_F(WddmExternalSemaphoreMTTest, givenSemaphoreSignalOperationEventWhenExternalSemaphoreControllerIsRunningThenExpectedStateIsReturned) { auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); auto driverHandleImp = std::make_unique(); @@ -215,7 +215,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenSemaphoreSignalOperationEventWhenExt EXPECT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(WddmExternalSemaphoreMTTest, givenImmediateCommandListWhenAppendWaitExternalSemaphoresExpIsCalledThenSuccessIsReturned, MatchAny) { +HWTEST_F(WddmExternalSemaphoreMTTest, givenImmediateCommandListWhenAppendWaitExternalSemaphoresExpIsCalledThenSuccessIsReturned) { ze_external_semaphore_ext_desc_t desc = {}; ze_external_semaphore_ext_handle_t hSemaphore; HANDLE extSemaphoreHandle = 0; @@ -260,7 +260,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenImmediateCommandListWhenAppendWaitEx EXPECT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(WddmExternalSemaphoreMTTest, givenRegularCommandListWhenAppendWaitExternalSemaphoresExpIsCalledThenInvalidArgumentIsReturned, MatchAny) { +HWTEST_F(WddmExternalSemaphoreMTTest, givenRegularCommandListWhenAppendWaitExternalSemaphoresExpIsCalledThenInvalidArgumentIsReturned) { ze_external_semaphore_ext_desc_t desc = {}; ze_external_semaphore_ext_handle_t hSemaphore; HANDLE extSemaphoreHandle = 0; @@ -322,7 +322,7 @@ struct MockCommandListImmediateExtSem : public WhiteBox<::L0::CommandListCoreFam bool failingSignalEvent = false; }; -HWTEST2_F(WddmExternalSemaphoreMTTest, givenInternalProxyEventFailsToAppendWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(WddmExternalSemaphoreMTTest, givenInternalProxyEventFailsToAppendWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned) { ze_external_semaphore_ext_desc_t desc = {}; ze_external_semaphore_ext_handle_t hSemaphore; HANDLE extSemaphoreHandle = 0; @@ -363,7 +363,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenInternalProxyEventFailsToAppendWhenA EXPECT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(WddmExternalSemaphoreMTTest, givenWaitEventFailsToAppendWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(WddmExternalSemaphoreMTTest, givenWaitEventFailsToAppendWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned) { ze_external_semaphore_ext_desc_t desc = {}; ze_external_semaphore_ext_handle_t hSemaphore; HANDLE extSemaphoreHandle = 0; @@ -405,7 +405,7 @@ HWTEST2_F(WddmExternalSemaphoreMTTest, givenWaitEventFailsToAppendWhenAppendWait EXPECT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(WddmExternalSemaphoreMTTest, givenSignalEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(WddmExternalSemaphoreMTTest, givenSignalEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned) { ze_external_semaphore_ext_desc_t desc = {}; ze_external_semaphore_ext_handle_t hSemaphore; HANDLE extSemaphoreHandle = 0; diff --git a/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp b/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp index 90e265804c..10eda1089f 100644 --- a/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp +++ b/level_zero/core/test/unit_tests/sources/assert/test_assert.cpp @@ -228,7 +228,7 @@ TEST_F(CommandListImmediateWithAssert, GivenImmediateCmdListWhenKernelWithAssert EXPECT_FALSE(commandList->hasKernelWithAssert()); } -HWTEST2_F(CommandListImmediateWithAssert, GivenImmediateCmdListWhenCheckingAssertThenPrintMessageAndAbortOnAssertHandlerIsCalled, MatchAny) { +HWTEST_F(CommandListImmediateWithAssert, GivenImmediateCmdListWhenCheckingAssertThenPrintMessageAndAbortOnAssertHandlerIsCalled) { ze_result_t result; ze_command_queue_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC; @@ -246,7 +246,7 @@ HWTEST2_F(CommandListImmediateWithAssert, GivenImmediateCmdListWhenCheckingAsser EXPECT_EQ(1u, assertHandler->printAssertAndAbortCalled); } -HWTEST2_F(CommandListImmediateWithAssert, GivenImmediateCmdListAndNoAssertHandlerWhenCheckingAssertThenUnrecoverableIsCalled, MatchAny) { +HWTEST_F(CommandListImmediateWithAssert, GivenImmediateCmdListAndNoAssertHandlerWhenCheckingAssertThenUnrecoverableIsCalled) { ze_result_t result; ze_command_queue_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC; @@ -260,7 +260,7 @@ HWTEST2_F(CommandListImmediateWithAssert, GivenImmediateCmdListAndNoAssertHandle EXPECT_THROW(static_cast *>(commandList.get())->checkAssert(), std::exception); } -HWTEST2_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendedToAsynchronousImmCommandListThenAssertIsNotChecked, MatchAny) { +HWTEST_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendedToAsynchronousImmCommandListThenAssertIsNotChecked) { ze_result_t result; Mock module(device, nullptr, ModuleType::user); @@ -295,7 +295,7 @@ HWTEST2_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendedToAsy EXPECT_EQ(0u, cmdList.checkAssertCalled); } -HWTEST2_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendedToSynchronousImmCommandListThenAssertIsChecked, MatchAny) { +HWTEST_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendedToSynchronousImmCommandListThenAssertIsChecked) { ze_result_t result; auto &csr = neoDevice->getUltCommandStreamReceiver(); Mock module(device, nullptr, ModuleType::user); @@ -329,7 +329,7 @@ HWTEST2_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendedToSyn EXPECT_EQ(1u, cmdList.checkAssertCalled); } -HWTEST2_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendToSynchronousImmCommandListHangsThenAssertIsChecked, MatchAny) { +HWTEST_F(CommandListImmediateWithAssert, givenKernelWithAssertWhenAppendToSynchronousImmCommandListHangsThenAssertIsChecked) { ze_result_t result; Mock module(device, nullptr, ModuleType::user); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp index 8b7c671e1b..6bea81e67c 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp @@ -3026,7 +3026,7 @@ HWTEST_F(CommandListCreateTests, givenCommandListWhenAppendingBarrierWithIncorre EXPECT_EQ(returnValue, ZE_RESULT_ERROR_INVALID_ARGUMENT); } -HWTEST2_F(CommandListCreateTests, givenCopyCommandListWhenProfilingBeforeCommandForCopyOnlyThenCommandsHaveCorrectEventOffsets, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCopyCommandListWhenProfilingBeforeCommandForCopyOnlyThenCommandsHaveCorrectEventOffsets) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; auto commandList = std::make_unique>>(); @@ -3064,7 +3064,7 @@ HWTEST2_F(CommandListCreateTests, givenCopyCommandListWhenProfilingBeforeCommand EXPECT_EQ(cmd->getMemoryAddress(), ptrOffset(baseAddr, contextOffset)); } -HWTEST2_F(CommandListCreateTests, givenCopyCommandListWhenProfilingAfterCommandForCopyOnlyThenCommandsHaveCorrectEventOffsets, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCopyCommandListWhenProfilingAfterCommandForCopyOnlyThenCommandsHaveCorrectEventOffsets) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; auto commandList = std::make_unique>>(); @@ -3099,7 +3099,7 @@ HWTEST2_F(CommandListCreateTests, givenCopyCommandListWhenProfilingAfterCommandF EXPECT_EQ(cmd->getMemoryAddress(), ptrOffset(baseAddr, contextOffset)); } -HWTEST2_F(CommandListCreateTests, givenNullEventWhenAppendEventAfterWalkerThenNothingAddedToStream, MatchAny) { +HWTEST_F(CommandListCreateTests, givenNullEventWhenAppendEventAfterWalkerThenNothingAddedToStream) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); @@ -3267,7 +3267,7 @@ HWTEST2_F(CommandListCreateTests, givenDummyBlitNotRequiredWhenEncodeMiFlushThen EXPECT_EQ(commandContainer.getResidencyContainer().size(), 0u); } -HWTEST2_F(CommandListCreateTests, givenEmptySvmManagerWhenIsAllocationImportedThenFalseIsReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenEmptySvmManagerWhenIsAllocationImportedThenFalseIsReturned) { auto commandListCore = std::make_unique>>(); commandListCore->initialize(device, NEO::EngineGroupType::compute, 0u); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp index 1011f8c9fa..f603052e39 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp @@ -197,7 +197,7 @@ class MockCommandListHw : public WhiteBox<::L0::CommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -207,7 +207,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledWithNullDstPtrT EXPECT_EQ(ret, ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledWithNullSrcPtrThenAppendMemoryCopyWithappendMemoryCopyReturnsError, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledWithNullSrcPtrThenAppendMemoryCopyWithappendMemoryCopyReturnsError) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = nullptr; @@ -217,7 +217,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledWithNullSrcPtrT EXPECT_EQ(ret, ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledWithNullSrcPtrAndDstPtrThenAppendMemoryCopyWithappendMemoryCopyReturnsError, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledWithNullSrcPtrAndDstPtrThenAppendMemoryCopyWithappendMemoryCopyReturnsError) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = nullptr; @@ -227,7 +227,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledWithNullSrcPtrA EXPECT_EQ(ret, ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullSrcPtrAndDstPtrThenAppendMemoryCopyRegionReturnsError, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullSrcPtrAndDstPtrThenAppendMemoryCopyRegionReturnsError) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = nullptr; @@ -239,7 +239,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullS EXPECT_EQ(ret, ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullSrcPtrThenAppendMemoryCopyRegionReturnsError, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullSrcPtrThenAppendMemoryCopyRegionReturnsError) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = nullptr; @@ -251,7 +251,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullS EXPECT_EQ(ret, ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullDstPtrThenAppendMemoryCopyRegionReturnsError, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullDstPtrThenAppendMemoryCopyRegionReturnsError) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x2345); @@ -263,7 +263,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledWithNullD EXPECT_EQ(ret, ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryFillCalledWithNullDstPtrThenAppendMemoryFillReturnsError, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryFillCalledWithNullDstPtrThenAppendMemoryFillReturnsError) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *dstPtr = reinterpret_cast(0x1234); @@ -278,7 +278,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryFillCalledWithNullDstPtrT EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppend, givenCommandListWhenQueryKernelTimestampsCalledWithNullDstPtrThenAppendQueryKernelTimestampsReturnsError, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenQueryKernelTimestampsCalledWithNullDstPtrThenAppendQueryKernelTimestampsReturnsError) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *dstPtr = nullptr; @@ -311,7 +311,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledThenAppendMemor EXPECT_EQ(cmdList.appendMemoryCopyBlitCalledTimes, 0u); } -HWTEST2_F(CommandListAppend, givenCommandListWhen4GByteMemoryCopyCalledThenAppendMemoryCopyWithappendMemoryCopyKernelWithGAStatelessCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhen4GByteMemoryCopyCalledThenAppendMemoryCopyWithappendMemoryCopyKernelWithGAStatelessCalled) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -322,7 +322,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhen4GByteMemoryCopyCalledThenAppen EXPECT_EQ(cmdList.appendMemoryCopyBlitCalledTimes, 0u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledThenAppendMemoryCopyWithappendMemoryCopyWithBliterCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledThenAppendMemoryCopyWithappendMemoryCopyWithBliterCalled) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -332,7 +332,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyCalledThenAppendMemor EXPECT_GT(cmdList.appendMemoryCopyBlitCalledTimes, 0u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledThenAppendMemoryCopyWithappendMemoryCopyWithBliterCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledThenAppendMemoryCopyWithappendMemoryCopyWithBliterCalled) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -343,7 +343,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenMemoryCopyRegionCalledThenAppen EXPECT_GT(cmdList.appendMemoryCopyBlitRegionCalledTimes, 0u); } -HWTEST2_F(CommandListCreateTests, givenCommandListWhenPageFaultCopyCalledThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalled, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCommandListWhenPageFaultCopyCalledThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalled) { DebugManagerStateRestore restorer; debugManager.flags.SelectCmdListHeapAddressModel.set(0); @@ -377,7 +377,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListWhenPageFaultCopyCalledThenapp EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGAStatelessCalledTimes, device->getNEODevice()->getCompilerProductHelper().isForceToStatelessRequired() ? 1u : 0u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngineThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngineThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalled) { DebugManagerStateRestore restorer; debugManager.flags.SelectCmdListHeapAddressModel.set(0); @@ -409,7 +409,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi EXPECT_EQ(cmdList.appendMemoryCopyBlitCalledTimes, 1u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalledForMiddleAndRightSizesAreCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalledForMiddleAndRightSizesAreCalled) { DebugManagerStateRestore restorer; debugManager.flags.SelectCmdListHeapAddressModel.set(0); @@ -442,7 +442,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledThenappendPa EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGAStatelessCalledTimes, device->getNEODevice()->getCompilerProductHelper().isForceToStatelessRequired() ? 2u : 0u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledAndErrorOnMidCopyThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalledForMiddleIsCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledAndErrorOnMidCopyThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalledForMiddleIsCalled) { DebugManagerStateRestore restorer; debugManager.flags.SelectCmdListHeapAddressModel.set(0); @@ -475,7 +475,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledAndErrorOnMi EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGAStatelessCalledTimes, device->getNEODevice()->getCompilerProductHelper().isForceToStatelessRequired() ? 1u : 0u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngineThenappendPageFaultCopyWithappendMemoryCopyCalledOnlyOnce, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngineThenappendPageFaultCopyWithappendMemoryCopyCalledOnlyOnce) { MockCommandListHw cmdList; size_t size = ((sizeof(uint32_t) * 4) + 1); cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); @@ -504,7 +504,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi EXPECT_EQ(cmdList.appendMemoryCopyBlitCalledTimes, 1u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngineAndErrorOnMidOperationThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalledForMiddleIsCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngineAndErrorOnMidOperationThenappendPageFaultCopyWithappendMemoryCopyKernelWithGACalledForMiddleIsCalled) { MockCommandListHw cmdList(true); size_t size = ((sizeof(uint32_t) * 4) + 1); cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); @@ -533,7 +533,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenPageFaultCopyCalledWithCopyEngi EXPECT_EQ(cmdList.appendMemoryCopyBlitCalledTimes, 1u); } -HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPageFaultCopyWithappendMemoryCopyKernelWithGAStatelessCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPageFaultCopyWithappendMemoryCopyKernelWithGAStatelessCalled) { MockCommandListHw cmdList; size_t size = 0x100000000; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -563,7 +563,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPa EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGAStatelessCalledTimes, 1u); } -HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPageFaultCopyWithappendMemoryCopyKernelWithGAStatelessCalledForMiddleAndRightSizesAreCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPageFaultCopyWithappendMemoryCopyKernelWithGAStatelessCalledForMiddleAndRightSizesAreCalled) { MockCommandListHw cmdList; size_t size = 0x100000001; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -593,7 +593,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhen4GBytePageFaultCopyCalledThenPa EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGAStatelessCalledTimes, 2u); } -HWTEST2_F(CommandListAppend, givenCommandListAnd3dBufferWhenMemoryCopyRegionCalledThenCopyKernel3DCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListAnd3dBufferWhenMemoryCopyRegionCalledThenCopyKernel3DCalled) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -605,7 +605,7 @@ HWTEST2_F(CommandListAppend, givenCommandListAnd3dBufferWhenMemoryCopyRegionCall EXPECT_GT(cmdList.appendMemoryCopyKernel3dCalledTimes, 0u); } -HWTEST2_F(CommandListAppend, givenCommandListAnd2dBufferWhenMemoryCopyRegionCalledThenCopyKernel2DCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListAnd2dBufferWhenMemoryCopyRegionCalledThenCopyKernel2DCalled) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -636,7 +636,7 @@ HWTEST2_F(CommandListAppend, givenImmediateCommandListWithFlushTaskEnabledWhenAp EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppend, givenCopyOnlyCommandListWhenAppendMemoryFillCalledThenAppendBlitFillCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCopyOnlyCommandListWhenAppendMemoryFillCalledThenAppendBlitFillCalled) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *dstPtr = reinterpret_cast(0x1234); @@ -645,7 +645,7 @@ HWTEST2_F(CommandListAppend, givenCopyOnlyCommandListWhenAppendMemoryFillCalledT EXPECT_GT(cmdList.appendBlitFillCalledTimes, 0u); } -HWTEST2_F(CommandListAppend, givenCommandListWhenAppendMemoryFillCalledThenAppendBlitFillNotCalled, MatchAny) { +HWTEST_F(CommandListAppend, givenCommandListWhenAppendMemoryFillCalledThenAppendBlitFillNotCalled) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *dstPtr = reinterpret_cast(0x1234); @@ -654,7 +654,7 @@ HWTEST2_F(CommandListAppend, givenCommandListWhenAppendMemoryFillCalledThenAppen EXPECT_EQ(cmdList.appendBlitFillCalledTimes, 0u); } -HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryCopyWithSignalEventsThenSemaphoreWaitAndPipeControlAreFound, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCommandListWhenMemoryCopyWithSignalEventsThenSemaphoreWaitAndPipeControlAreFound) { using SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; ze_result_t result = ZE_RESULT_SUCCESS; @@ -1142,7 +1142,7 @@ HWTEST2_F(CommandListAppend, givenCopyCommandListAndNullDestinationRegionWhen3DI EXPECT_EQ(cmdList.appendImageRegionDstOrigin, expectedRegionOrigin); } -HWTEST2_F(CommandListAppend, givenCopyCommandListWhen1DArrayImageCopyRegionThenAppendCopyImageBlitCalledWithCorrectSizes, MatchAny) { +HWTEST_F(CommandListAppend, givenCopyCommandListWhen1DArrayImageCopyRegionThenAppendCopyImageBlitCalledWithCorrectSizes) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); ze_image_desc_t zeDesc = {ZE_STRUCTURE_TYPE_IMAGE_DESC, @@ -1183,7 +1183,7 @@ HWTEST2_F(CommandListAppend, givenCopyCommandListWhen1DArrayImageCopyRegionThenA EXPECT_EQ(cmdList.appendCopyImageDstSize, expectedCopyImageDstSize); } -HWTEST2_F(CommandListAppend, givenCopyCommandListWhen2DArrayImageCopyRegionThenAppendCopyImageBlitCalledWithCorrectSizes, MatchAny) { +HWTEST_F(CommandListAppend, givenCopyCommandListWhen2DArrayImageCopyRegionThenAppendCopyImageBlitCalledWithCorrectSizes) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); ze_image_desc_t zeDesc = {ZE_STRUCTURE_TYPE_IMAGE_DESC, @@ -1257,7 +1257,7 @@ HWTEST2_F(CommandListAppend, givenCopyCommandListWhenCopyFromImageToImageThenBli EXPECT_FALSE(cmdList.useEvents); } -HWTEST2_F(CommandListAppend, givenCopyCommandListWhenImageCopyFromToMemoryExtWithInvalidInputThenErrorReturned, MatchAny) { +HWTEST_F(CommandListAppend, givenCopyCommandListWhenImageCopyFromToMemoryExtWithInvalidInputThenErrorReturned) { MockCommandListHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); ze_image_desc_t zeDesc = {ZE_STRUCTURE_TYPE_IMAGE_DESC, @@ -1565,7 +1565,7 @@ class MockCommandListForRegionSize : public WhiteBox<::L0::CommandListCoreFamily 0x1234}; }; -HWTEST2_F(CommandListCreateTests, givenZeroAsPitchAndSlicePitchWhenMemoryCopyRegionCalledThenSizesEqualOffsetPlusCopySize, MatchAny) { +HWTEST_F(CommandListCreateTests, givenZeroAsPitchAndSlicePitchWhenMemoryCopyRegionCalledThenSizesEqualOffsetPlusCopySize) { MockCommandListForRegionSize cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -1584,7 +1584,7 @@ HWTEST2_F(CommandListCreateTests, givenZeroAsPitchAndSlicePitchWhenMemoryCopyReg EXPECT_EQ(cmdList.srcSize.z, srcRegion.depth + srcRegion.originZ); } -HWTEST2_F(CommandListCreateTests, givenPitchAndSlicePitchWhenMemoryCopyRegionCalledThenSizesAreBasedOnPitch, MatchAny) { +HWTEST_F(CommandListCreateTests, givenPitchAndSlicePitchWhenMemoryCopyRegionCalledThenSizesAreBasedOnPitch) { MockCommandListForRegionSize cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -1611,7 +1611,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListThenSshCorrectlyReserved, IsGe using CommandListAppendMemoryCopyBlit = Test; -HWTEST2_F(CommandListAppendMemoryCopyBlit, whenAppendMemoryCopyBlitIsAppendedAndNoSpaceIsAvailableThenNextCommandBufferIsCreated, MatchAny) { +HWTEST_F(CommandListAppendMemoryCopyBlit, whenAppendMemoryCopyBlitIsAppendedAndNoSpaceIsAvailableThenNextCommandBufferIsCreated) { using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END; DebugManagerStateRestore restorer; @@ -1668,7 +1668,7 @@ struct MockL0GfxCoreHelperSupportsCmdListHeapSharingHw : L0::L0GfxCoreHelperHw mockL0GfxCoreHelperSupport{}; std::unique_ptr l0GfxCoreHelperBackup(static_cast(&mockL0GfxCoreHelperSupport)); device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[0]->apiGfxCoreHelper.swap(l0GfxCoreHelperBackup); @@ -1701,7 +1701,7 @@ struct MockL0GfxCoreHelperNoSupportsCmdListHeapSharingHw : L0::L0GfxCoreHelperHw bool platformSupportsCmdListHeapSharing() const override { return false; } }; -HWTEST2_F(CommandListCreateTests, givenPlatformNotSupportsSharedHeapsWhenImmediateCmdListCreatedWithFlushTaskSetThenSharedHeapsIsNotEnabled, MatchAny) { +HWTEST_F(CommandListCreateTests, givenPlatformNotSupportsSharedHeapsWhenImmediateCmdListCreatedWithFlushTaskSetThenSharedHeapsIsNotEnabled) { MockL0GfxCoreHelperNoSupportsCmdListHeapSharingHw mockL0GfxCoreHelperNoSupport; std::unique_ptr l0GfxCoreHelperBackup(static_cast(&mockL0GfxCoreHelperNoSupport)); device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[0]->apiGfxCoreHelper.swap(l0GfxCoreHelperBackup); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp index 3da736b4b3..517ac47e90 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp @@ -104,9 +104,7 @@ TEST_F(CommandListCreateNegativeTest, whenDeviceAllocationFailsDuringCreateComma using CommandListCreateNegativeStateBaseAddressTest = Test>; -HWTEST2_F(CommandListCreateNegativeStateBaseAddressTest, - GivenStateBaseAddressTrackingWhenDeviceAllocationFailsDuringCommandListCreateThenCacheIsNotInvalidatedAndAppropriateValueIsReturned, - MatchAny) { +HWTEST_F(CommandListCreateNegativeStateBaseAddressTest, GivenStateBaseAddressTrackingWhenDeviceAllocationFailsDuringCommandListCreateThenCacheIsNotInvalidatedAndAppropriateValueIsReturned) { auto &csr = neoDevice->getUltCommandStreamReceiver(); auto &csrStream = csr.commandStream; @@ -136,7 +134,7 @@ TEST_F(CommandListCreateNegativeTest, whenDeviceAllocationFailsDuringCommandList ASSERT_EQ(nullptr, commandList); } -HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenGettingAllocInRangeThenAllocFromMapReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostAllocInMapWhenGettingAllocInRangeThenAllocFromMapReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t gpuAddress = 0x1200; @@ -153,7 +151,7 @@ HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenGettingAllocInRangeThen commandList->hostPtrMap.clear(); } -HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenSizeIsOutOfRangeThenNullPtrReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostAllocInMapWhenSizeIsOutOfRangeThenNullPtrReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t gpuAddress = 0x1200; @@ -170,7 +168,7 @@ HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenSizeIsOutOfRangeThenNul commandList->hostPtrMap.clear(); } -HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsOutOfRangeThenNullPtrReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsOutOfRangeThenNullPtrReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t gpuAddress = 0x1200; @@ -187,7 +185,7 @@ HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsOutOfRangeThenNull commandList->hostPtrMap.clear(); } -HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenGetHostPtrAllocCalledThenCorrectOffsetIsSet, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostAllocInMapWhenGetHostPtrAllocCalledThenCorrectOffsetIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t gpuAddress = 0x1200; @@ -216,7 +214,7 @@ class DeviceHostPtrFailMock : public MockDeviceImp { } }; -HWTEST2_F(CommandListCreateTests, givenGetAlignedAllocationCalledWithInvalidPtrThenNullptrReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenGetAlignedAllocationCalledWithInvalidPtrThenNullptrReturned) { auto failDevice = std::make_unique(device->getNEODevice(), execEnv); failDevice->neoDevice = device->getNEODevice(); auto commandList = std::make_unique>>(); @@ -229,7 +227,7 @@ HWTEST2_F(CommandListCreateTests, givenGetAlignedAllocationCalledWithInvalidPtrT EXPECT_EQ(nullptr, outData.alloc); } -HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsInMapThenAllocationReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsInMapThenAllocationReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t gpuAddress = 0x1200; @@ -246,7 +244,7 @@ HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsInMapThenAllocatio commandList->hostPtrMap.clear(); } -HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsInMapButWithBiggerSizeThenNullPtrReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsInMapButWithBiggerSizeThenNullPtrReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t gpuAddress = 0x1200; @@ -263,7 +261,7 @@ HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrIsInMapButWithBigger commandList->hostPtrMap.clear(); } -HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrLowerThanAnyInMapThenNullPtrReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostAllocInMapWhenPtrLowerThanAnyInMapThenNullPtrReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t gpuAddress = 0x1200; @@ -280,9 +278,7 @@ HWTEST2_F(CommandListCreateTests, givenHostAllocInMapWhenPtrLowerThanAnyInMapThe commandList->hostPtrMap.clear(); } -HWTEST2_F(CommandListCreateTests, - givenCmdListHostPointerUsedWhenGettingAlignedAllocationThenRetrieveProperOffsetAndAddress, - MatchAny) { +HWTEST_F(CommandListCreateTests, givenCmdListHostPointerUsedWhenGettingAlignedAllocationThenRetrieveProperOffsetAndAddress) { auto commandList = std::make_unique<::L0::ult::CommandListCoreFamily>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -318,9 +314,7 @@ HWTEST2_F(CommandListCreateTests, device->getNEODevice()->getMemoryManager()->freeSystemMemory(cmdListHostBuffer); } -HWTEST2_F(CommandListCreateTests, - givenCmdListHostPointerUsedWhenRemoveHostPtrAllocationThenStopDirectSubmissions, - MatchAny) { +HWTEST_F(CommandListCreateTests, givenCmdListHostPointerUsedWhenRemoveHostPtrAllocationThenStopDirectSubmissions) { const auto &engines = device->getNEODevice()->getMemoryManager()->getRegisteredEngines(device->getRootDeviceIndex()); for (const auto &engine : engines) { auto ultCsr = static_cast *>(engine.commandStreamReceiver); @@ -764,7 +758,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryFillHavingEventsWith context->freeMem(dstBuffer); } -HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned) { ze_result_t result = ZE_RESULT_SUCCESS; std::unique_ptr commandList(CommandList::create(productFamily, device, NEO::EngineGroupType::copy, 0u, result, false)); @@ -795,7 +789,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionWithSignal EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionWithSignalAndInvalidWaitHandleUsingCopyEngineThenErrorIsReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionWithSignalAndInvalidWaitHandleUsingCopyEngineThenErrorIsReturned) { ze_result_t result = ZE_RESULT_SUCCESS; std::unique_ptr commandList(CommandList::create(productFamily, device, NEO::EngineGroupType::copy, 0u, result, false)); @@ -826,7 +820,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionWithSignal EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, result); } -HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionHasEmptyRegionWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionHasEmptyRegionWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned) { ze_result_t result = ZE_RESULT_SUCCESS; std::unique_ptr commandList(CommandList::create(productFamily, device, NEO::EngineGroupType::copy, 0u, result, false)); @@ -856,7 +850,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListWhenMemoryCopyRegionHasEmptyRe EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListCreateTests, givenImmediateCommandListWhenMemoryCopyRegionWithSignalAndWaitEventsUsingRenderEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenImmediateCommandListWhenMemoryCopyRegionWithSignalAndWaitEventsUsingRenderEngineThenSuccessIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -947,7 +941,7 @@ TEST_F(CommandListCreateTests, givenImmediateCommandListWhenMemoryCopyRegionWith EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(CommandListCreateTests, givenImmediateCommandListWhenMemoryCopyRegionWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, givenImmediateCommandListWhenMemoryCopyRegionWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -1148,7 +1142,7 @@ HWTEST2_F(CommandListCreateWithBcs, givenImmediateCommandListWhenCopyFromImageTo EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); } -HWTEST2_F(CommandListCreateWithBcs, givenImmediateCommandListWhenMemoryCopyRegionWithSignalAndInvalidWaitHandleUsingCopyEngineThenErrorIsReturned, MatchAny) { +HWTEST_F(CommandListCreateWithBcs, givenImmediateCommandListWhenMemoryCopyRegionWithSignalAndInvalidWaitHandleUsingCopyEngineThenErrorIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -1408,14 +1402,14 @@ HWTEST2_F(CommandListCreateWithBcs, givenForceFlushTaskEnabledWhenCreatingComman EXPECT_TRUE(commandList->flushTaskSubmissionEnabled()); } -HWTEST2_F(CommandListCreateTests, whenGettingCommandsToPatchThenCorrectValuesAreReturned, MatchAny) { +HWTEST_F(CommandListCreateTests, whenGettingCommandsToPatchThenCorrectValuesAreReturned) { auto commandList = std::make_unique>>(); EXPECT_EQ(&commandList->requiredStreamState, &commandList->getRequiredStreamState()); EXPECT_EQ(&commandList->finalStreamState, &commandList->getFinalStreamState()); EXPECT_EQ(&commandList->commandsToPatch, &commandList->getCommandsToPatch()); } -HWTEST2_F(CommandListCreateTests, givenNonEmptyCommandsToPatchWhenClearCommandsToPatchIsCalledThenCommandsAreCorrectlyCleared, MatchAny) { +HWTEST_F(CommandListCreateTests, givenNonEmptyCommandsToPatchWhenClearCommandsToPatchIsCalledThenCommandsAreCorrectlyCleared) { auto pCommandList = std::make_unique>>(); EXPECT_TRUE(pCommandList->commandsToPatch.empty()); @@ -1504,7 +1498,7 @@ class MyDeviceMock : public MockDeviceImp { } }; -HWTEST2_F(CommandListCreateTests, givenHostPtrAllocAllocWhenInternalMemCreatedThenNewAllocAddedToDealocationContainer, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostPtrAllocAllocWhenInternalMemCreatedThenNewAllocAddedToDealocationContainer) { auto myDevice = std::make_unique>(device->getNEODevice(), execEnv); myDevice->neoDevice = device->getNEODevice(); auto commandList = std::make_unique>>(); @@ -1519,7 +1513,7 @@ HWTEST2_F(CommandListCreateTests, givenHostPtrAllocAllocWhenInternalMemCreatedTh commandList->commandContainer.getDeallocationContainer().clear(); } -HWTEST2_F(CommandListCreateTests, givenHostPtrAllocAllocWhenExternalMemCreatedThenNewAllocAddedToHostPtrMap, MatchAny) { +HWTEST_F(CommandListCreateTests, givenHostPtrAllocAllocWhenExternalMemCreatedThenNewAllocAddedToHostPtrMap) { auto myDevice = std::make_unique>(device->getNEODevice(), execEnv); myDevice->neoDevice = device->getNEODevice(); auto commandList = std::make_unique>>(); @@ -1534,7 +1528,7 @@ HWTEST2_F(CommandListCreateTests, givenHostPtrAllocAllocWhenExternalMemCreatedTh commandList->hostPtrMap.clear(); } -HWTEST2_F(CommandListCreateWithBcs, givenHostPtrAllocAllocAndImmediateCmdListWhenExternalMemCreatedThenNewAllocAddedToInternalAllocationStorage, MatchAny) { +HWTEST_F(CommandListCreateWithBcs, givenHostPtrAllocAllocAndImmediateCmdListWhenExternalMemCreatedThenNewAllocAddedToInternalAllocationStorage) { auto myDevice = std::make_unique>(device->getNEODevice(), execEnv); myDevice->neoDevice = device->getNEODevice(); CommandStreamReceiver *csr = neoDevice->getInternalCopyEngine() ? neoDevice->getInternalCopyEngine()->commandStreamReceiver : neoDevice->getInternalEngine().commandStreamReceiver; @@ -1557,7 +1551,7 @@ HWTEST2_F(CommandListCreateWithBcs, givenHostPtrAllocAllocAndImmediateCmdListWhe EXPECT_EQ(1u, commandList->getCsr(false)->getInternalAllocationStorage()->getTemporaryAllocations().peekHead()->hostPtrTaskCountAssignment); } -HWTEST2_F(CommandListCreateTests, givenGetAlignedAllocationWhenInternalMemWithinDifferentAllocThenReturnNewAlloc, MatchAny) { +HWTEST_F(CommandListCreateTests, givenGetAlignedAllocationWhenInternalMemWithinDifferentAllocThenReturnNewAlloc) { auto myDevice = std::make_unique>(device->getNEODevice(), execEnv); myDevice->neoDevice = device->getNEODevice(); auto commandList = std::make_unique>>(); @@ -1571,7 +1565,7 @@ HWTEST2_F(CommandListCreateTests, givenGetAlignedAllocationWhenInternalMemWithin driverHandle->getMemoryManager()->freeGraphicsMemory(outData2.alloc); commandList->commandContainer.getDeallocationContainer().clear(); } -HWTEST2_F(CommandListCreateTests, givenGetAlignedAllocationWhenExternalMemWithinDifferentAllocThenReturnPreviouslyAllocatedMem, MatchAny) { +HWTEST_F(CommandListCreateTests, givenGetAlignedAllocationWhenExternalMemWithinDifferentAllocThenReturnPreviouslyAllocatedMem) { auto myDevice = std::make_unique>(device->getNEODevice(), execEnv); myDevice->neoDevice = device->getNEODevice(); auto commandList = std::make_unique>>(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp index aa91530945..8cc35e6304 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp @@ -38,7 +38,7 @@ using namespace NEO; namespace L0 { namespace ult { using CommandListCreateTests = Test; -HWTEST2_F(CommandListCreateTests, givenCopyOnlyCommandListWhenAppendWriteGlobalTimestampCalledThenMiFlushDWWithTimestampEncoded, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCopyOnlyCommandListWhenAppendWriteGlobalTimestampCalledThenMiFlushDWWithTimestampEncoded) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using MI_FLUSH_DW = typename GfxFamily::MI_FLUSH_DW; @@ -80,7 +80,7 @@ HWTEST2_F(CommandListCreateTests, givenCopyOnlyCommandListWhenAppendWriteGlobalT ASSERT_TRUE(postSyncFound); } -HWTEST2_F(CommandListCreateTests, givenCommandListWhenAppendWriteGlobalTimestampCalledThenPipeControlWithTimestampWriteEncoded, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCommandListWhenAppendWriteGlobalTimestampCalledThenPipeControlWithTimestampWriteEncoded) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; ze_result_t returnValue; @@ -114,7 +114,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListWhenAppendWriteGlobalTimestamp EXPECT_TRUE(foundTimestampPipeControl); } -HWTEST2_F(CommandListCreateTests, givenMovedDstptrWhenAppendWriteGlobalTimestampCalledThenPipeControlWithProperTimestampEncoded, MatchAny) { +HWTEST_F(CommandListCreateTests, givenMovedDstptrWhenAppendWriteGlobalTimestampCalledThenPipeControlWithProperTimestampEncoded) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; ze_result_t returnValue; @@ -148,7 +148,7 @@ HWTEST2_F(CommandListCreateTests, givenMovedDstptrWhenAppendWriteGlobalTimestamp EXPECT_TRUE(foundTimestampPipeControl); } -HWTEST2_F(CommandListCreateTests, givenCommandListWhenAppendWriteGlobalTimestampCalledThenTimestampAllocationIsInsideResidencyContainer, MatchAny) { +HWTEST_F(CommandListCreateTests, givenCommandListWhenAppendWriteGlobalTimestampCalledThenTimestampAllocationIsInsideResidencyContainer) { ze_result_t returnValue; std::unique_ptr commandList(CommandList::create(productFamily, device, NEO::EngineGroupType::renderCompute, 0u, returnValue, false)); uint64_t timestampAddress = 0x123456785500; @@ -163,7 +163,7 @@ HWTEST2_F(CommandListCreateTests, givenCommandListWhenAppendWriteGlobalTimestamp EXPECT_TRUE(addressIsInContainer); } -HWTEST2_F(CommandListCreateTests, givenImmediateCommandListWhenAppendWriteGlobalTimestampThenReturnsSuccess, MatchAny) { +HWTEST_F(CommandListCreateTests, givenImmediateCommandListWhenAppendWriteGlobalTimestampThenReturnsSuccess) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -761,7 +761,7 @@ HWTEST_F(CommandListImmediateFlushTaskComputeTests, givenUseCsrImmediateSubmissi context->destroy(); } -HWTEST2_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendBarrierThenIncrementBarrierCountAndDispatchBarrierTagUpdate, MatchAny) { +HWTEST_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendBarrierThenIncrementBarrierCountAndDispatchBarrierTagUpdate) { using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW; ze_command_queue_desc_t queueDesc = {}; @@ -790,7 +790,7 @@ HWTEST2_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendBarrier EXPECT_EQ(cmd->getImmediateData(), 2u); } -HWTEST2_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendWaitOnEventsThenIncrementBarrierCountAndDispatchBarrierTagUpdate, MatchAny) { +HWTEST_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendWaitOnEventsThenIncrementBarrierCountAndDispatchBarrierTagUpdate) { using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW; ze_command_queue_desc_t queueDesc = {}; @@ -832,7 +832,7 @@ HWTEST2_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendWaitOnE EXPECT_EQ(cmd->getImmediateData(), 2u); } -HWTEST2_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendWaitOnEventsWithTrackDependenciesSetToFalseThenDoNotIncrementBarrierCountAndDispatchBarrierTagUpdate, MatchAny) { +HWTEST_F(CommandListCreateTests, givenImmediateCopyOnlyCmdListWhenAppendWaitOnEventsWithTrackDependenciesSetToFalseThenDoNotIncrementBarrierCountAndDispatchBarrierTagUpdate) { ze_command_queue_desc_t queueDesc = {}; ze_result_t returnValue = ZE_RESULT_SUCCESS; std::unique_ptr commandList(CommandList::createImmediate(productFamily, device, &queueDesc, false, NEO::EngineGroupType::copy, returnValue)); @@ -883,7 +883,7 @@ HWTEST_F(CommandListCreateTests, GivenCommandListWhenUnalignedPtrThenSingleCopyA EXPECT_EQ(cmdList.end(), itor); } -HWTEST2_F(CommandListCreateTests, whenCommandListIsCreatedThenFlagsAreCorrectlySet, MatchAny) { +HWTEST_F(CommandListCreateTests, whenCommandListIsCreatedThenFlagsAreCorrectlySet) { ze_command_list_flags_t flags[] = {0b0, 0b1, 0b10, 0b11}; ze_result_t returnValue; @@ -896,9 +896,7 @@ HWTEST2_F(CommandListCreateTests, whenCommandListIsCreatedThenFlagsAreCorrectlyS } using HostPointerManagerCommandListTest = Test; -HWTEST2_F(HostPointerManagerCommandListTest, - givenImportedHostPointerWhenAppendMemoryFillUsingHostPointerThenAppendFillUsingHostPointerAllocation, - MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenImportedHostPointerWhenAppendMemoryFillUsingHostPointerThenAppendFillUsingHostPointerAllocation) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -914,9 +912,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(HostPointerManagerCommandListTest, - givenImportedHostPointerAndCopyEngineWhenAppendMemoryFillUsingHostPointerThenAppendFillUsingHostPointerAllocation, - MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenImportedHostPointerAndCopyEngineWhenAppendMemoryFillUsingHostPointerThenAppendFillUsingHostPointerAllocation) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); @@ -932,9 +928,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(HostPointerManagerCommandListTest, - givenHostPointerImportedWhenGettingAlignedAllocationThenRetrieveProperOffsetAndAddress, - MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenHostPointerImportedWhenGettingAlignedAllocationThenRetrieveProperOffsetAndAddress) { auto commandList = std::make_unique<::L0::ult::CommandListCoreFamily>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -972,9 +966,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(HostPointerManagerCommandListTest, - givenHostPointerImportedWhenGettingPointerFromAnotherPageThenRetrieveBaseAddressAndProperOffset, - MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenHostPointerImportedWhenGettingPointerFromAnotherPageThenRetrieveBaseAddressAndProperOffset) { auto commandList = std::make_unique<::L0::ult::CommandListCoreFamily>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -999,7 +991,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(HostPointerManagerCommandListTest, givenCommandListWhenMemoryFillWithSignalAndWaitEventsUsingRenderEngineThenPipeControlIsFound, MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenCommandListWhenMemoryFillWithSignalAndWaitEventsUsingRenderEngineThenPipeControlIsFound) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; ze_result_t result = ZE_RESULT_SUCCESS; @@ -1049,7 +1041,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, givenCommandListWhenMemoryFillWithS } } -HWTEST2_F(HostPointerManagerCommandListTest, givenCommandListWhenMemoryFillWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenCommandListWhenMemoryFillWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned) { ze_result_t result = ZE_RESULT_SUCCESS; auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); @@ -1083,7 +1075,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, givenCommandListWhenMemoryFillWithS EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(HostPointerManagerCommandListTest, givenImmediateCommandListWhenMemoryFillWithSignalAndWaitEventsUsingRenderEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenImmediateCommandListWhenMemoryFillWithSignalAndWaitEventsUsingRenderEngineThenSuccessIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -1129,7 +1121,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, givenImmediateCommandListWhenMemory EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(HostPointerManagerCommandListTest, givenImmediateCommandListWhenMemoryFillWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenImmediateCommandListWhenMemoryFillWithSignalAndWaitEventsUsingCopyEngineThenSuccessIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -1179,7 +1171,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, givenImmediateCommandListWhenMemory EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(HostPointerManagerCommandListTest, givenDebugModeToRegisterAllHostPointerWhenFindIsCalledThenRegisterHappens, MatchAny) { +HWTEST_F(HostPointerManagerCommandListTest, givenDebugModeToRegisterAllHostPointerWhenFindIsCalledThenRegisterHappens) { DebugManagerStateRestore restorer; debugManager.flags.ForceHostPointerImport.set(1); void *testPtr = heapPointer; @@ -1192,7 +1184,7 @@ HWTEST2_F(HostPointerManagerCommandListTest, givenDebugModeToRegisterAllHostPoin EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListCreateTests, givenStateBaseAddressTrackingStateWhenCommandListCreatedThenPlatformSurfaceHeapSizeUsed, MatchAny) { +HWTEST_F(CommandListCreateTests, givenStateBaseAddressTrackingStateWhenCommandListCreatedThenPlatformSurfaceHeapSizeUsed) { DebugManagerStateRestore restorer; debugManager.flags.UseExternalAllocatorForSshAndDsh.set(0); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[neoDevice->getRootDeviceIndex()]->bindlessHeapsHelper.reset(); @@ -1227,77 +1219,53 @@ HWTEST2_F(CommandListCreateTests, givenStateBaseAddressTrackingStateWhenCommandL using ImmediateCmdListSharedHeapsRegularFlushTaskTest = Test>; -HWTEST2_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, - givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendBarrierProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendBarrierProvidesNoHeapInfo) { testBody(NonKernelOperation::Barrier); } -HWTEST2_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, - givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendSignalEventProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendSignalEventProvidesNoHeapInfo) { testBody(NonKernelOperation::SignalEvent); } -HWTEST2_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, - givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendResetEventProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendResetEventProvidesNoHeapInfo) { testBody(NonKernelOperation::ResetEvent); } -HWTEST2_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, - givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendWaitOnEventsProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendWaitOnEventsProvidesNoHeapInfo) { testBody(NonKernelOperation::WaitOnEvents); } -HWTEST2_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, - givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendWriteGlobalTimestampProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendWriteGlobalTimestampProvidesNoHeapInfo) { testBody(NonKernelOperation::WriteGlobalTimestamp); } -HWTEST2_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, - givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendMemoryRangesBarrierProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsRegularFlushTaskTest, givenMultipleCommandListsUsingRegularWhenOldSharedHeapIsDepletedThenNonKernelAppendMemoryRangesBarrierProvidesNoHeapInfo) { testBody(NonKernelOperation::MemoryRangesBarrier); } using ImmediateCmdListSharedHeapsImmediateFlushTaskTest = Test>; -HWTEST2_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, - givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendBarrierProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendBarrierProvidesNoHeapInfo) { testBody(NonKernelOperation::Barrier); } -HWTEST2_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, - givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendSignalEventProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendSignalEventProvidesNoHeapInfo) { testBody(NonKernelOperation::SignalEvent); } -HWTEST2_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, - givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendResetEventProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendResetEventProvidesNoHeapInfo) { testBody(NonKernelOperation::ResetEvent); } -HWTEST2_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, - givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendWaitOnEventsProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendWaitOnEventsProvidesNoHeapInfo) { testBody(NonKernelOperation::WaitOnEvents); } -HWTEST2_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, - givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendWriteGlobalTimestampProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendWriteGlobalTimestampProvidesNoHeapInfo) { testBody(NonKernelOperation::WriteGlobalTimestamp); } -HWTEST2_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, - givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendMemoryRangesBarrierProvidesNoHeapInfo, - MatchAny) { +HWTEST_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, givenMultipleCommandListsUsingImmediateWhenOldSharedHeapIsDepletedThenNonKernelAppendMemoryRangesBarrierProvidesNoHeapInfo) { testBody(NonKernelOperation::MemoryRangesBarrier); } @@ -1361,7 +1329,7 @@ HWTEST2_F(ImmediateCmdListSharedHeapsImmediateFlushTaskTest, using ImmediateCommandListTest = Test; -HWTEST2_F(ImmediateCommandListTest, givenImmediateCommandListWhenClosingCommandListThenExpectNoEndingCmdDispatched, MatchAny) { +HWTEST_F(ImmediateCommandListTest, givenImmediateCommandListWhenClosingCommandListThenExpectNoEndingCmdDispatched) { std::unique_ptr commandList; const ze_command_queue_desc_t desc = {ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC}; ze_result_t returnValue; @@ -1594,7 +1562,7 @@ HWTEST2_F(CommandListScratchPatchGlobalStatelessHeapsStateInitTest, testScratchUndefinedNoPatching(); } -HWTEST2_F(ImmediateCommandListTest, givenImmediateCmdListWhenAppendingRegularThenImmediateStreamIsSelected, MatchAny) { +HWTEST_F(ImmediateCommandListTest, givenImmediateCmdListWhenAppendingRegularThenImmediateStreamIsSelected) { commandList->close(); auto cmdListHandle = commandList->toHandle(); @@ -1622,7 +1590,7 @@ HWTEST2_F(ImmediateCommandListTest, givenImmediateCmdListWhenAppendingRegularThe } } -HWTEST2_F(ImmediateCommandListTest, givenImmediateCmdListWhenAppendingRegularCmdListThenDoNotConsumeQueueInternalLinearStream, MatchAny) { +HWTEST_F(ImmediateCommandListTest, givenImmediateCmdListWhenAppendingRegularCmdListThenDoNotConsumeQueueInternalLinearStream) { auto immediateQueue = whiteboxCast(commandListImmediate->cmdQImmediate); commandList->close(); @@ -1635,8 +1603,7 @@ HWTEST2_F(ImmediateCommandListTest, givenImmediateCmdListWhenAppendingRegularCmd EXPECT_EQ(usedBefore, usedAfter); } -HWTEST2_F(ImmediateCommandListTest, - givenImmediateCmdListWithPrimaryBatchBufferWhenAppendingRegularCmdListThenCorrectEpilogueCmdBufferIsUsed, MatchAny) { +HWTEST_F(ImmediateCommandListTest, givenImmediateCmdListWithPrimaryBatchBufferWhenAppendingRegularCmdListThenCorrectEpilogueCmdBufferIsUsed) { using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END; auto &ultCsr = neoDevice->getUltCommandStreamReceiver(); @@ -1687,8 +1654,7 @@ HWTEST2_F(ImmediateCommandListTest, EXPECT_NE(cmdList.end(), iterator); } -HWTEST2_F(ImmediateCommandListTest, - givenCopyEngineImmediateCmdListWithPrimaryBatchBufferWhenAppendingRegularCmdListThenCorrectEpilogueCmdBufferIsUsed, MatchAny) { +HWTEST_F(ImmediateCommandListTest, givenCopyEngineImmediateCmdListWithPrimaryBatchBufferWhenAppendingRegularCmdListThenCorrectEpilogueCmdBufferIsUsed) { using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END; ze_result_t returnValue; @@ -1739,8 +1705,7 @@ HWTEST2_F(ImmediateCommandListTest, EXPECT_NE(cmdList.end(), iterator); } -HWTEST2_F(ImmediateCommandListTest, - givenImmediateCmdListWithPrimaryBatchBufferWhenAppendingRegularCmdListWithWaitEventThenDispatchSemaphoreAndJumpFromImmediateToRegular, MatchAny) { +HWTEST_F(ImmediateCommandListTest, givenImmediateCmdListWithPrimaryBatchBufferWhenAppendingRegularCmdListWithWaitEventThenDispatchSemaphoreAndJumpFromImmediateToRegular) { using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -1800,7 +1765,7 @@ HWTEST2_F(ImmediateCommandListTest, EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER::SECOND_LEVEL_BATCH_BUFFER_FIRST_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer()); } -HWTEST2_F(ImmediateCommandListTest, givenAsyncCmdlistWhenCmdlistIsDestroyedThenHostSynchronizeCalled, MatchAny) { +HWTEST_F(ImmediateCommandListTest, givenAsyncCmdlistWhenCmdlistIsDestroyedThenHostSynchronizeCalled) { ze_command_queue_desc_t queueDesc{ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC}; queueDesc.ordinal = 0u; queueDesc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp index 5cdc9dbe5f..8a84adabdd 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp @@ -58,7 +58,7 @@ HWTEST_F(CommandListCreate, givenCommandListWithInvalidWaitEventArgWhenAppendQue using AppendQueryKernelTimestamps = CommandListCreate; -HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsWithoutOffsetsThenProperBuiltinWasAdded, MatchAny) { +HWTEST_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsWithoutOffsetsThenProperBuiltinWasAdded) { USE_REAL_FILE_SYSTEM(); std::unique_ptr> testDevice = std::unique_ptr>(new MockDeviceForSpv(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get())); @@ -123,7 +123,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime context->freeMem(alloc); } -HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsWithOffsetsThenProperBuiltinWasAdded, MatchAny) { +HWTEST_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsWithOffsetsThenProperBuiltinWasAdded) { USE_REAL_FILE_SYSTEM(); std::unique_ptr> testDevice = std::unique_ptr>(new MockDeviceForSpv(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get())); @@ -190,7 +190,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime context->freeMem(offsetAlloc); } -HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsInUsmHostMemoryWithEventsNumberBiggerThanMaxWorkItemSizeThenProperGroupSizeAndGroupCountIsSet, MatchAny) { +HWTEST_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsInUsmHostMemoryWithEventsNumberBiggerThanMaxWorkItemSizeThenProperGroupSizeAndGroupCountIsSet) { USE_REAL_FILE_SYSTEM(); std::unique_ptr> testDevice = std::unique_ptr>(new MockDeviceForSpv(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get())); @@ -249,8 +249,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime context->freeMem(alloc); } -HWTEST2_F(AppendQueryKernelTimestamps, - givenCommandListWhenAppendQueryKernelTimestampsInExternalHostMemoryWithEventsNumberBiggerThanMaxWorkItemSizeThenProperGroupSizeAndGroupCountIsSet, MatchAny) { +HWTEST_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsInExternalHostMemoryWithEventsNumberBiggerThanMaxWorkItemSizeThenProperGroupSizeAndGroupCountIsSet) { USE_REAL_FILE_SYSTEM(); std::unique_ptr> testDevice = std::unique_ptr>(new MockDeviceForSpv(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get())); @@ -304,7 +303,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, EXPECT_TRUE(commandList.cmdListHelper.isDstInSystem); } -HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsAndInvalidResultSuggestGroupSizeThenUnknownResultReturned, MatchAny) { +HWTEST_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsAndInvalidResultSuggestGroupSizeThenUnknownResultReturned) { class MockQueryKernelTimestampsKernel : public L0::KernelImp { public: ze_result_t suggestGroupSize(uint32_t globalSizeX, uint32_t globalSizeY, @@ -382,7 +381,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime context->freeMem(alloc); } -HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsAndInvalidResultSetGroupSizeThenUnknownResultReturned, MatchAny) { +HWTEST_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTimestampsAndInvalidResultSetGroupSizeThenUnknownResultReturned) { class MockQueryKernelTimestampsKernel : public L0::KernelImp { public: ze_result_t suggestGroupSize(uint32_t globalSizeX, uint32_t globalSizeY, @@ -467,7 +466,7 @@ HWTEST2_F(AppendQueryKernelTimestamps, givenCommandListWhenAppendQueryKernelTime context->freeMem(alloc); } -HWTEST2_F(AppendQueryKernelTimestamps, givenEventWhenAppendQueryIsCalledThenSetAllEventData, MatchAny) { +HWTEST_F(AppendQueryKernelTimestamps, givenEventWhenAppendQueryIsCalledThenSetAllEventData) { class MockQueryKernelTimestampsKernel : public L0::KernelImp { public: MockQueryKernelTimestampsKernel(MockModule *module) : KernelImp{module}, module{module} { @@ -604,7 +603,7 @@ HWTEST_F(CommandListCreate, givenCommandListWhenAppendSignalEventWithScopeThenPi using CommandListTimestampEvent = Test; -HWTEST2_F(CommandListTimestampEvent, WhenIsTimestampEventForMultiTileThenCorrectResultIsReturned, MatchAny) { +HWTEST_F(CommandListTimestampEvent, WhenIsTimestampEventForMultiTileThenCorrectResultIsReturned) { auto cmdList = std::make_unique>>(); @@ -844,7 +843,7 @@ HWTEST_F(CommandListCreate, givenFlushTaskFlagEnabledAndAsyncCmdQueueAndCopyOnly EXPECT_GT(commandContainer.getCommandStream()->getUsed(), used); } -HWTEST2_F(CommandListCreate, givenImmediateCommandListAndAlreadyCompletedEventWhenAddEventsToCmdListThenProgramSemaphoresOnlyForIncompletedEvents, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateCommandListAndAlreadyCompletedEventWhenAddEventsToCmdListThenProgramSemaphoresOnlyForIncompletedEvents) { DebugManagerStateRestore restorer; NEO::debugManager.flags.SignalAllEventPackets.set(0); using SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -920,7 +919,7 @@ HWTEST_F(CommandListCreate, givenMetricsImmediateCopyOnlySingleTileDirectSubmiss EXPECT_EQ(reinterpret_cast(&commandList->getCmdContainer())->secondaryCommandStreamForImmediateCmdList.get(), nullptr); } -HWTEST2_F(CommandListCreate, givenSecondaryCommandStreamForImmediateCmdListWhenCheckAvailableSpaceThenSwapCommandStreams, MatchAny) { +HWTEST_F(CommandListCreate, givenSecondaryCommandStreamForImmediateCmdListWhenCheckAvailableSpaceThenSwapCommandStreams) { if (!device->getHwInfo().featureTable.flags.ftrLocalMemory) { GTEST_SKIP(); } @@ -1061,7 +1060,7 @@ HWTEST2_F(CommandListCreate, givenSystemAndLocalCommandStreamForImmediateCmdList EXPECT_TRUE(MemoryPoolHelper::isSystemMemoryPool(commandList->getCmdContainer().getCommandStream()->getGraphicsAllocation()->getMemoryPool())); } -HWTEST2_F(CommandListCreate, givenNoSecondaryCommandStreamForImmediateCmdListWhenCheckAvailableSpaceThenNotSwapCommandStreams, MatchAny) { +HWTEST_F(CommandListCreate, givenNoSecondaryCommandStreamForImmediateCmdListWhenCheckAvailableSpaceThenNotSwapCommandStreams) { if (!device->getHwInfo().featureTable.flags.ftrLocalMemory) { GTEST_SKIP(); } @@ -3442,4 +3441,4 @@ HWTEST2_F(CommandListStateBaseAddressPrivateHeapTest, } } // namespace ult -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp index a021235c9e..0b4293bbb4 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp @@ -107,7 +107,7 @@ HWTEST2_F(MultiTileCopyEngineCommandListTest, GivenMultiTileDeviceWhenCreatingCo } using CommandListExecuteImmediate = Test; -HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenRequiredStreamStateIsCorrectlyReported, MatchAny) { +HWTEST_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenRequiredStreamStateIsCorrectlyReported) { DebugManagerStateRestore restorer; debugManager.flags.UseImmediateFlushTask.set(0); UnitTestSetter::disableHeaplessStateInit(restorer); @@ -181,7 +181,7 @@ HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlus EXPECT_EQ(expectedThreadArbitrationPolicy, currentCsrStreamProperties.stateComputeMode.threadArbitrationPolicy.value); } -HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenContainsAnyKernelFlagIsReset, MatchAny) { +HWTEST_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenContainsAnyKernelFlagIsReset) { std::unique_ptr commandList; DebugManagerStateRestore restorer; const ze_command_queue_desc_t desc = {}; @@ -206,7 +206,7 @@ HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlus } } -HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenSuccessIsReturned) { std::unique_ptr commandList; const ze_command_queue_desc_t desc = {}; ze_result_t returnValue; @@ -216,7 +216,7 @@ HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlus EXPECT_EQ(ZE_RESULT_SUCCESS, commandListImmediate.executeCommandListImmediateWithFlushTask(false, false, false, NEO::AppendOperations::nonKernel, false, false, nullptr, nullptr)); } -HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskWithMemAdvicesThenMemAdvicesAreDispatchedAndSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskWithMemAdvicesThenMemAdvicesAreDispatchedAndSuccessIsReturned) { MockCommandListForExecuteMemAdvise commandList; commandList.initialize(device, NEO::EngineGroupType::compute, 0u); @@ -241,7 +241,7 @@ HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlus commandList.cmdQImmediate = oldCommandQueue; } -HWTEST2_F(CommandListExecuteImmediate, givenOutOfHostMemoryErrorOnFlushWhenExecutingCommandListImmediateWithFlushTaskThenProperErrorIsReturned, MatchAny) { +HWTEST_F(CommandListExecuteImmediate, givenOutOfHostMemoryErrorOnFlushWhenExecutingCommandListImmediateWithFlushTaskThenProperErrorIsReturned) { std::unique_ptr commandList; const ze_command_queue_desc_t desc = {}; ze_result_t returnValue; @@ -253,7 +253,7 @@ HWTEST2_F(CommandListExecuteImmediate, givenOutOfHostMemoryErrorOnFlushWhenExecu EXPECT_EQ(ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY, commandListImmediate.executeCommandListImmediateWithFlushTask(false, false, false, NEO::AppendOperations::nonKernel, false, false, nullptr, nullptr)); } -HWTEST2_F(CommandListExecuteImmediate, givenOutOfDeviceMemoryErrorOnFlushWhenExecutingCommandListImmediateWithFlushTaskThenProperErrorIsReturned, MatchAny) { +HWTEST_F(CommandListExecuteImmediate, givenOutOfDeviceMemoryErrorOnFlushWhenExecutingCommandListImmediateWithFlushTaskThenProperErrorIsReturned) { std::unique_ptr commandList; const ze_command_queue_desc_t desc = {}; ze_result_t returnValue; @@ -265,7 +265,7 @@ HWTEST2_F(CommandListExecuteImmediate, givenOutOfDeviceMemoryErrorOnFlushWhenExe EXPECT_EQ(ZE_RESULT_ERROR_OUT_OF_DEVICE_MEMORY, commandListImmediate.executeCommandListImmediateWithFlushTask(false, false, false, NEO::AppendOperations::nonKernel, false, false, nullptr, nullptr)); } -HWTEST2_F(CommandListExecuteImmediate, GivenImmediateCommandListWhenCommandListIsCreatedThenCsrStateIsNotSet, MatchAny) { +HWTEST_F(CommandListExecuteImmediate, GivenImmediateCommandListWhenCommandListIsCreatedThenCsrStateIsNotSet) { std::unique_ptr commandList; const ze_command_queue_desc_t desc = {}; ze_result_t returnValue; @@ -306,7 +306,7 @@ HWTEST2_F(CommandListTest, givenCopyCommandListWhenRequiredFlushOperationThenExp EXPECT_EQ(usedBefore, usedAfter); } -HWTEST2_F(CommandListTest, givenCopyCommandListWhenAppendCopyWithDependenciesThenDoNotTrackDependencies, MatchAny) { +HWTEST_F(CommandListTest, givenCopyCommandListWhenAppendCopyWithDependenciesThenDoNotTrackDependencies) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); queue->isCopyOnlyCommandQueue = true; @@ -337,7 +337,7 @@ HWTEST2_F(CommandListTest, givenCopyCommandListWhenAppendCopyWithDependenciesThe cmdList.getCsr(false)->getInternalAllocationStorage()->getTemporaryAllocations().freeAllGraphicsAllocations(device->getNEODevice()); } -HWTEST2_F(CommandListTest, givenCopyCommandListWhenAppendCopyRegionWithDependenciesThenDoNotTrackDependencies, MatchAny) { +HWTEST_F(CommandListTest, givenCopyCommandListWhenAppendCopyRegionWithDependenciesThenDoNotTrackDependencies) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); queue->isCopyOnlyCommandQueue = true; @@ -369,7 +369,7 @@ HWTEST2_F(CommandListTest, givenCopyCommandListWhenAppendCopyRegionWithDependenc cmdList.getCsr(false)->getInternalAllocationStorage()->getTemporaryAllocations().freeAllGraphicsAllocations(device->getNEODevice()); } -HWTEST2_F(CommandListTest, givenCopyCommandListWhenAppendFillWithDependenciesThenDoNotTrackDependencies, MatchAny) { +HWTEST_F(CommandListTest, givenCopyCommandListWhenAppendFillWithDependenciesThenDoNotTrackDependencies) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); queue->isCopyOnlyCommandQueue = true; @@ -529,7 +529,7 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenRequiredFlushOperationAndS EXPECT_EQ(usedBefore, usedAfter); } -HWTEST2_F(CommandListTest, givenImmediateCommandListWhenAppendMemoryRangesBarrierUsingFlushTaskThenExpectCorrectExecuteCall, MatchAny) { +HWTEST_F(CommandListTest, givenImmediateCommandListWhenAppendMemoryRangesBarrierUsingFlushTaskThenExpectCorrectExecuteCall) { ze_result_t result = ZE_RESULT_SUCCESS; uint32_t numRanges = 1; const size_t rangeSizes = 1; @@ -554,7 +554,7 @@ HWTEST2_F(CommandListTest, givenImmediateCommandListWhenAppendMemoryRangesBarrie EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListTest, givenImmediateCommandListWhenAppendMemoryRangesBarrierNotUsingFlushTaskThenExpectCorrectExecuteCall, MatchAny) { +HWTEST_F(CommandListTest, givenImmediateCommandListWhenAppendMemoryRangesBarrierNotUsingFlushTaskThenExpectCorrectExecuteCall) { ze_result_t result = ZE_RESULT_SUCCESS; uint32_t numRanges = 1; const size_t rangeSizes = 1; @@ -579,7 +579,7 @@ HWTEST2_F(CommandListTest, givenImmediateCommandListWhenAppendMemoryRangesBarrie EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListTest, givenImmediateCommandListWhenFlushImmediateThenOverrideEventCsr, MatchAny) { +HWTEST_F(CommandListTest, givenImmediateCommandListWhenFlushImmediateThenOverrideEventCsr) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); queue->isCopyOnlyCommandQueue = true; @@ -608,15 +608,14 @@ HWTEST2_F(CommandListTest, givenImmediateCommandListWhenFlushImmediateThenOverri EXPECT_EQ(event->csrs[0], cmdList.getCsr(false)); } -HWTEST2_F(CommandListTest, givenRegularCmdListWhenAskingForRelaxedOrderingThenReturnFalse, MatchAny) { +HWTEST_F(CommandListTest, givenRegularCmdListWhenAskingForRelaxedOrderingThenReturnFalse) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); EXPECT_FALSE(commandList->isRelaxedOrderingDispatchAllowed(5, false)); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAnd2dRegionWhenMemoryCopyRegionInExternalHostAllocationCalledThenBuiltinFlagAndDestinationAllocSystemIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAnd2dRegionWhenMemoryCopyRegionInExternalHostAllocationCalledThenBuiltinFlagAndDestinationAllocSystemIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -629,8 +628,7 @@ HWTEST2_F(CommandListTest, EXPECT_TRUE(commandList->usedKernelLaunchParams.isDestinationAllocationInSystemMemory); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAnd2dRegionWhenMemoryCopyRegionInUsmHostAllocationCalledThenBuiltinFlagAndDestinationAllocSystemIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAnd2dRegionWhenMemoryCopyRegionInUsmHostAllocationCalledThenBuiltinFlagAndDestinationAllocSystemIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -650,8 +648,7 @@ HWTEST2_F(CommandListTest, context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAnd2dRegionWhenMemoryCopyRegionInUsmDeviceAllocationCalledThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAnd2dRegionWhenMemoryCopyRegionInUsmDeviceAllocationCalledThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -675,8 +672,7 @@ HWTEST2_F(CommandListTest, context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAndRegionMemoryCopyFrom2dSourceImageto3dDestImageThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAndRegionMemoryCopyFrom2dSourceImageto3dDestImageThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -700,8 +696,7 @@ HWTEST2_F(CommandListTest, context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAndRegionMemoryCopyFrom3dSourceImageto2dDestImageThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAndRegionMemoryCopyFrom3dSourceImageto2dDestImageThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -725,8 +720,7 @@ HWTEST2_F(CommandListTest, context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAnd3dRegionWhenMemoryCopyRegionInExternalHostAllocationCalledThenBuiltinAndDestinationAllocSystemFlagIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAnd3dRegionWhenMemoryCopyRegionInExternalHostAllocationCalledThenBuiltinAndDestinationAllocSystemFlagIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -739,8 +733,7 @@ HWTEST2_F(CommandListTest, EXPECT_TRUE(commandList->usedKernelLaunchParams.isDestinationAllocationInSystemMemory); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAnd3dRegionWhenMemoryCopyRegionInUsmHostAllocationCalledThenBuiltinAndDestinationAllocSystemFlagIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAnd3dRegionWhenMemoryCopyRegionInUsmHostAllocationCalledThenBuiltinAndDestinationAllocSystemFlagIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -760,8 +753,7 @@ HWTEST2_F(CommandListTest, context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, - givenComputeCommandListAnd3dRegionWhenMemoryCopyRegionInUsmDeviceAllocationCalledThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListAnd3dRegionWhenMemoryCopyRegionInUsmDeviceAllocationCalledThenBuiltinFlagIsSetAndDestinationAllocSystemFlagNotSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1019,7 +1011,7 @@ HWTEST2_F(CommandListTest, givenHeaplessWhenAppendImageCopyToMemoryThenCorrectRo } } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInExternalHostAllocationThenBuiltinFlagAndDestinationAllocSystemIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInExternalHostAllocationThenBuiltinFlagAndDestinationAllocSystemIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1032,7 +1024,7 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInExternalHostAl EXPECT_TRUE(commandList->usedKernelLaunchParams.isDestinationAllocationInSystemMemory); } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInUsmHostAllocationThenBuiltinFlagAndDestinationAllocSystemIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInUsmHostAllocationThenBuiltinFlagAndDestinationAllocSystemIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1052,7 +1044,7 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInUsmHostAllocat context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInUsmDeviceAllocationThenBuiltinFlagIsSetAndDestinationAllocSystemNotSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInUsmDeviceAllocationThenBuiltinFlagIsSetAndDestinationAllocSystemNotSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1076,7 +1068,7 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyInUsmDeviceAlloc context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyWithReservedDeviceAllocationThenResidencyContainerHasImplicitMappedAllocations, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryCopyWithReservedDeviceAllocationThenResidencyContainerHasImplicitMappedAllocations) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1127,7 +1119,7 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyWithReservedDevi EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryCopyWithOneReservedDeviceAllocationMappedToFullReservationThenExtendedBufferSizeIsZero, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryCopyWithOneReservedDeviceAllocationMappedToFullReservationThenExtendedBufferSizeIsZero) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1189,7 +1181,7 @@ HWTEST2_F(CommandListTest, givenStatelessWhenAppendMemoryFillIsCalledThenCorrect context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryFillInUsmHostThenBuiltinFlagAndDestinationAllocSystemIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryFillInUsmHostThenBuiltinFlagAndDestinationAllocSystemIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1215,7 +1207,7 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryFillInUsmHostThenBui context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryFillInUsmDeviceThenBuiltinFlagIsSetAndDestinationAllocSystemNotSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryFillInUsmDeviceThenBuiltinFlagIsSetAndDestinationAllocSystemNotSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1245,7 +1237,7 @@ HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryFillInUsmDeviceThenB context->freeMem(dstBuffer); } -HWTEST2_F(CommandListTest, givenComputeCommandListWhenMemoryFillRequiresMultiKernelsThenSplitFlagIsSet, MatchAny) { +HWTEST_F(CommandListTest, givenComputeCommandListWhenMemoryFillRequiresMultiKernelsThenSplitFlagIsSet) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1305,7 +1297,7 @@ class MockCommandQueueIndirectAccess : public Mock { uint32_t handleIndirectAllocationResidencyCalledTimes = 0; }; -HWTEST2_F(CommandListTest, givenCmdListWithIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessCalled, MatchAny) { +HWTEST_F(CommandListTest, givenCmdListWithIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessCalled) { ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS; @@ -1324,7 +1316,7 @@ HWTEST2_F(CommandListTest, givenCmdListWithIndirectAccessWhenExecutingCommandLis commandListImmediate.cmdQImmediate = oldCommandQueue; } -HWTEST2_F(CommandListTest, givenRegularCmdListWithIndirectAccessWhenExecutingRegularOnImmediateCommandListThenHandleIndirectAccessCalled, MatchAny) { +HWTEST_F(CommandListTest, givenRegularCmdListWithIndirectAccessWhenExecutingRegularOnImmediateCommandListThenHandleIndirectAccessCalled) { ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS; @@ -1357,7 +1349,7 @@ HWTEST2_F(CommandListTest, givenRegularCmdListWithIndirectAccessWhenExecutingReg mockCommandListImmediate.cmdQImmediate = oldCommandQueue; } -HWTEST2_F(CommandListTest, givenCmdListWithNoIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessNotCalled, MatchAny) { +HWTEST_F(CommandListTest, givenCmdListWithNoIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessNotCalled) { ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp index f5f93d7c19..9d138ba5b6 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp @@ -33,7 +33,7 @@ namespace ult { using CommandListCreate = Test; -HWTEST2_F(CommandListCreate, givenIndirectAccessFlagsAreChangedWhenResettingCommandListThenExpectAllFlagsSetToDefault, MatchAny) { +HWTEST_F(CommandListCreate, givenIndirectAccessFlagsAreChangedWhenResettingCommandListThenExpectAllFlagsSetToDefault) { auto commandList = std::make_unique<::L0::ult::CommandListCoreFamily>(); ASSERT_NE(nullptr, commandList); ze_result_t returnValue = commandList->initialize(device, NEO::EngineGroupType::compute, 0u); @@ -58,7 +58,7 @@ HWTEST2_F(CommandListCreate, givenIndirectAccessFlagsAreChangedWhenResettingComm EXPECT_FALSE(commandList->unifiedMemoryControls.indirectDeviceAllocationsAllowed); } -HWTEST2_F(CommandListCreate, whenContainsCooperativeKernelsIsCalledThenCorrectValueIsReturned, MatchAny) { +HWTEST_F(CommandListCreate, whenContainsCooperativeKernelsIsCalledThenCorrectValueIsReturned) { for (auto testValue : ::testing::Bool()) { MockCommandListForAppendLaunchKernel commandList; commandList.initialize(device, NEO::EngineGroupType::compute, 0u); @@ -292,7 +292,7 @@ HWTEST2_F(CommandListCreate, givenSingleTileOnlyPlatformsWhenProgrammingMultiTil } using CommandListAppendLaunchKernel = Test; -HWTEST2_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchCooperativeKernelIsCalledThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchCooperativeKernelIsCalledThenSuccessIsReturned) { createKernel(); ze_event_pool_desc_t eventPoolDesc = {}; @@ -321,7 +321,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchCoopera EXPECT_EQ(event.get(), commandList->appendKernelEventValue); } -HWTEST2_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchMultipleIndirectKernelIsCalledThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchMultipleIndirectKernelIsCalledThenSuccessIsReturned) { createKernel(); ze_event_pool_desc_t eventPoolDesc = {}; @@ -355,7 +355,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchMultipl context->freeMem(reinterpret_cast(numLaunchArgs)); } -HWTEST2_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchIndirectKernelIsCalledThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchIndirectKernelIsCalledThenSuccessIsReturned) { std::unique_ptr mockModule = std::make_unique(device, nullptr, ModuleType::builtin); Mock<::L0::KernelImp> kernel; @@ -530,7 +530,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, GivenComputeModePropertiesWhenPropertes EXPECT_FALSE(commandList->finalStreamState.stateComputeMode.largeGrfMode.isDirty); } -HWTEST2_F(CommandListCreate, givenFlushErrorWhenPerformingCpuMemoryCopyThenErrorIsReturned, MatchAny) { +HWTEST_F(CommandListCreate, givenFlushErrorWhenPerformingCpuMemoryCopyThenErrorIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = false; @@ -560,7 +560,7 @@ HWTEST2_F(CommandListCreate, givenFlushErrorWhenPerformingCpuMemoryCopyThenError EXPECT_EQ(ZE_RESULT_ERROR_OUT_OF_HOST_MEMORY, returnValue); } -HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenAppendingMemoryCopyThenSuccessIsReturned, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateCommandListWhenAppendingMemoryCopyThenSuccessIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -584,7 +584,7 @@ HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenAppendingMemoryCopyThe ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenAppendingMemoryCopyWithInvalidEventThenInvalidArgumentErrorIsReturned, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateCommandListWhenAppendingMemoryCopyWithInvalidEventThenInvalidArgumentErrorIsReturned) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -608,7 +608,7 @@ HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenAppendingMemoryCopyWit ASSERT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, result); } -HWTEST2_F(CommandListCreate, givenCommandListAndHostPointersWhenMemoryCopyCalledThenPipeControlWithDcFlushAdded, MatchAny) { +HWTEST_F(CommandListCreate, givenCommandListAndHostPointersWhenMemoryCopyCalledThenPipeControlWithDcFlushAdded) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; ze_result_t result = ZE_RESULT_SUCCESS; @@ -1821,7 +1821,7 @@ HWTEST2_F(FrontEndMultiReturnCommandListTest, givenCmdQueueAndImmediateCmdListUs EXPECT_EQ(0u, feStateCmds.size()); } -HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenThereIsNoEnoughSpaceForImmediateCommandAndAllocationListNotEmptyThenReuseCommandBuffer, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateCommandListWhenThereIsNoEnoughSpaceForImmediateCommandAndAllocationListNotEmptyThenReuseCommandBuffer) { ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS; ze_result_t returnValue; @@ -1844,7 +1844,7 @@ HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenThereIsNoEnoughSpaceFo EXPECT_EQ(latestFlushedTaskCount + 1, whiteBoxCmdList->getCsr(false)->peekLatestFlushedTaskCount()); } -HWTEST2_F(CommandListCreate, givenImmediateCommandListWhenThereIsNoEnoughSpaceForWaitOnEventsAndImmediateCommandAndAllocationListNotEmptyThenReuseCommandBuffer, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateCommandListWhenThereIsNoEnoughSpaceForWaitOnEventsAndImmediateCommandAndAllocationListNotEmptyThenReuseCommandBuffer) { ze_command_queue_desc_t desc = {}; desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS; ze_result_t returnValue; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp index 80cc474ef0..0b2e01ad51 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp @@ -65,7 +65,7 @@ struct AppendMemoryLockedCopyFixture : public DeviceFixture { using AppendMemoryLockedCopyTest = Test; -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndImportedHostPtrAsOperandThenItIsTreatedAsHostUsmPtr, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndImportedHostPtrAsOperandThenItIsTreatedAsHostUsmPtr) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -178,7 +178,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndImportedHostPt delete[] importedPtr; } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForH2DThenReturnTrue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForH2DThenReturnTrue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -194,7 +194,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrW EXPECT_TRUE(cmdList.preferCopyThroughLockedPtr(cpuMemCopyInfo, 0, nullptr)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForD2HThenReturnTrue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForD2HThenReturnTrue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -209,7 +209,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrW EXPECT_TRUE(cmdList.preferCopyThroughLockedPtr(cpuMemCopyInfo, 0, nullptr)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForH2DThenReturnTrue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForH2DThenReturnTrue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -224,7 +224,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhen EXPECT_TRUE(cmdList.preferCopyThroughLockedPtr(cpuMemCopyInfo, 0, nullptr)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForH2DWhenCopyCantBePerformedImmediatelyThenReturnFalse, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForH2DWhenCopyCantBePerformedImmediatelyThenReturnFalse) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -267,7 +267,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhen EXPECT_TRUE(cmdList.preferCopyThroughLockedPtr(cpuMemCopyInfo, 1, &event)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForD2HWhenCopyCantBePerformedImmediatelyThenReturnFalse, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhenPreferCopyThroughLockedPtrCalledForD2HWhenCopyCantBePerformedImmediatelyThenReturnFalse) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -310,7 +310,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmHostPtrWhen EXPECT_TRUE(cmdList.preferCopyThroughLockedPtr(cpuMemCopyInfo, 1, &event)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndIpcDevicePtrWhenPreferCopyThroughLockedPtrCalledForD2HThenReturnFalse, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndIpcDevicePtrWhenPreferCopyThroughLockedPtrCalledForD2HThenReturnFalse) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -338,7 +338,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndIpcDevicePtrWh EXPECT_EQ(ZE_RESULT_SUCCESS, context->closeIpcMemHandle(ipcDevicePtr)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndIpcDevicePtrWhenPreferCopyThroughLockedPtrCalledForH2DThenReturnFalse, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndIpcDevicePtrWhenPreferCopyThroughLockedPtrCalledForH2DThenReturnFalse) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -366,7 +366,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndIpcDevicePtrWh EXPECT_EQ(ZE_RESULT_SUCCESS, context->closeIpcMemHandle(ipcDevicePtr)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSMDeviceAllocThenReturnCorrectValue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSMDeviceAllocThenReturnCorrectValue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -382,7 +382,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSM EXPECT_TRUE(cmdList.isSuitableUSMDeviceAlloc(cpuMemCopyInfo.dstAllocData)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSMHostAllocThenReturnCorrectValue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSMHostAllocThenReturnCorrectValue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -399,7 +399,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSM EXPECT_FALSE(cmdList.isSuitableUSMHostAlloc(dstAllocData)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSMSharedAllocThenReturnCorrectValue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenIsSuitableUSMSharedAllocThenReturnCorrectValue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -431,7 +431,7 @@ struct LocalMemoryMultiSubDeviceFixture : public SingleRootMultiSubDeviceFixture using LocalMemoryMultiSubDeviceTest = Test; -HWTEST2_F(LocalMemoryMultiSubDeviceTest, givenImmediateCommandListWhenIsSuitableUSMDeviceAllocWithColouredBufferThenReturnFalse, MatchAny) { +HWTEST_F(LocalMemoryMultiSubDeviceTest, givenImmediateCommandListWhenIsSuitableUSMDeviceAllocWithColouredBufferThenReturnFalse) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -450,7 +450,7 @@ HWTEST2_F(LocalMemoryMultiSubDeviceTest, givenImmediateCommandListWhenIsSuitable context->freeMem(devicePtr); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCreatingThenCopyThroughLockedPtrEnabledIsSetCorrectly, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCreatingThenCopyThroughLockedPtrEnabledIsSetCorrectly) { const ze_command_queue_desc_t desc = {}; ze_result_t returnValue; std::unique_ptr commandList0(CommandList::createImmediate(productFamily, @@ -465,7 +465,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCreatingThenC EXPECT_EQ(whiteBoxCmdList->copyThroughLockedPtrEnabled, device->getGfxCoreHelper().copyThroughLockedPtrEnabled(device->getHwInfo(), device->getProductHelper())); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndForcingLockPtrViaEnvVariableWhenPreferCopyThroughLockPointerCalledThenTrueIsReturned, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndForcingLockPtrViaEnvVariableWhenPreferCopyThroughLockPointerCalledThenTrueIsReturned) { debugManager.flags.ExperimentalForceCopyThroughLock.set(1); ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -481,7 +481,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndForcingLockPtr EXPECT_TRUE(cmdList.preferCopyThroughLockedPtr(cpuMemCopyInfo, 0, nullptr)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenGetTransferTypeThenReturnCorrectValue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenGetTransferTypeThenReturnCorrectValue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -661,7 +661,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenGetTransferTy context->freeMem(hostPtr2); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenGetTransferThresholdThenReturnCorrectValue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenGetTransferThresholdThenReturnCorrectValue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -691,7 +691,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenGetTransferTh EXPECT_EQ(0u, cmdList.getTransferThreshold(TransferType::sharedUsmToHostNonUsm)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndThresholdDebugFlagSetWhenGetTransferThresholdThenReturnCorrectValue, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndThresholdDebugFlagSetWhenGetTransferThresholdThenReturnCorrectValue) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -708,7 +708,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndThresholdDebug EXPECT_EQ(6 * MemoryConstants::megaByte, cmdList.getTransferThreshold(TransferType::deviceUsmToHostNonUsm)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyH2DThenLockPtr, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyH2DThenLockPtr) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -727,7 +727,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrW EXPECT_NE(nullptr, dstAlloc->getLockedPtr()); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyD2HThenLockPtr, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyD2HThenLockPtr) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -747,7 +747,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrW EXPECT_NE(nullptr, dstAlloc->getLockedPtr()); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenForceModeWhenCopyIsCalledThenBothAllocationsAreLocked, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenForceModeWhenCopyIsCalledThenBothAllocationsAreLocked) { DebugManagerStateRestore restorer; debugManager.flags.ExperimentalForceCopyThroughLock.set(1); @@ -780,7 +780,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenForceModeWhenCopyIsCalledThenBothAllo context->freeMem(devicePtr2); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenForceModeWhenCopyIsCalledFromHostUsmToDeviceUsmThenOnlyDeviceAllocationIsLocked, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenForceModeWhenCopyIsCalledFromHostUsmToDeviceUsmThenOnlyDeviceAllocationIsLocked) { DebugManagerStateRestore restorer; debugManager.flags.ExperimentalForceCopyThroughLock.set(1); @@ -813,7 +813,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenForceModeWhenCopyIsCalledFromHostUsmT context->freeMem(hostPtr); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyH2DAndDstPtrLockedThenDontLockAgain, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyH2DAndDstPtrLockedThenDontLockAgain) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -833,7 +833,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrW EXPECT_EQ(1u, reinterpret_cast(device->getDriverHandle()->getMemoryManager())->lockResourceCalled); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyH2DThenUseMemcpyAndReturnSuccess, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrWhenCopyH2DThenUseMemcpyAndReturnSuccess) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -855,7 +855,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmHostPtrW EXPECT_EQ(0, memcmp(lockedPtr, nonUsmHostPtr, 1024)); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndSignalEventAndNonUsmHostPtrWhenCopyH2DThenSignalEvent, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndSignalEventAndNonUsmHostPtrWhenCopyH2DThenSignalEvent) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -882,7 +882,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndSignalEventAnd EXPECT_EQ(event->queryStatus(), ZE_RESULT_SUCCESS); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndSignalEventAndCpuMemcpyWhenGpuHangThenDontSynchronizeEvent, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndSignalEventAndCpuMemcpyWhenGpuHangThenDontSynchronizeEvent) { ze_command_queue_desc_t desc = {}; auto mockCmdQ = std::make_unique>(device, device->getNEODevice()->getInternalEngine().commandStreamReceiver, &desc); @@ -914,7 +914,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndSignalEventAnd EXPECT_EQ(event->queryStatus(), ZE_RESULT_NOT_READY); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCpuMemcpyWithoutBarrierThenDontWaitForTagUpdate, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCpuMemcpyWithoutBarrierThenDontWaitForTagUpdate) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -930,7 +930,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCpuMemcpyWith EXPECT_EQ(waitForFlushTagUpdateCalled, 0u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCpuMemcpyWithBarrierThenWaitForTagUpdate, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCpuMemcpyWithBarrierThenWaitForTagUpdate) { ze_command_queue_desc_t desc = {}; auto mockCmdQ = std::make_unique>(device, device->getNEODevice()->getInternalEngine().commandStreamReceiver, &desc); @@ -949,7 +949,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenCpuMemcpyWith EXPECT_EQ(waitForFlushTagUpdateCalled, 1u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenAppendBarrierThenSetDependenciesPresent, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenAppendBarrierThenSetDependenciesPresent) { ze_command_queue_desc_t desc = {}; auto mockCmdQ = std::make_unique>(device, device->getNEODevice()->getInternalEngine().commandStreamReceiver, &desc); @@ -972,7 +972,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenAppendBarrier EXPECT_FALSE(cmdList.dependenciesPresent); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenAppendWaitOnEventsThenSetDependenciesPresent, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListWhenAppendWaitOnEventsThenSetDependenciesPresent) { ze_command_queue_desc_t desc = {}; auto mockCmdQ = std::make_unique>(device, device->getNEODevice()->getInternalEngine().commandStreamReceiver, &desc); @@ -1036,7 +1036,7 @@ class MockAppendMemoryLockedCopyTestImmediateCmdList : public MockCommandListImm uint32_t appendMemoryCopyKernelWithGACalled = 0; }; -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmSrcHostPtrWhenCopyH2DThenUseCpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmSrcHostPtrWhenCopyH2DThenUseCpuMemcpy) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1052,7 +1052,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmSrcHostPtrW context->freeMem(usmSrcPtr); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmDstHostPtrWhenCopyThenUseGpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmDstHostPtrWhenCopyThenUseGpuMemcpy) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1068,7 +1068,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmDstHostPtrW context->freeMem(usmHostDstPtr); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmSrcHostPtrWhenCopyThenUseGpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmSrcHostPtrWhenCopyThenUseGpuMemcpy) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1084,7 +1084,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndUsmSrcHostPtrW context->freeMem(usmHostSrcPtr); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmSrcHostPtrWhenSizeTooLargeThenUseGpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmSrcHostPtrWhenSizeTooLargeThenUseGpuMemcpy) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1095,7 +1095,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmSrcHostP EXPECT_GE(cmdList.appendMemoryCopyKernelWithGACalled, 1u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmDstHostPtrWhenSizeTooLargeThenUseGpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmDstHostPtrWhenSizeTooLargeThenUseGpuMemcpy) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1106,7 +1106,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndNonUsmDstHostP EXPECT_GE(cmdList.appendMemoryCopyKernelWithGACalled, 1u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndFailedToLockPtrThenUseGpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndFailedToLockPtrThenUseGpuMemcpy) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1130,7 +1130,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndFailedToLockPt EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGACalled, 1u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndD2HCopyWhenSizeTooLargeButFlagSetThenUseCpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndD2HCopyWhenSizeTooLargeButFlagSetThenUseCpuMemcpy) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); debugManager.flags.ExperimentalD2HCpuCopyThreshold.set(2048); @@ -1143,7 +1143,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndD2HCopyWhenSiz EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGACalled, 0u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndH2DCopyWhenSizeTooLargeButFlagSetThenUseCpuMemcpy, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndH2DCopyWhenSizeTooLargeButFlagSetThenUseCpuMemcpy) { debugManager.flags.ExperimentalH2DCpuCopyThreshold.set(3 * MemoryConstants::megaByte); ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -1155,7 +1155,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndH2DCopyWhenSiz EXPECT_EQ(cmdList.appendMemoryCopyKernelWithGACalled, 0u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithDependencyThenAppendBarrierCalled, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithDependencyThenAppendBarrierCalled) { ze_command_queue_desc_t desc = {}; auto mockCmdQ = std::make_unique>(device, device->getNEODevice()->getInternalEngine().commandStreamReceiver, &desc); @@ -1189,7 +1189,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithD EXPECT_EQ(cmdList.synchronizeEventListCalled, 0u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithDependencyWithinThresholdThenWaitOnHost, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithDependencyWithinThresholdThenWaitOnHost) { DebugManagerStateRestore restore; ze_command_queue_desc_t desc = {}; @@ -1232,7 +1232,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithD EXPECT_EQ(cmdList.synchronizeEventListCalled, 1u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithoutDependencyThenAppendBarrierNotCalled, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWithoutDependencyThenAppendBarrierNotCalled) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1243,7 +1243,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndCpuMemcpyWitho EXPECT_EQ(cmdList.appendBarrierCalled, 0u); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndTimestampFlagSetWhenCpuMemcpyThenSetCorrectGpuTimestamps, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndTimestampFlagSetWhenCpuMemcpyThenSetCorrectGpuTimestamps) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockAppendMemoryLockedCopyTestImmediateCmdList cmdList; @@ -1276,7 +1276,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndTimestampFlagS EXPECT_EQ(resultTimestamp.global.kernelEnd, NEO::MockDeviceTimeWithConstTimestamp::gpuTimestamp + 1); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndTimestampFlagNotSetWhenCpuMemcpyThenDontSetGpuTimestamps, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndTimestampFlagNotSetWhenCpuMemcpyThenDontSetGpuTimestamps) { struct MockGpuTimestampEvent : public EventImp { using EventImp::gpuStartTimestamp; using EventImp::gpuEndTimestamp; @@ -1308,7 +1308,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenImmediateCommandListAndTimestampFlagN EXPECT_EQ(0u, reinterpret_cast(event.get())->gpuEndTimestamp); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenAllocationDataWhenFailingToObtainLockedPtrFromDeviceThenNullptrIsReturned, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenAllocationDataWhenFailingToObtainLockedPtrFromDeviceThenNullptrIsReturned) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -1331,7 +1331,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenAllocationDataWhenFailingToObtainLock EXPECT_EQ(lockedPtr, nullptr); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenNullAllocationDataWhenObtainLockedPtrFromDeviceCalledThenNullptrIsReturned, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenNullAllocationDataWhenObtainLockedPtrFromDeviceCalledThenNullptrIsReturned) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -1341,7 +1341,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenNullAllocationDataWhenObtainLockedPtr EXPECT_FALSE(lockingFailed); } -HWTEST2_F(AppendMemoryLockedCopyTest, givenFailedToObtainLockedPtrWhenPerformingCpuMemoryCopyThenErrorIsReturned, MatchAny) { +HWTEST_F(AppendMemoryLockedCopyTest, givenFailedToObtainLockedPtrWhenPerformingCpuMemoryCopyThenErrorIsReturned) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -1364,7 +1364,7 @@ HWTEST2_F(AppendMemoryLockedCopyTest, givenFailedToObtainLockedPtrWhenPerforming EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, returnValue); } -HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenSettingFillPropertiesThenAllGroupsCountEqualSizeToFill, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenSettingFillPropertiesThenAllGroupsCountEqualSizeToFill) { createKernel(); ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -1378,7 +1378,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenSettingFillPr EXPECT_EQ(outArguments.groups * outArguments.mainGroupSize, sizeToFill); } -HWTEST2_F(CommandListAppendLaunchKernel, givenAlignePtrToFillWhenSettingFillPropertiesThenAllGroupsCountEqualSizeToFillDevidedBySizeOfUint32, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenAlignePtrToFillWhenSettingFillPropertiesThenAllGroupsCountEqualSizeToFillDevidedBySizeOfUint32) { createKernel(); ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -1404,7 +1404,7 @@ class MockCommandListHwKernelSplit : public WhiteBox<::L0::CommandListCoreFamily ze_result_t status = ZE_RESULT_SUCCESS; ::L0::Kernel *passedKernel; }; -HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenAppendMemoryFillCalledThenRightLeftOverKernelIsDispatched, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenAppendMemoryFillCalledThenRightLeftOverKernelIsDispatched) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); auto unalignedOffset = 2u; @@ -1420,7 +1420,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenAppendMemoryF EXPECT_EQ(commandList->passedKernel, builtinKernelByte); context->freeMem(dstBuffer); } -HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenKernelLaunchSplitForRighLeftoverKernelFailsThenFailedStatusIsReturned, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenKernelLaunchSplitForRighLeftoverKernelFailsThenFailedStatusIsReturned) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); auto unalignedOffset = 2u; @@ -1436,7 +1436,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenKernelLaunchS EXPECT_EQ(commandList->passedKernel, builtinKernelByte); context->freeMem(dstBuffer); } -HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenAppendMemoryFillCalledWithStatelessEnabledThenRightLeftOverStatelessKernelIsDispatched, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenAppendMemoryFillCalledWithStatelessEnabledThenRightLeftOverStatelessKernelIsDispatched) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); auto unalignedOffset = 2u; @@ -1454,7 +1454,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenUnalignePtrToFillWhenAppendMemoryF context->freeMem(dstBuffer); } -HWTEST2_F(CommandListAppendLaunchKernel, givenAlignePtrToFillWhenAppendMemoryFillCalledThenMiddleBufferKernelIsDispatched, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenAlignePtrToFillWhenAppendMemoryFillCalledThenMiddleBufferKernelIsDispatched) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); auto unalignedOffset = 4u; @@ -1489,7 +1489,7 @@ struct ImmediateCommandListHostSynchronize : public Test { } }; -HWTEST2_F(ImmediateCommandListHostSynchronize, givenCsrClientCountWhenCallingSynchronizeThenUnregister, MatchAny) { +HWTEST_F(ImmediateCommandListHostSynchronize, givenCsrClientCountWhenCallingSynchronizeThenUnregister) { auto csr = static_cast *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver); auto cmdList = createCmdList(csr); @@ -1518,7 +1518,7 @@ HWTEST2_F(ImmediateCommandListHostSynchronize, givenCsrClientCountWhenCallingSyn EXPECT_EQ(clientCount, csr->getNumClients()); } -HWTEST2_F(ImmediateCommandListHostSynchronize, givenFlushTaskEnabledAndNotSyncModeThenWaitForCompletionIsCalled, MatchAny) { +HWTEST_F(ImmediateCommandListHostSynchronize, givenFlushTaskEnabledAndNotSyncModeThenWaitForCompletionIsCalled) { auto csr = static_cast *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver); auto cmdList = createCmdList(csr); @@ -1529,7 +1529,7 @@ HWTEST2_F(ImmediateCommandListHostSynchronize, givenFlushTaskEnabledAndNotSyncMo EXPECT_EQ(waitForFlushTagUpdateCalled, 1u); } -HWTEST2_F(ImmediateCommandListHostSynchronize, givenSyncModeThenWaitForCompletionIsCalled, MatchAny) { +HWTEST_F(ImmediateCommandListHostSynchronize, givenSyncModeThenWaitForCompletionIsCalled) { auto csr = static_cast *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver); auto cmdList = createCmdList(csr); @@ -1541,7 +1541,7 @@ HWTEST2_F(ImmediateCommandListHostSynchronize, givenSyncModeThenWaitForCompletio EXPECT_EQ(waitForFlushTagUpdateCalled, 1u); } -HWTEST2_F(ImmediateCommandListHostSynchronize, givenFlushTaskSubmissionIsDisabledThenWaitForCompletionIsCalled, MatchAny) { +HWTEST_F(ImmediateCommandListHostSynchronize, givenFlushTaskSubmissionIsDisabledThenWaitForCompletionIsCalled) { auto csr = static_cast *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver); auto cmdList = createCmdList(csr); @@ -1554,7 +1554,7 @@ HWTEST2_F(ImmediateCommandListHostSynchronize, givenFlushTaskSubmissionIsDisable EXPECT_EQ(waitForFlushTagUpdateCalled, 1u); } -HWTEST2_F(ImmediateCommandListHostSynchronize, givenGpuStatusIsHangThenDeviceLostIsReturned, MatchAny) { +HWTEST_F(ImmediateCommandListHostSynchronize, givenGpuStatusIsHangThenDeviceLostIsReturned) { auto csr = static_cast *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver); auto cmdList = createCmdList(csr); @@ -1568,7 +1568,7 @@ HWTEST2_F(ImmediateCommandListHostSynchronize, givenGpuStatusIsHangThenDeviceLos EXPECT_EQ(waitForFlushTagUpdateCalled, 1u); } -HWTEST2_F(ImmediateCommandListHostSynchronize, givenTimeoutOtherThanMaxIsProvidedWaitParamsIsSetCorrectly, MatchAny) { +HWTEST_F(ImmediateCommandListHostSynchronize, givenTimeoutOtherThanMaxIsProvidedWaitParamsIsSetCorrectly) { auto csr = static_cast *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver); auto cmdList = createCmdList(csr); @@ -1583,7 +1583,7 @@ HWTEST2_F(ImmediateCommandListHostSynchronize, givenTimeoutOtherThanMaxIsProvide EXPECT_EQ(waitParams.waitTimeout, 1); } -HWTEST2_F(ImmediateCommandListHostSynchronize, givenMaxTimeoutIsProvidedWaitParamsIsSetCorrectly, MatchAny) { +HWTEST_F(ImmediateCommandListHostSynchronize, givenMaxTimeoutIsProvidedWaitParamsIsSetCorrectly) { auto csr = static_cast *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver); auto cmdList = createCmdList(csr); @@ -1600,7 +1600,7 @@ HWTEST2_F(ImmediateCommandListHostSynchronize, givenMaxTimeoutIsProvidedWaitPara using CommandListHostSynchronize = Test; -HWTEST2_F(CommandListHostSynchronize, whenHostSychronizeIsCalledReturnInvalidArgument, MatchAny) { +HWTEST_F(CommandListHostSynchronize, whenHostSychronizeIsCalledReturnInvalidArgument) { ze_command_list_desc_t desc = {}; ze_command_list_handle_t hCommandList = {}; @@ -1615,7 +1615,7 @@ HWTEST2_F(CommandListHostSynchronize, whenHostSychronizeIsCalledReturnInvalidArg using CommandListMappedTimestampTest = CommandListAppendLaunchKernel; -HWTEST2_F(CommandListMappedTimestampTest, givenMappedTimestampSignalEventWhenAppendApiIsCalledThenTheEventIsAddedToMappedSignalList, MatchAny) { +HWTEST_F(CommandListMappedTimestampTest, givenMappedTimestampSignalEventWhenAppendApiIsCalledThenTheEventIsAddedToMappedSignalList) { createKernel(); ze_event_pool_desc_t eventPoolDesc = {}; @@ -1644,7 +1644,7 @@ HWTEST2_F(CommandListMappedTimestampTest, givenMappedTimestampSignalEventWhenApp EXPECT_EQ(event.get(), commandList->peekMappedEventList()[0]); } -HWTEST2_F(CommandListMappedTimestampTest, givenSignalEventWithoutMappedTimstampWhenAppendApiIsCalledThenTheEventIsNotAddedToMappedSignalList, MatchAny) { +HWTEST_F(CommandListMappedTimestampTest, givenSignalEventWithoutMappedTimstampWhenAppendApiIsCalledThenTheEventIsNotAddedToMappedSignalList) { createKernel(); ze_event_pool_desc_t eventPoolDesc = {}; @@ -1673,7 +1673,7 @@ HWTEST2_F(CommandListMappedTimestampTest, givenSignalEventWithoutMappedTimstampW EXPECT_EQ(0u, commandList->peekMappedEventList().size()); } -HWTEST2_F(CommandListMappedTimestampTest, givenMappedTimestampSignalEventWhenAppendApiIsCalledMultipleTimesThenTheEventIsAddedOnceToMappedSignalList, MatchAny) { +HWTEST_F(CommandListMappedTimestampTest, givenMappedTimestampSignalEventWhenAppendApiIsCalledMultipleTimesThenTheEventIsAddedOnceToMappedSignalList) { createKernel(); ze_event_pool_desc_t eventPoolDesc = {}; @@ -1706,7 +1706,7 @@ HWTEST2_F(CommandListMappedTimestampTest, givenMappedTimestampSignalEventWhenApp EXPECT_EQ(1u, commandList->peekMappedEventList().size()); } -HWTEST2_F(CommandListMappedTimestampTest, givenEventIsAddedToMappedEventListWhenStoringReferenceTimestampWithClearThenEventsAreCleared, MatchAny) { +HWTEST_F(CommandListMappedTimestampTest, givenEventIsAddedToMappedEventListWhenStoringReferenceTimestampWithClearThenEventsAreCleared) { createKernel(); ze_event_pool_desc_t eventPoolDesc = {}; @@ -1741,7 +1741,7 @@ class MockCommandListCoreFamilyIfPrivateNeeded : public BaseMock { PrivateAllocsToReuseContainer *passedContainer; }; -HWTEST2_F(CommandListCreate, givenPrivatePerDispatchDisabledWhenAllocatingPrivateMemoryThenAllocateIsNotCalled, MatchAny) { +HWTEST_F(CommandListCreate, givenPrivatePerDispatchDisabledWhenAllocatingPrivateMemoryThenAllocateIsNotCalled) { auto commandList = std::make_unique>>(); commandList->allocateOrReuseKernelPrivateMemoryIfNeededCallBase = true; Mock mockModule(this->device, nullptr); @@ -1752,7 +1752,7 @@ HWTEST2_F(CommandListCreate, givenPrivatePerDispatchDisabledWhenAllocatingPrivat EXPECT_EQ(commandList->allocateOrReuseKernelPrivateMemoryCalled, 0u); } -HWTEST2_F(CommandListCreate, givenPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenAllocateIsCalled, MatchAny) { +HWTEST_F(CommandListCreate, givenPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenAllocateIsCalled) { auto commandList = std::make_unique>>(); commandList->allocateOrReuseKernelPrivateMemoryIfNeededCallBase = true; Mock mockModule(this->device, nullptr); @@ -1763,7 +1763,7 @@ HWTEST2_F(CommandListCreate, givenPrivatePerDispatchEnabledWhenAllocatingPrivate EXPECT_EQ(commandList->allocateOrReuseKernelPrivateMemoryCalled, 1u); } -HWTEST2_F(CommandListCreate, givenPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenCmdListMaprIsPassed, MatchAny) { +HWTEST_F(CommandListCreate, givenPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenCmdListMaprIsPassed) { auto commandList = std::make_unique>>(); commandList->allocateOrReuseKernelPrivateMemoryIfNeededCallBase = true; Mock mockModule(this->device, nullptr); @@ -1774,7 +1774,7 @@ HWTEST2_F(CommandListCreate, givenPrivatePerDispatchEnabledWhenAllocatingPrivate EXPECT_EQ(commandList->passedContainer, &commandList->ownedPrivateAllocations); } -HWTEST2_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchDisabledWhenAllocatingPrivateMemoryCalledThenAllocateIsNotCalled, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchDisabledWhenAllocatingPrivateMemoryCalledThenAllocateIsNotCalled) { auto commandList = std::make_unique>>(); commandList->allocateOrReuseKernelPrivateMemoryIfNeededCallBase = true; Mock mockModule(this->device, nullptr); @@ -1785,7 +1785,7 @@ HWTEST2_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchDisabledWhen EXPECT_EQ(commandList->allocateOrReuseKernelPrivateMemoryCalled, 0u); } -HWTEST2_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenAllocateIsCalled, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenAllocateIsCalled) { MockCommandStreamReceiver mockCommandStreamReceiver(*neoDevice->executionEnvironment, neoDevice->getRootDeviceIndex(), neoDevice->getDeviceBitfield()); ze_command_queue_desc_t queueDesc = {}; @@ -1803,7 +1803,7 @@ HWTEST2_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchEnabledWhenA EXPECT_EQ(commandList->allocateOrReuseKernelPrivateMemoryCalled, 1u); } -HWTEST2_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenCsrMapIsPassed, MatchAny) { +HWTEST_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchEnabledWhenAllocatingPrivateMemoryThenCsrMapIsPassed) { MockCommandStreamReceiver mockCommandStreamReceiver(*neoDevice->executionEnvironment, neoDevice->getRootDeviceIndex(), neoDevice->getDeviceBitfield()); ze_command_queue_desc_t queueDesc = {}; @@ -1821,7 +1821,7 @@ HWTEST2_F(CommandListCreate, givenImmediateListAndPrivatePerDispatchEnabledWhenA EXPECT_EQ(commandList->passedContainer, &mockCommandStreamReceiver.getOwnedPrivateAllocations()); } -HWTEST2_F(CommandListCreate, givenCmdListWhenAllocateOrReuseCalledForSizeThatIsStoredInMapThenItsReused, MatchAny) { +HWTEST_F(CommandListCreate, givenCmdListWhenAllocateOrReuseCalledForSizeThatIsStoredInMapThenItsReused) { auto commandList = std::make_unique>(); commandList->allocateOrReuseKernelPrivateMemoryCallBase = true; commandList->device = this->device; @@ -1839,7 +1839,7 @@ HWTEST2_F(CommandListCreate, givenCmdListWhenAllocateOrReuseCalledForSizeThatIsS EXPECT_EQ(sizeBefore, mapForReuse.size()); } -HWTEST2_F(CommandListCreate, givenNewSizeDifferentThanSizesInMapWhenAllocatingPrivateMemoryThenNewAllocationIsCreated, MatchAny) { +HWTEST_F(CommandListCreate, givenNewSizeDifferentThanSizesInMapWhenAllocatingPrivateMemoryThenNewAllocationIsCreated) { auto commandList = std::make_unique>(); commandList->allocateOrReuseKernelPrivateMemoryCallBase = true; commandList->device = this->device; @@ -1858,7 +1858,7 @@ HWTEST2_F(CommandListCreate, givenNewSizeDifferentThanSizesInMapWhenAllocatingPr neoDevice->getMemoryManager()->freeGraphicsMemory(commandList->commandContainer.getResidencyContainer()[0]); } -HWTEST2_F(CommandListCreate, givenNewSizeDifferentThanSizesInMapWhenAllocatingPrivateMemoryThenNewAllocationIsAddedToCommandContainerResidencyList, MatchAny) { +HWTEST_F(CommandListCreate, givenNewSizeDifferentThanSizesInMapWhenAllocatingPrivateMemoryThenNewAllocationIsAddedToCommandContainerResidencyList) { auto commandList = std::make_unique>(); commandList->allocateOrReuseKernelPrivateMemoryCallBase = true; commandList->device = this->device; @@ -1877,7 +1877,7 @@ HWTEST2_F(CommandListCreate, givenNewSizeDifferentThanSizesInMapWhenAllocatingPr neoDevice->getMemoryManager()->freeGraphicsMemory(commandList->commandContainer.getResidencyContainer()[0]); } -HWTEST2_F(CommandListCreate, givenCounterDeviceAllocWhenGetDeviceCounterAllocForResidencyThenReturnCorrectAllocation, MatchAny) { +HWTEST_F(CommandListCreate, givenCounterDeviceAllocWhenGetDeviceCounterAllocForResidencyThenReturnCorrectAllocation) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -1886,7 +1886,7 @@ HWTEST2_F(CommandListCreate, givenCounterDeviceAllocWhenGetDeviceCounterAllocFor EXPECT_EQ(result, &counterDeviceAlloc); } -HWTEST2_F(CommandListCreate, givenCounterDeviceAllocFromDifferentRootDeviceWhenGetDeviceCounterAllocForResidencyThenReturnPeerAllocation, MatchAny) { +HWTEST_F(CommandListCreate, givenCounterDeviceAllocFromDifferentRootDeviceWhenGetDeviceCounterAllocForResidencyThenReturnPeerAllocation) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); uint32_t baseDeviceIndex = this->device->getRootDeviceIndex(); @@ -1901,7 +1901,7 @@ HWTEST2_F(CommandListCreate, givenCounterDeviceAllocFromDifferentRootDeviceWhenG EXPECT_EQ(result->getGpuAddress(), peerAllocation.getGpuAddress()); } -HWTEST2_F(CommandListCreate, givenCounterDeviceAllocFromDifferentRootDeviceWhenGetDeviceCounterAllocForResidencyAndAllocIsAlreadyImportedThenReturnPeerAllocation, MatchAny) { +HWTEST_F(CommandListCreate, givenCounterDeviceAllocFromDifferentRootDeviceWhenGetDeviceCounterAllocForResidencyAndAllocIsAlreadyImportedThenReturnPeerAllocation) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); uint32_t baseDeviceIndex = this->device->getRootDeviceIndex(); @@ -1923,7 +1923,7 @@ HWTEST2_F(CommandListCreate, givenCounterDeviceAllocFromDifferentRootDeviceWhenG deviceImp->peerCounterAllocations.remove(allocData); } -HWTEST2_F(CommandListCreate, givenNullptrPeerAllocationWhenGetDeviceCounterAllocForResidencyThenAbortIsThrown, MatchAny) { +HWTEST_F(CommandListCreate, givenNullptrPeerAllocationWhenGetDeviceCounterAllocForResidencyThenAbortIsThrown) { auto commandList = std::make_unique>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); uint32_t baseDeviceIndex = this->device->getRootDeviceIndex(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp index dcf7d887a0..069c2345f1 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp @@ -245,7 +245,7 @@ HWTEST_F(CommandListAppendEventReset, givenRegulatCommandListWhenHostCachingDisa EXPECT_TRUE(event->isAlreadyCompleted()); } -HWTEST2_F(CommandListAppendEventReset, givenImmediateCmdlistWhenAppendingEventResetThenCommandsAreExecuted, MatchAny) { +HWTEST_F(CommandListAppendEventReset, givenImmediateCmdlistWhenAppendingEventResetThenCommandsAreExecuted) { const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -262,7 +262,7 @@ HWTEST2_F(CommandListAppendEventReset, givenImmediateCmdlistWhenAppendingEventRe ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppendUsedPacketSignalEvent, givenTimestampEventUsedInResetThenPipeControlAppendedCorrectly, MatchAny) { +HWTEST_F(CommandListAppendUsedPacketSignalEvent, givenTimestampEventUsedInResetThenPipeControlAppendedCorrectly) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; auto &commandContainer = commandList->getCmdContainer(); @@ -316,7 +316,7 @@ HWTEST2_F(CommandListAppendUsedPacketSignalEvent, givenTimestampEventUsedInReset ASSERT_EQ(1u, postSyncFound); } -HWTEST2_F(CommandListAppendEventReset, givenEventWithHostScopeUsedInResetThenPipeControlWithDcFlushAppended, MatchAny) { +HWTEST_F(CommandListAppendEventReset, givenEventWithHostScopeUsedInResetThenPipeControlWithDcFlushAppended) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; auto &commandContainer = commandList->getCmdContainer(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp index 8d51abf8fb..52c19174be 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp @@ -183,7 +183,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenKernelWithThreadArbitrationPolicyS delete (pHint); } -HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenAppendingKernelThenBbEndIsAddedAndNewCmdBufferAllocated, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenAppendingKernelThenBbEndIsAddedAndNewCmdBufferAllocated) { using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END; using DefaultWalkerType = typename FamilyType::DefaultWalkerType; @@ -1453,7 +1453,7 @@ HWTEST_F(CommandListAppendLaunchKernel, givenInvalidEventListWhenAppendLaunchCoo EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, returnValue); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendLaunchCooperativeKernelUsingFlushTaskThenExpectCorrectExecuteCall, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendLaunchCooperativeKernelUsingFlushTaskThenExpectCorrectExecuteCall) { createKernel(); ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -1477,7 +1477,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendLaun EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendLaunchCooperativeKernelNotUsingFlushTaskThenExpectCorrectExecuteCall, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendLaunchCooperativeKernelNotUsingFlushTaskThenExpectCorrectExecuteCall) { createKernel(); ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp index 7c9266d26d..d6f2e2f1e1 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp @@ -1214,7 +1214,7 @@ HWTEST_F(CmdlistAppendLaunchKernelTests, whenEncodingWorkDimForIndirectDispatchT } using CommandListAppendLaunchKernel = Test; -HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernelsWhenAppendLaunchCooperativeKernelIsCalledThenReturnSuccess, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernelsWhenAppendLaunchCooperativeKernelIsCalledThenReturnSuccess) { Mock<::L0::KernelImp> kernel; std::unique_ptr pMockModule = std::make_unique>(device, nullptr); kernel.module = pMockModule.get(); @@ -1242,7 +1242,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernel EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppendLaunchKernel, givenKernelWithSlmSizeExceedingLocalMemorySizeWhenAppendLaunchKernelWithParamsIsCalledThenDebugMsgErrIsPrintedAndOutOfDeviceMemoryIsReturned, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithSlmSizeExceedingLocalMemorySizeWhenAppendLaunchKernelWithParamsIsCalledThenDebugMsgErrIsPrintedAndOutOfDeviceMemoryIsReturned) { DebugManagerStateRestore dbgRestorer; debugManager.flags.PrintDebugMessages.set(true); @@ -1283,7 +1283,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenKernelWithSlmSizeExceedingLocalMem EXPECT_EQ(expectedOutput, output); } -HWTEST2_F(CommandListAppendLaunchKernel, givenTwoKernelPrivateAllocsWhichTogetherExceedGlobalMemSizeWhenAppendLaunchKernelWithParamsIsCalledOnlyThenAllocationHappens, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenTwoKernelPrivateAllocsWhichTogetherExceedGlobalMemSizeWhenAppendLaunchKernelWithParamsIsCalledOnlyThenAllocationHappens) { auto devInfo = device->getNEODevice()->getDeviceInfo(); auto kernelsNb = 2u; @@ -1319,7 +1319,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenTwoKernelPrivateAllocsWhichTogethe } } -HWTEST2_F(CommandListAppendLaunchKernel, givenTwoKernelPrivateAllocsWhichDontExceedGlobalMemSizeWhenAppendLaunchKernelWithParamsIsCalledThenNoAllocationIsDone, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenTwoKernelPrivateAllocsWhichDontExceedGlobalMemSizeWhenAppendLaunchKernelWithParamsIsCalledThenNoAllocationIsDone) { auto devInfo = device->getNEODevice()->getDeviceInfo(); auto kernelsNb = 2u; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp index 338666982f..f57d256e5d 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp @@ -207,7 +207,7 @@ HWCMDTEST_F(IGFX_GEN12LP_CORE, CommandListAppendLaunchKernel, givenAppendLaunchM context->freeMem(reinterpret_cast(numLaunchArgs)); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelThenKernelIsExecutedOnImmediateCmdQ, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelThenKernelIsExecutedOnImmediateCmdQ) { createKernel(); const ze_command_queue_desc_t desc = {}; @@ -235,7 +235,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingL ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelWithInvalidEventThenInvalidArgumentErrorIsReturned, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelWithInvalidEventThenInvalidArgumentErrorIsReturned) { createKernel(); const ze_command_queue_desc_t desc = {}; @@ -263,7 +263,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingL ASSERT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, result); } -HWTEST2_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhenAppendingLaunchKernelIndirectThenKernelIsStoredOnEvent, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhenAppendingLaunchKernelIndirectThenKernelIsStoredOnEvent) { Mock module(this->device, nullptr); auto kernel = new Mock<::L0::KernelImp>{}; static_cast(&module)->getPrintfKernelContainer().push_back(std::shared_ptr>{kernel}); @@ -292,7 +292,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhe ASSERT_FALSE(event->getKernelForPrintf().expired()); } -HWTEST2_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenAppendingLaunchKernelIndirectThenKernelIsNotStoredOnEvent, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenAppendingLaunchKernelIndirectThenKernelIsNotStoredOnEvent) { Mock module(this->device, nullptr); auto kernel = new Mock<::L0::KernelImp>{}; static_cast(&module)->getPrintfKernelContainer().push_back(std::shared_ptr>{kernel}); @@ -320,7 +320,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenAp ASSERT_EQ(nullptr, event->getKernelForPrintf().lock().get()); } -HWTEST2_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhenAppendingLaunchKernelWithParamThenKernelIsStoredOnEvent, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhenAppendingLaunchKernelWithParamThenKernelIsStoredOnEvent) { Mock module(this->device, nullptr); auto kernel = new Mock<::L0::KernelImp>{}; static_cast(&module)->getPrintfKernelContainer().push_back(std::shared_ptr>{kernel}); @@ -354,7 +354,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenNonemptyAllocPrintfBufferKernelWhe ASSERT_FALSE(event->getKernelForPrintf().expired()); } -HWTEST2_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenAppendingLaunchKernelWithParamThenKernelIsNotStoredOnEvent, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenAppendingLaunchKernelWithParamThenKernelIsNotStoredOnEvent) { Mock module(this->device, nullptr); auto kernel = new Mock<::L0::KernelImp>{}; static_cast(&module)->getPrintfKernelContainer().push_back(std::shared_ptr>{kernel}); @@ -387,7 +387,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenEmptyAllocPrintfBufferKernelWhenAp ASSERT_EQ(nullptr, event->getKernelForPrintf().lock().get()); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectThenKernelIsExecutedOnImmediateCmdQ, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectThenKernelIsExecutedOnImmediateCmdQ) { createKernel(); const ze_command_queue_desc_t desc = {}; bool internalEngine = true; @@ -413,7 +413,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingL ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectWithInvalidEventThenInvalidArgumentErrorIsReturned, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenImmediateCommandListWhenAppendingLaunchKernelIndirectWithInvalidEventThenInvalidArgumentErrorIsReturned) { createKernel(); const ze_command_queue_desc_t desc = {}; @@ -813,7 +813,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenDisableOverdispatchPropertyWhenUpd EXPECT_EQ(expectedDisableOverdispatch, pCommandList->finalStreamState.frontEndState.disableOverdispatch.value); } -HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeKernelWhenAppendLaunchCooperativeKernelIsCalledThenCommandListTypeIsProperlySet, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenCooperativeKernelWhenAppendLaunchCooperativeKernelIsCalledThenCommandListTypeIsProperlySet) { createKernel(); kernel->setGroupSize(4, 1, 1); ze_group_count_t groupCount{8, 1, 1}; @@ -836,7 +836,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeKernelWhenAppendLaunchC EXPECT_TRUE(pCommandList->containsCooperativeKernelsFlag); } -HWTEST2_F(CommandListAppendLaunchKernel, givenAnyCooperativeKernelAndMixingAllowedWhenAppendLaunchCooperativeKernelIsCalledThenCommandListTypeIsProperlySet, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenAnyCooperativeKernelAndMixingAllowedWhenAppendLaunchCooperativeKernelIsCalledThenCommandListTypeIsProperlySet) { DebugManagerStateRestore restorer; createKernel(); @@ -865,7 +865,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenAnyCooperativeKernelAndMixingAllow EXPECT_TRUE(pCommandList->containsCooperativeKernelsFlag); } -HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernelsAndAllowMixingWhenAppendLaunchCooperativeKernelIsCalledThenReturnSuccess, MatchAny) { +HWTEST_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernelsAndAllowMixingWhenAppendLaunchCooperativeKernelIsCalledThenReturnSuccess) { DebugManagerStateRestore restorer; Mock<::L0::KernelImp> kernel; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp index 17e09e084a..b86045a636 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp @@ -25,7 +25,7 @@ namespace ult { using AppendMemoryCopyTests = Test; -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyRegionCalledThenTwoNewAllocationAreAddedToHostMapPtr, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyRegionCalledThenTwoNewAllocationAreAddedToHostMapPtr) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -36,7 +36,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyRe EXPECT_EQ(cmdList.hostPtrMap.size(), 2u); } -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenMemoryCopyRegion2DCalledThenSrcDstPointersArePageAligned, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenMemoryCopyRegion2DCalledThenSrcDstPointersArePageAligned) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -49,7 +49,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenMem EXPECT_TRUE(cmdList.dstAlignedPtr == (cmdList.dstAlignedPtr & sshAlignmentMask)); } -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenMemoryCopyRegion3DCalledThenSrcDstPointersArePageAligned, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenMemoryCopyRegion3DCalledThenSrcDstPointersArePageAligned) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); void *srcPtr = reinterpret_cast(0x1234); @@ -62,7 +62,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenMem EXPECT_TRUE(cmdList.dstAlignedPtr == (cmdList.dstAlignedPtr & sshAlignmentMask)); } -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenBlitMemoryCopyRegion2DCalledThenSrcDstNotZeroOffsetsArePassed, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenBlitMemoryCopyRegion2DCalledThenSrcDstNotZeroOffsetsArePassed) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *srcPtr = reinterpret_cast(0x1233); @@ -74,7 +74,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenBli EXPECT_GT(cmdList.dstBlitCopyRegionOffset, 0u); } -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenBlitMemoryCopyRegion3DCalledThenSrcDstNotZeroOffsetsArePassed, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenBlitMemoryCopyRegion3DCalledThenSrcDstNotZeroOffsetsArePassed) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *srcPtr = reinterpret_cast(0x1233); @@ -86,7 +86,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndUnalignedHostPointersWhenBli EXPECT_GT(cmdList.dstBlitCopyRegionOffset, 0u); } -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndAlignedHostPointersWhenBlitMemoryCopyRegion3DCalledThenSrcDstZeroOffsetsArePassed, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndAlignedHostPointersWhenBlitMemoryCopyRegion3DCalledThenSrcDstZeroOffsetsArePassed) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); void *srcPtr = alignDown(reinterpret_cast(0x1233), NEO::EncodeSurfaceState::getSurfaceBaseAddressAlignment()); @@ -98,7 +98,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndAlignedHostPointersWhenBlitM EXPECT_EQ(cmdList.dstBlitCopyRegionOffset, 0u); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhenMemoryCopyRegionToSameUsmHostAllocationThenDestinationBlitCopyRegionHasOffset, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhenMemoryCopyRegionToSameUsmHostAllocationThenDestinationBlitCopyRegionHasOffset) { using XY_COPY_BLT = typename FamilyType::XY_COPY_BLT; @@ -132,7 +132,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhen context->freeMem(buffer); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemoryCopyRegionToSameUsmHostAllocationThenSourceBlitCopyRegionHasOffset, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemoryCopyRegionToSameUsmHostAllocationThenSourceBlitCopyRegionHasOffset) { using XY_COPY_BLT = typename FamilyType::XY_COPY_BLT; @@ -166,7 +166,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemor context->freeMem(buffer); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhenMemoryCopyRegionToSameUsmSharedAllocationThenDestinationBlitCopyRegionHasOffset, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhenMemoryCopyRegionToSameUsmSharedAllocationThenDestinationBlitCopyRegionHasOffset) { using XY_COPY_BLT = typename FamilyType::XY_COPY_BLT; @@ -201,7 +201,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhen context->freeMem(buffer); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemoryCopyRegionToSameUsmSharedAllocationThenSourceBlitCopyRegionHasOffset, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemoryCopyRegionToSameUsmSharedAllocationThenSourceBlitCopyRegionHasOffset) { using XY_COPY_BLT = typename FamilyType::XY_COPY_BLT; @@ -236,7 +236,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemor context->freeMem(buffer); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhenMemoryCopyRegionToSameUsmDeviceAllocationThenDestinationBlitCopyRegionHasOffset, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhenMemoryCopyRegionToSameUsmDeviceAllocationThenDestinationBlitCopyRegionHasOffset) { using XY_COPY_BLT = typename FamilyType::XY_COPY_BLT; @@ -270,7 +270,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndDestinationPtrOffsetWhen context->freeMem(buffer); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemoryCopyRegionToSameUsmDeviceAllocationThenSourceBlitCopyRegionHasOffset, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemoryCopyRegionToSameUsmDeviceAllocationThenSourceBlitCopyRegionHasOffset) { using XY_COPY_BLT = typename FamilyType::XY_COPY_BLT; @@ -304,7 +304,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListAndSourcePtrOffsetWhenMemor context->freeMem(buffer); } -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyRegionCalledThenPipeControlWithDcFlushAdded, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyRegionCalledThenPipeControlWithDcFlushAdded) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; MockCommandListCoreFamily cmdList; @@ -330,7 +330,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyRe } } -HWTEST2_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCopyThenSuccessIsReturned, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCopyThenSuccessIsReturned) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); @@ -354,7 +354,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCop commandList->cmdQImmediate = nullptr; } -HWTEST2_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCopyWithInvalidEventThenInvalidArgumentErrorIsReturned, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCopyWithInvalidEventThenInvalidArgumentErrorIsReturned) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); void *srcPtr = reinterpret_cast(0x1234); @@ -372,7 +372,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCop ASSERT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, result); } -HWTEST2_F(AppendMemoryCopyTests, givenAsyncImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenAsyncImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenSuccessIsReturned) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); void *srcPtr = reinterpret_cast(0x1234); @@ -395,7 +395,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenAsyncImmediateCommandListWhenAppendingMemo commandList->getCsr(false)->getInternalAllocationStorage()->getTemporaryAllocations().freeAllGraphicsAllocations(device->getNEODevice()); } -HWTEST2_F(AppendMemoryCopyTests, givenAsyncImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenProgramCmdStreamWithFlushTask, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenAsyncImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenProgramCmdStreamWithFlushTask) { using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW; @@ -497,7 +497,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenAsyncImmediateCommandListWhenAppendingMemo ultCsr->getTagAllocation()->getGpuAddress())); } -HWTEST2_F(AppendMemoryCopyTests, givenSyncImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenProgramCmdStreamWithFlushTask, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenSyncImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenProgramCmdStreamWithFlushTask) { using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW; @@ -601,7 +601,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenSyncImmediateCommandListWhenAppendingMemor ultCsr->getTagAllocation()->getGpuAddress())); } -HWTEST2_F(AppendMemoryCopyTests, givenSyncModeImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenSuccessIsReturned, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenSyncModeImmediateCommandListWhenAppendingMemoryCopyWithCopyEngineThenSuccessIsReturned) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); void *srcPtr = reinterpret_cast(0x1234); @@ -625,7 +625,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenSyncModeImmediateCommandListWhenAppendingM commandList->getCsr(false)->getInternalAllocationStorage()->getTemporaryAllocations().freeAllGraphicsAllocations(device->getNEODevice()); } -HWTEST2_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCopyThenNBlitsIsSuccessfullyCalculated, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCopyThenNBlitsIsSuccessfullyCalculated) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); void *srcPtr = reinterpret_cast(0x1234); @@ -646,7 +646,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenImmediateCommandListWhenAppendingMemoryCop commandList->getCsr(false)->getInternalAllocationStorage()->getTemporaryAllocations().freeAllGraphicsAllocations(device->getNEODevice()); } -HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyCalledThenPipeControlWithDcFlushAdded, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyCalledThenPipeControlWithDcFlushAdded) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; MockCommandListCoreFamily cmdList; @@ -681,7 +681,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCommandListAndHostPointersWhenMemoryCopyCa EXPECT_EQ(expectedDcFlushPipeControl, dcFlushPipeControl); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyThenAppendProfilingCalledOnceBeforeAndAfterCommand, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyThenAppendProfilingCalledOnceBeforeAndAfterCommand) { if (device->getProductHelper().useAdditionalBlitProperties()) { GTEST_SKIP(); @@ -738,7 +738,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemory EXPECT_EQ(cmdList.end(), itor); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListWhenForcingTlbFlushBeforeCopyThenMiFlushProgrammedAndTlbFlushDetected, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListWhenForcingTlbFlushBeforeCopyThenMiFlushProgrammedAndTlbFlushDetected) { DebugManagerStateRestore restorer; NEO::debugManager.flags.FlushTlbBeforeCopy.set(1); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp index 9bcd6464bc..d865a24d8b 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp @@ -105,7 +105,7 @@ HWTEST_F(CommandListAppendSignalEvent, givenEventWithScopeFlagDeviceWhenAppendin ASSERT_TRUE(postSyncFound); } -HWTEST2_F(CommandListAppendSignalEvent, givenCommandListWhenAppendWriteGlobalTimestampCalledWithSignalEventThenPipeControlForTimestampAndSignalEncoded, MatchAny) { +HWTEST_F(CommandListAppendSignalEvent, givenCommandListWhenAppendWriteGlobalTimestampCalledWithSignalEventThenPipeControlForTimestampAndSignalEncoded) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; auto &commandContainer = commandList->getCmdContainer(); @@ -340,7 +340,7 @@ HWTEST2_F(CommandListAppendSignalEvent, givenImmediateCmdListWithCopyQueueAndApp EXPECT_EQ(heaplessStateInit ? 2u : 1u, commandStreamReceiver.makeSurfacePackNonResidentCalled); } -HWTEST2_F(CommandListAppendSignalEvent, givenOutOfOrderImmediateCmdListWhenAppendingRegularCommandListWithCounterBasedSignalEventThenReturnError, MatchAny) { +HWTEST_F(CommandListAppendSignalEvent, givenOutOfOrderImmediateCmdListWhenAppendingRegularCommandListWithCounterBasedSignalEventThenReturnError) { ze_event_pool_desc_t eventPoolDesc = {}; eventPoolDesc.count = 1; eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_HOST_VISIBLE; @@ -373,7 +373,7 @@ HWTEST2_F(CommandListAppendSignalEvent, givenOutOfOrderImmediateCmdListWhenAppen EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, result); } -HWTEST2_F(CommandListAppendSignalEvent, givenInOrderImmediateCmdListWhenAppendingRegularCommandListWithCounterBasedSignalEventThenDispatchCorrectCommands, MatchAny) { +HWTEST_F(CommandListAppendSignalEvent, givenInOrderImmediateCmdListWhenAppendingRegularCommandListWithCounterBasedSignalEventThenDispatchCorrectCommands) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using MI_ATOMIC = typename FamilyType::MI_ATOMIC; using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; @@ -453,7 +453,7 @@ HWTEST2_F(CommandListAppendSignalEvent, givenInOrderImmediateCmdListWhenAppendin ASSERT_NE(itorBbStart, itorResolveCmd); } -HWTEST2_F(CommandListAppendSignalEvent, givenTimestampEventUsedInSignalThenPipeControlAppendedCorrectly, MatchAny) { +HWTEST_F(CommandListAppendSignalEvent, givenTimestampEventUsedInSignalThenPipeControlAppendedCorrectly) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; auto &commandContainer = commandList->getCmdContainer(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp index 834a1c8a8d..ff14de7987 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp @@ -697,7 +697,7 @@ HWTEST_F(CommandListAppendWaitOnUsedPacketSignalEvent, WhenAppendingWaitOnTimest ASSERT_EQ(9u, semaphoreWaitsFound); } -HWTEST2_F(CommandListAppendWaitOnEvent, givenCommandListWhenAppendWriteGlobalTimestampCalledWithWaitOnEventsThenSemaphoreWaitAndPipeControlForTimestampEncoded, MatchAny) { +HWTEST_F(CommandListAppendWaitOnEvent, givenCommandListWhenAppendWriteGlobalTimestampCalledWithWaitOnEventsThenSemaphoreWaitAndPipeControlForTimestampEncoded) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; @@ -875,7 +875,7 @@ HWTEST2_F(MultTileCommandListAppendWaitOnEvent, EXPECT_EQ(2u, semaphoreWaitsFound); } -HWTEST2_F(CommandListAppendWaitOnEvent, givenImmediateCommandListWhenAppendWaitOnNotSignaledEventThenWait, MatchAny) { +HWTEST_F(CommandListAppendWaitOnEvent, givenImmediateCommandListWhenAppendWaitOnNotSignaledEventThenWait) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; @@ -890,7 +890,7 @@ HWTEST2_F(CommandListAppendWaitOnEvent, givenImmediateCommandListWhenAppendWaitO EXPECT_TRUE(cmdList.dependenciesPresent); } -HWTEST2_F(CommandListAppendWaitOnEvent, givenImmediateCommandListWhenAppendWaitOnAlreadySignaledEventThenDontWait, MatchAny) { +HWTEST_F(CommandListAppendWaitOnEvent, givenImmediateCommandListWhenAppendWaitOnAlreadySignaledEventThenDontWait) { ze_command_queue_desc_t queueDesc = {}; auto queue = std::make_unique>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &queueDesc); MockCommandListImmediateHw cmdList; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp index f04ddedd1b..2346255d2d 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp @@ -67,7 +67,7 @@ class MockDriverHandle : public L0::DriverHandleImp { using AppendMemoryCopyTests = Test; -HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListWhenAppenBlitFillCalledWithLargePatternSizeThenMemCopyWasCalled, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyOnlyCommandListWhenAppenBlitFillCalledWithLargePatternSizeThenMemCopyWasCalled) { MockCommandListForMemFill cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); uint64_t pattern[4] = {1, 2, 3, 4}; @@ -76,7 +76,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListWhenAppenBlitFillCalled EXPECT_EQ(ZE_RESULT_ERROR_INVALID_SIZE, ret); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListWhenAppenBlitFillToNotDeviceMemThenInvalidArgumentReturned, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyOnlyCommandListWhenAppenBlitFillToNotDeviceMemThenInvalidArgumentReturned) { MockCommandListForMemFill cmdList; cmdList.initialize(device, NEO::EngineGroupType::copy, 0u); uint8_t pattern = 1; @@ -108,9 +108,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListWhenAppenBlitFillThenCo device->setDriverHandle(driverHandle.get()); } -HWTEST2_F(AppendMemoryCopyTests, - givenExternalHostPointerAllocationWhenPassedToAppendBlitFillThenProgramDestinationAddressCorrectly, - MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenExternalHostPointerAllocationWhenPassedToAppendBlitFillThenProgramDestinationAddressCorrectly) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using XY_COLOR_BLT = typename GfxFamily::XY_COLOR_BLT; @@ -146,7 +144,7 @@ HWTEST2_F(AppendMemoryCopyTests, EXPECT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListAndHostPointersWhenMemoryCopyCalledThenPipeControlWithDcFlushAddedIsNotAddedAfterBlitCopy, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyOnlyCommandListAndHostPointersWhenMemoryCopyCalledThenPipeControlWithDcFlushAddedIsNotAddedAfterBlitCopy) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using XY_COPY_BLT = typename GfxFamily::XY_COPY_BLT; @@ -170,7 +168,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListAndHostPointersWhenMemo EXPECT_EQ(genCmdList.end(), itor); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListAndHostPointersWhenMemoryCopyRegionCalledThenPipeControlWithDcFlushAddedIsNotAddedAfterBlitCopy, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyOnlyCommandListAndHostPointersWhenMemoryCopyRegionCalledThenPipeControlWithDcFlushAddedIsNotAddedAfterBlitCopy) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using XY_COPY_BLT = typename GfxFamily::XY_COPY_BLT; @@ -196,7 +194,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListAndHostPointersWhenMemo EXPECT_EQ(genCmdList.end(), itor); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListThenDcFlushIsNotAddedAfterBlitCopy, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyOnlyCommandListThenDcFlushIsNotAddedAfterBlitCopy) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using XY_COPY_BLT = typename GfxFamily::XY_COPY_BLT; @@ -226,7 +224,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyOnlyCommandListThenDcFlushIsNotAddedAf EXPECT_EQ(cmd->getSourceBaseAddress(), ptrOffset(srcPtr, srcOffset)); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyRegionBlitThenTimeStampRegistersAreAdded, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyRegionBlitThenTimeStampRegistersAreAdded) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; auto commandList = std::make_unique>>(); @@ -289,7 +287,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemory EXPECT_EQ(cmdList.end(), itor); } -HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToImageCopyBlitThenTimeStampRegistersAreAdded, MatchAny) { +HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToImageCopyBlitThenTimeStampRegistersAreAdded) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; auto commandList = std::make_unique>>(); @@ -394,7 +392,7 @@ HWTEST2_F(AppendMemoryCopyTests, givenCopyCommandListWhenCopyFromImagBlitThenCom using AppendMemoryCopyFromContext = AppendMemoryCopyTests; -HWTEST2_F(AppendMemoryCopyFromContext, givenCommandListThenUpOnPerformingAppendMemoryCopyFromContextSuccessIsReturned, MatchAny) { +HWTEST_F(AppendMemoryCopyFromContext, givenCommandListThenUpOnPerformingAppendMemoryCopyFromContextSuccessIsReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp index 66ab2aa029..3c1411b2ff 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp @@ -26,8 +26,7 @@ namespace ult { using AppendFillTest = Test; -HWTEST2_F(AppendFillTest, - givenCallToAppendMemoryFillWithImmediateValueThenSuccessIsReturned, MatchAny) { +HWTEST_F(AppendFillTest, givenCallToAppendMemoryFillWithImmediateValueThenSuccessIsReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -38,8 +37,7 @@ HWTEST2_F(AppendFillTest, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(AppendFillTest, - givenCallToAppendMemoryFillThenSuccessIsReturned, MatchAny) { +HWTEST_F(AppendFillTest, givenCallToAppendMemoryFillThenSuccessIsReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -48,8 +46,7 @@ HWTEST2_F(AppendFillTest, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(AppendFillTest, - givenCallToAppendMemoryFillWithAppendLaunchKernelFailureThenSuccessIsNotReturned, MatchAny) { +HWTEST_F(AppendFillTest, givenCallToAppendMemoryFillWithAppendLaunchKernelFailureThenSuccessIsNotReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); commandList->thresholdOfCallsToAppendLaunchKernelWithParamsToFail = 0; @@ -59,8 +56,7 @@ HWTEST2_F(AppendFillTest, EXPECT_NE(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(AppendFillTest, - givenTwoCallsToAppendMemoryFillWithSamePatternThenAllocationIsCreatedForEachCall, MatchAny) { +HWTEST_F(AppendFillTest, givenTwoCallsToAppendMemoryFillWithSamePatternThenAllocationIsCreatedForEachCall) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -80,8 +76,7 @@ HWTEST2_F(AppendFillTest, delete[] newDstPtr; } -HWTEST2_F(AppendFillTest, - givenTwoCallsToAppendMemoryFillWithDifferentPatternsThenAllocationIsCreatedForEachPattern, MatchAny) { +HWTEST_F(AppendFillTest, givenTwoCallsToAppendMemoryFillWithDifferentPatternsThenAllocationIsCreatedForEachPattern) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -99,8 +94,7 @@ HWTEST2_F(AppendFillTest, EXPECT_EQ(patternAllocationsVectorSize + 1u, newPatternAllocationsVectorSize); } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWhenPatternSizeIsOneThenDispatchOneKernel, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWhenPatternSizeIsOneThenDispatchOneKernel) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::compute, 0u); int pattern = 0; @@ -114,8 +108,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWithUnalignedSizeWhenPatternSizeIsOneThenDispatchTwoKernels, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWithUnalignedSizeWhenPatternSizeIsOneThenDispatchTwoKernels) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::compute, 0u); int pattern = 0; @@ -131,8 +124,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWithSizeBelow16WhenPatternSizeIsOneThenDispatchTwoKernels, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWithSizeBelow16WhenPatternSizeIsOneThenDispatchTwoKernels) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::compute, 0u); int pattern = 0; @@ -148,8 +140,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWithSizeBelowMaxWorkgroupSizeWhenPatternSizeIsOneThenDispatchOneKernel, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWithSizeBelowMaxWorkgroupSizeWhenPatternSizeIsOneThenDispatchOneKernel) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::compute, 0u); int pattern = 0; @@ -164,8 +155,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWhenPatternSizeIsOneThenGroupCountIsCorrect, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWhenPatternSizeIsOneThenGroupCountIsCorrect) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::compute, 0u); int pattern = 0; @@ -181,8 +171,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWhenPtrWithOffsetAndPatternSizeIsOneThenThreeKernelsDispatched, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWhenPtrWithOffsetAndPatternSizeIsOneThenThreeKernelsDispatched) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::compute, 0u); int pattern = 0; @@ -201,8 +190,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWhenPtrWithOffsetAndSmallSizeAndPatternSizeIsOneThenTwoKernelsDispatched, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWhenPtrWithOffsetAndSmallSizeAndPatternSizeIsOneThenTwoKernelsDispatched) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::compute, 0u); int pattern = 0; @@ -219,8 +207,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenAppendMemoryFillWhenPtrWithOffsetAndFailAppendUnalignedFillKernelThenReturnError, MatchAny) { +HWTEST_F(AppendFillTest, givenAppendMemoryFillWhenPtrWithOffsetAndFailAppendUnalignedFillKernelThenReturnError) { auto commandList = std::make_unique>>(); commandList->thresholdOfCallsToAppendLaunchKernelWithParamsToFail = 0; commandList->initialize(device, NEO::EngineGroupType::compute, 0u); @@ -234,8 +221,7 @@ HWTEST2_F(AppendFillTest, delete[] ptr; } -HWTEST2_F(AppendFillTest, - givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeThenSuccessIsReturned, MatchAny) { +HWTEST_F(AppendFillTest, givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeThenSuccessIsReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -248,8 +234,7 @@ HWTEST2_F(AppendFillTest, delete[] nonMultipleDstPtr; } -HWTEST2_F(AppendFillTest, - givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeAndAppendLaunchKernelFailureOnRemainderThenSuccessIsNotReturned, MatchAny) { +HWTEST_F(AppendFillTest, givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeAndAppendLaunchKernelFailureOnRemainderThenSuccessIsNotReturned) { auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); commandList->thresholdOfCallsToAppendLaunchKernelWithParamsToFail = 1; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp index 24d7575be1..d06133a130 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp @@ -289,7 +289,7 @@ HWTEST_F(CommandListAppendWaitOnMem, givenAppendWaitOnMemWithValidAddressAndData ASSERT_TRUE(validateProgramming(cmdList, waitMemData, castToUint64(ptr), MI_SEMAPHORE_WAIT::COMPARE_OPERATION::COMPARE_OPERATION_SAD_NOT_EQUAL_SDD, false)); } -HWTEST2_F(CommandListAppendWaitOnMem, given64bValueWhenWaitOnMemory64CalledThenReturnErrorIfNotSupported, MatchAny) { +HWTEST_F(CommandListAppendWaitOnMem, given64bValueWhenWaitOnMemory64CalledThenReturnErrorIfNotSupported) { ze_result_t result = ZE_RESULT_SUCCESS; waitMemData = static_cast(std::numeric_limits::max()) + 123; @@ -306,7 +306,7 @@ HWTEST2_F(CommandListAppendWaitOnMem, given64bValueWhenWaitOnMemory64CalledThenR } } -HWTEST2_F(CommandListAppendWaitOnMem, givenInvalidCmdListWhenWaitOnMemory64CalledThenReturnError, MatchAny) { +HWTEST_F(CommandListAppendWaitOnMem, givenInvalidCmdListWhenWaitOnMemory64CalledThenReturnError) { ze_result_t result = ZE_RESULT_SUCCESS; waitMemData = static_cast(std::numeric_limits::max()) + 123; @@ -319,7 +319,7 @@ HWTEST2_F(CommandListAppendWaitOnMem, givenInvalidCmdListWhenWaitOnMemory64Calle EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, result); } -HWTEST2_F(CommandListAppendWaitOnMem, given64bValueWhenWaitOnMemory64CalledThenProgramLri, MatchAny) { +HWTEST_F(CommandListAppendWaitOnMem, given64bValueWhenWaitOnMemory64CalledThenProgramLri) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; if (!FamilyType::isQwordInOrderCounter) { @@ -342,7 +342,7 @@ HWTEST2_F(CommandListAppendWaitOnMem, given64bValueWhenWaitOnMemory64CalledThenP ASSERT_TRUE(validateProgramming(cmdList, waitMemData, castToUint64(ptr), MI_SEMAPHORE_WAIT::COMPARE_OPERATION::COMPARE_OPERATION_SAD_NOT_EQUAL_SDD, true)); } -HWTEST2_F(CommandListAppendWaitOnMem, given64bValueAndOutEventWhenWaitOnMemory64CalledThenHandleEvent, MatchAny) { +HWTEST_F(CommandListAppendWaitOnMem, given64bValueAndOutEventWhenWaitOnMemory64CalledThenHandleEvent) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; @@ -391,7 +391,7 @@ HWTEST2_F(CommandListAppendWaitOnMem, given64bValueAndOutEventWhenWaitOnMemory64 ASSERT_NE(0u, itorPC.size()); } -HWTEST2_F(CommandListAppendWaitOnMem, givenCommandListWaitOnMemoryCalledWithNullPtrThenAppendWaitOnMemoryReturnsError, MatchAny) { +HWTEST_F(CommandListAppendWaitOnMem, givenCommandListWaitOnMemoryCalledWithNullPtrThenAppendWaitOnMemoryReturnsError) { ze_result_t result = ZE_RESULT_SUCCESS; MockCommandListExtensionHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -691,7 +691,7 @@ HWTEST_F(CommandListAppendWaitOnMem, givenAppendWaitOnMemOnBcsWithSignalEventAnd ASSERT_TRUE(postSyncFound); } -HWTEST2_F(CommandListAppendWaitOnMem, givenAppendWaitOnMemWithNoScopeAndSystemMemoryPtrThenAlignedPtrUsed, MatchAny) { +HWTEST_F(CommandListAppendWaitOnMem, givenAppendWaitOnMemWithNoScopeAndSystemMemoryPtrThenAlignedPtrUsed) { auto commandList = std::make_unique<::L0::ult::CommandListCoreFamily>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -822,7 +822,7 @@ HWTEST_F(CommandListAppendWriteToMem, givenAppendWriteToMemWithNoScopeThenPipeCo ASSERT_TRUE(postSyncFound); } -HWTEST2_F(CommandListAppendWriteToMem, givenCommandListWriteToMemCalledWithNullPtrThenAppendWriteToMemoryReturnsError, MatchAny) { +HWTEST_F(CommandListAppendWriteToMem, givenCommandListWriteToMemCalledWithNullPtrThenAppendWriteToMemoryReturnsError) { ze_result_t result = ZE_RESULT_SUCCESS; MockCommandListExtensionHw cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -893,7 +893,7 @@ HWTEST_F(CommandListAppendWriteToMem, givenAppendWriteToMemWithScopeThenPipeCont ASSERT_TRUE(postSyncFound); } -HWTEST2_F(CommandListAppendWriteToMem, givenAppendWriteToMemWithScopeThenPipeControlEncodedCorrectlyAlignedPtrUsed, MatchAny) { +HWTEST_F(CommandListAppendWriteToMem, givenAppendWriteToMemWithScopeThenPipeControlEncodedCorrectlyAlignedPtrUsed) { auto commandList = std::make_unique<::L0::ult::CommandListCoreFamily>(); commandList->initialize(device, NEO::EngineGroupType::renderCompute, 0u); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp index e34df280ad..c76fcb0d0f 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xe2_and_later.cpp @@ -23,8 +23,8 @@ namespace L0 { namespace ult { -HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyRegionBlitThenTimeStampRegistersAreAdded_MatchAny, IGFX_XE2_HPG_CORE); -HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyThenAppendProfilingCalledOnceBeforeAndAfterCommand_MatchAny, IGFX_XE2_HPG_CORE); +HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyRegionBlitThenTimeStampRegistersAreAdded, IGFX_XE2_HPG_CORE); +HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyThenAppendProfilingCalledOnceBeforeAndAfterCommand, IGFX_XE2_HPG_CORE); using Platforms = IsAtLeastXe2HpgCore; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp index 1cb6237e68..e2165cebc1 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp @@ -1313,7 +1313,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenInterruptEventWhenDispatchingTheProgramU using InOrderRegularCmdListTests = InOrderCmdListFixture; -HWTEST2_F(InOrderRegularCmdListTests, givenInOrderFlagWhenCreatingCmdListThenEnableInOrderMode, MatchAny) { +HWTEST_F(InOrderRegularCmdListTests, givenInOrderFlagWhenCreatingCmdListThenEnableInOrderMode) { ze_command_list_desc_t cmdListDesc = {ZE_STRUCTURE_TYPE_COMMAND_LIST_DESC}; cmdListDesc.flags = ZE_COMMAND_LIST_FLAG_IN_ORDER; @@ -1484,7 +1484,7 @@ HWTEST2_F(InOrderRegularCmdListTests, whenUsingRegularCmdListThenAddCmdsToPatch, } } -HWTEST2_F(InOrderRegularCmdListTests, givenCrossRegularCmdListDependenciesWhenExecutingThenDontPatchWhenExecutedOnlyOnce, MatchAny) { +HWTEST_F(InOrderRegularCmdListTests, givenCrossRegularCmdListDependenciesWhenExecutingThenDontPatchWhenExecutedOnlyOnce) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; ze_command_queue_desc_t desc = {}; @@ -1550,7 +1550,7 @@ HWTEST2_F(InOrderRegularCmdListTests, givenCrossRegularCmdListDependenciesWhenEx verifyPatching(7, baseEventWaitValue); } -HWTEST2_F(InOrderRegularCmdListTests, givenCrossRegularCmdListDependenciesWhenExecutingThenPatchWhenExecutedMultipleTimes, MatchAny) { +HWTEST_F(InOrderRegularCmdListTests, givenCrossRegularCmdListDependenciesWhenExecutingThenPatchWhenExecutedMultipleTimes) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; ze_command_queue_desc_t desc = {}; @@ -2129,7 +2129,7 @@ struct StandaloneInOrderTimestampAllocationTests : public InOrderCmdListFixture } }; -HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenSignalScopeEventWhenSignalEventIsCalledThenProgramPipeControl, MatchAny) { +HWTEST_F(StandaloneInOrderTimestampAllocationTests, givenSignalScopeEventWhenSignalEventIsCalledThenProgramPipeControl) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; auto eventPool = createEvents(2, false); @@ -2173,7 +2173,7 @@ HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenSignalScopeEventWhenSi } } -HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenTimestampEventWhenAskingForAllocationOrGpuAddressThenReturnNodeAllocation, MatchAny) { +HWTEST_F(StandaloneInOrderTimestampAllocationTests, givenTimestampEventWhenAskingForAllocationOrGpuAddressThenReturnNodeAllocation) { auto eventPool = createEvents(2, true); auto cmdList = createImmCmdList(); @@ -2200,7 +2200,7 @@ HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenTimestampEventWhenAski EXPECT_NE(events[0]->getGpuAddress(device), events[1]->getGpuAddress(device)); } -HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenDebugFlagSetToZeroWhenAssigningTimestampNodeThenDoNotClear, MatchAny) { +HWTEST_F(StandaloneInOrderTimestampAllocationTests, givenDebugFlagSetToZeroWhenAssigningTimestampNodeThenDoNotClear) { auto eventPool = createEvents(2, true); auto cmdList = createImmCmdList(); @@ -2250,7 +2250,7 @@ HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenNonWalkerCounterSignal EXPECT_EQ(isCompactEvent, cmdList->isInOrderNonWalkerSignalingRequired(events[0].get())); } -HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenTempNodeWhenCallingSyncPointsThenReleaseNotUsedNodes, MatchAny) { +HWTEST_F(StandaloneInOrderTimestampAllocationTests, givenTempNodeWhenCallingSyncPointsThenReleaseNotUsedNodes) { auto eventPool = createEvents(1, true); auto eventHandle = events[0]->toHandle(); @@ -2281,7 +2281,7 @@ HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenTempNodeWhenCallingSyn EXPECT_EQ(0u, inOrderExecInfo->tempTimestampNodes.size()); } -HWTEST2_F(StandaloneInOrderTimestampAllocationTests, givenTimestampEventWhenDispatchingThenAssignNewNode, MatchAny) { +HWTEST_F(StandaloneInOrderTimestampAllocationTests, givenTimestampEventWhenDispatchingThenAssignNewNode) { auto eventPool = createEvents(1, true); auto eventHandle = events[0]->toHandle(); @@ -2341,7 +2341,7 @@ using SynchronizedDispatchTests = InOrderCmdListFixture; using MultiTileSynchronizedDispatchTests = MultiTileSynchronizedDispatchFixture; -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchExtensionWhenCreatingRegularCmdListThenEnableSyncDispatchMode, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchExtensionWhenCreatingRegularCmdListThenEnableSyncDispatchMode) { NEO::debugManager.flags.ForceSynchronizedDispatchMode.set(-1); ze_base_desc_t unknownDesc = {ZE_STRUCTURE_TYPE_FORCE_UINT32}; @@ -2407,7 +2407,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchExtensionWhenCrea EXPECT_EQ(nullptr, hCmdList); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchExtensionWhenCreatingImmediateCmdListThenEnableSyncDispatchMode, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchExtensionWhenCreatingImmediateCmdListThenEnableSyncDispatchMode) { NEO::debugManager.flags.ForceSynchronizedDispatchMode.set(-1); ze_base_desc_t unknownDesc = {ZE_STRUCTURE_TYPE_FORCE_UINT32}; @@ -2472,7 +2472,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchExtensionWhenCrea EXPECT_EQ(nullptr, hCmdList); } -HWTEST2_F(SynchronizedDispatchTests, givenSingleTileSyncDispatchQueueWhenCreatingThenDontAssignQueueId, MatchAny) { +HWTEST_F(SynchronizedDispatchTests, givenSingleTileSyncDispatchQueueWhenCreatingThenDontAssignQueueId) { NEO::debugManager.flags.ForceSynchronizedDispatchMode.set(1); auto regularCmdList0 = createRegularCmdList(false); @@ -2493,7 +2493,7 @@ HWTEST2_F(SynchronizedDispatchTests, givenSingleTileSyncDispatchQueueWhenCreatin EXPECT_EQ(NEO::SynchronizedDispatchMode::disabled, immCmdList1->synchronizedDispatchMode); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenDebugFlagSetWhenCreatingCmdListThenEnableSynchronizedDispatch, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenDebugFlagSetWhenCreatingCmdListThenEnableSynchronizedDispatch) { NEO::debugManager.flags.ForceSynchronizedDispatchMode.set(-1); auto immCmdList = createMultiTileImmCmdList(); @@ -2519,7 +2519,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenDebugFlagSetWhenCreatingCmdLi EXPECT_EQ(NEO::SynchronizedDispatchMode::full, regularCmdList->synchronizedDispatchMode); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenMultiTileSyncDispatchQueueWhenCreatingThenAssignQueueId, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenMultiTileSyncDispatchQueueWhenCreatingThenAssignQueueId) { auto regularCmdList0 = createMultiTileRegularCmdList(false); auto regularCmdList1 = createMultiTileRegularCmdList(false); auto immCmdList0 = createMultiTileImmCmdList(); @@ -2544,7 +2544,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenMultiTileSyncDispatchQueueWhe EXPECT_EQ(NEO::SynchronizedDispatchMode::full, immCmdList1->synchronizedDispatchMode); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenMultiTileSyncDispatchQueueWhenCreatingThenDontAssignQueueIdForLimitedMode, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenMultiTileSyncDispatchQueueWhenCreatingThenDontAssignQueueIdForLimitedMode) { NEO::debugManager.flags.ForceSynchronizedDispatchMode.set(0); auto mockDevice = static_cast(device); @@ -2585,7 +2585,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenMultiTileSyncDispatchQueueWhe EXPECT_EQ(2u, regularCmdList->syncDispatchQueueId); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchEnabledWhenAllocatingQueueIdThenEnsureTokenAllocation, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchEnabledWhenAllocatingQueueIdThenEnsureTokenAllocation) { auto mockDevice = static_cast(device); EXPECT_EQ(nullptr, mockDevice->syncDispatchTokenAllocation); @@ -2604,7 +2604,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchEnabledWhenAlloca EXPECT_EQ(mockDevice->syncDispatchTokenAllocation, syncAllocation); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchWhenAppendingThenHandleResidency, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchWhenAppendingThenHandleResidency) { auto immCmdList = createMultiTileImmCmdList(); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); @@ -2617,7 +2617,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenSyncDispatchWhenAppendingThen EXPECT_EQ(2u, ultCsr->makeResidentAllocations[device->getSyncDispatchTokenAllocation()]); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenDefaultCmdListWhenCooperativeDispatchEnableThenEnableSyncDispatchMode, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenDefaultCmdListWhenCooperativeDispatchEnableThenEnableSyncDispatchMode) { debugManager.flags.ForceSynchronizedDispatchMode.set(-1); auto immCmdList = createMultiTileImmCmdList(); @@ -2641,7 +2641,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenDefaultCmdListWhenCooperative EXPECT_EQ(immCmdList->synchronizedDispatchMode, NEO::SynchronizedDispatchMode::limited); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenLimitedSyncDispatchWhenAppendingThenProgramTokenCheck, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenLimitedSyncDispatchWhenAppendingThenProgramTokenCheck) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; using COMPARE_OPERATION = typename MI_SEMAPHORE_WAIT::COMPARE_OPERATION; @@ -2910,7 +2910,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenFullSyncDispatchWhenAppending EXPECT_TRUE(verifyTokenAcquisition(true)); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenFullSyncDispatchWhenAppendingThenProgramTokenCleanup, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenFullSyncDispatchWhenAppendingThenProgramTokenCleanup) { using MI_ATOMIC = typename FamilyType::MI_ATOMIC; auto immCmdList = createMultiTileImmCmdList(); @@ -3005,7 +3005,7 @@ HWTEST2_F(MultiTileSynchronizedDispatchTests, givenFullSyncDispatchWhenAppending EXPECT_TRUE(verifyTokenCleanup()); } -HWTEST2_F(MultiTileSynchronizedDispatchTests, givenLimitedSyncDispatchWhenAppendingThenDontProgramTokenCleanup, MatchAny) { +HWTEST_F(MultiTileSynchronizedDispatchTests, givenLimitedSyncDispatchWhenAppendingThenDontProgramTokenCleanup) { using MI_ATOMIC = typename FamilyType::MI_ATOMIC; auto immCmdList = createMultiTileImmCmdList(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_3.cpp index 7513a5b9a3..afc007fa19 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_3.cpp @@ -29,7 +29,7 @@ struct InOrderIpcTests : public InOrderCmdListFixture { } }; -HWTEST2_F(InOrderIpcTests, givenInvalidCbEventWhenOpenIpcCalledThenReturnError, MatchAny) { +HWTEST_F(InOrderIpcTests, givenInvalidCbEventWhenOpenIpcCalledThenReturnError) { auto immCmdList = createImmCmdList(); auto nonTsEvent = createEvents(1, false); @@ -63,7 +63,7 @@ HWTEST2_F(InOrderIpcTests, givenInvalidCbEventWhenOpenIpcCalledThenReturnError, EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, zexCounterBasedEventGetIpcHandle(events[0]->toHandle(), &zexIpcData)); } -HWTEST2_F(InOrderIpcTests, givenCbEventWhenCreatingFromApiThenOpenIpcHandle, MatchAny) { +HWTEST_F(InOrderIpcTests, givenCbEventWhenCreatingFromApiThenOpenIpcHandle) { auto immCmdList = createImmCmdList(); zex_counter_based_event_desc_t counterBasedDesc = {ZEX_STRUCTURE_COUNTER_BASED_EVENT_DESC}; @@ -95,7 +95,7 @@ HWTEST2_F(InOrderIpcTests, givenCbEventWhenCreatingFromApiThenOpenIpcHandle, Mat zeEventDestroy(nonIpcEvent); } -HWTEST2_F(InOrderIpcTests, givenIncorrectInternalHandleWhenGetIsCalledThenReturnError, MatchAny) { +HWTEST_F(InOrderIpcTests, givenIncorrectInternalHandleWhenGetIsCalledThenReturnError) { auto immCmdList = createImmCmdList(); auto pool = createEvents(1, false); @@ -117,7 +117,7 @@ HWTEST2_F(InOrderIpcTests, givenIncorrectInternalHandleWhenGetIsCalledThenReturn } } -HWTEST2_F(InOrderIpcTests, givenCounterOffsetWhenOpenIsCalledThenPassCorrectData, MatchAny) { +HWTEST_F(InOrderIpcTests, givenCounterOffsetWhenOpenIsCalledThenPassCorrectData) { auto immCmdList1 = createImmCmdList(); auto immCmdList2 = createImmCmdList(); @@ -159,7 +159,7 @@ HWTEST2_F(InOrderIpcTests, givenCounterOffsetWhenOpenIsCalledThenPassCorrectData completeHostAddress>>(immCmdList2.get()); } -HWTEST2_F(InOrderIpcTests, givenIpcHandleWhenCreatingNewEventThenSetCorrectData, MatchAny) { +HWTEST_F(InOrderIpcTests, givenIpcHandleWhenCreatingNewEventThenSetCorrectData) { auto immCmdList1 = createImmCmdList(); auto immCmdList2 = createImmCmdList(); @@ -215,7 +215,7 @@ HWTEST2_F(InOrderIpcTests, givenIpcHandleWhenCreatingNewEventThenSetCorrectData, completeHostAddress>>(immCmdList2.get()); } -HWTEST2_F(InOrderIpcTests, givenInvalidInternalHandleWhenOpenCalledThenReturnError, MatchAny) { +HWTEST_F(InOrderIpcTests, givenInvalidInternalHandleWhenOpenCalledThenReturnError) { auto immCmdList = createImmCmdList(); auto pool = createEvents(1, false); @@ -244,7 +244,7 @@ HWTEST2_F(InOrderIpcTests, givenInvalidInternalHandleWhenOpenCalledThenReturnErr } } -HWTEST2_F(InOrderIpcTests, givenTbxModeWhenOpenIsCalledThenSetAllocationParams, MatchAny) { +HWTEST_F(InOrderIpcTests, givenTbxModeWhenOpenIsCalledThenSetAllocationParams) { auto immCmdList = createImmCmdList(); auto ultCsr = static_cast *>(device->getNEODevice()->getDefaultEngine().commandStreamReceiver); @@ -274,7 +274,7 @@ HWTEST2_F(InOrderIpcTests, givenTbxModeWhenOpenIsCalledThenSetAllocationParams, zexCounterBasedEventCloseIpcHandle(newEvent); } -HWTEST2_F(InOrderIpcTests, givenIpcImportedEventWhenSignalingThenReturnError, MatchAny) { +HWTEST_F(InOrderIpcTests, givenIpcImportedEventWhenSignalingThenReturnError) { auto immCmdList = createImmCmdList(); auto pool = createEvents(1, false); @@ -295,7 +295,7 @@ HWTEST2_F(InOrderIpcTests, givenIpcImportedEventWhenSignalingThenReturnError, Ma zexCounterBasedEventCloseIpcHandle(newEvent); } -HWTEST2_F(InOrderIpcTests, givenIncorrectParamsWhenUsingIpcApisThenReturnError, MatchAny) { +HWTEST_F(InOrderIpcTests, givenIncorrectParamsWhenUsingIpcApisThenReturnError) { auto immCmdList = createImmCmdList(); auto pool = createEvents(1, false); diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp index 802c0288ae..29882a0c03 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp @@ -368,7 +368,7 @@ HWTEST_F(CommandQueueCreate, given100CmdListsWhenExecutingThenCommandStreamIsNot commandQueue->destroy(); } -HWTEST2_F(CommandQueueCreate, givenOutOfHostMemoryErrorFromSubmitBatchBufferWhenExecutingCommandListsThenOutOfHostMemoryIsReturned, MatchAny) { +HWTEST_F(CommandQueueCreate, givenOutOfHostMemoryErrorFromSubmitBatchBufferWhenExecutingCommandListsThenOutOfHostMemoryIsReturned) { const ze_command_queue_desc_t desc = {}; auto commandQueue = new MockCommandQueueHw(device, neoDevice->getDefaultEngine().commandStreamReceiver, &desc); commandQueue->initialize(false, false, false); @@ -395,7 +395,7 @@ HWTEST2_F(CommandQueueCreate, givenOutOfHostMemoryErrorFromSubmitBatchBufferWhen commandQueue->destroy(); } -HWTEST2_F(CommandQueueCreate, givenGpuHangInReservingLinearStreamWhenExecutingCommandListsThenDeviceLostIsReturned, MatchAny) { +HWTEST_F(CommandQueueCreate, givenGpuHangInReservingLinearStreamWhenExecutingCommandListsThenDeviceLostIsReturned) { const ze_command_queue_desc_t desc = {}; auto commandQueue = new MockCommandQueueHw(device, neoDevice->getDefaultEngine().commandStreamReceiver, &desc); commandQueue->initialize(false, false, false); @@ -423,7 +423,7 @@ HWTEST2_F(CommandQueueCreate, givenGpuHangInReservingLinearStreamWhenExecutingCo commandQueue->destroy(); } -HWTEST2_F(CommandQueueCreate, givenSwTagsEnabledWhenPrepareAndSubmitBatchBufferThenLeftoverIsZeroed, MatchAny) { +HWTEST_F(CommandQueueCreate, givenSwTagsEnabledWhenPrepareAndSubmitBatchBufferThenLeftoverIsZeroed) { DebugManagerStateRestore restorer; NEO::debugManager.flags.EnableSWTags.set(1); const ze_command_queue_desc_t desc = {}; @@ -475,7 +475,7 @@ struct MockCommandQueueHwEstimateSizeTest : public MockCommandQueueHw(device, neoDevice->getDefaultEngine().commandStreamReceiver, &desc); commandQueue->initialize(false, false, false); @@ -1018,7 +1018,7 @@ class MockCommandQueue : public L0::CommandQueueHw { }; using ExecuteCommandListTests = Test; -HWTEST2_F(ExecuteCommandListTests, givenExecuteCommandListWhenItReturnsThenContainersAreEmpty, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenExecuteCommandListWhenItReturnsThenContainersAreEmpty) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; device->getCsrForOrdinalAndIndex(&csr, 0u, 0u, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false); @@ -1047,7 +1047,7 @@ HWTEST2_F(ExecuteCommandListTests, givenExecuteCommandListWhenItReturnsThenConta alignedFree(alloc); } -HWTEST2_F(ExecuteCommandListTests, givenRegularCmdListWhenExecutionThenIncSubmissionCounter, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenRegularCmdListWhenExecutionThenIncSubmissionCounter) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; device->getCsrForOrdinalAndIndex(&csr, 0u, 0u, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false); @@ -1096,7 +1096,7 @@ class MockCommandQueueSubmitBatchBuffer : public MockCommandQueue bool isCooperative)); }; -HWTEST2_F(ExecuteCommandListTests, givenOutOfMemorySubmitBatchBufferThenExecuteCommandListReturnsOutOfMemoryError, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenOutOfMemorySubmitBatchBufferThenExecuteCommandListReturnsOutOfMemoryError) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; device->getCsrForOrdinalAndIndex(&csr, 0u, 0u, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false); @@ -1117,7 +1117,7 @@ HWTEST2_F(ExecuteCommandListTests, givenOutOfMemorySubmitBatchBufferThenExecuteC } using CommandQueueDestroy = Test; -HWTEST2_F(CommandQueueDestroy, givenCommandQueueAndCommandListWithSshAndScratchWhenExecuteThenSshWasUsed, MatchAny) { +HWTEST_F(CommandQueueDestroy, givenCommandQueueAndCommandListWithSshAndScratchWhenExecuteThenSshWasUsed) { DebugManagerStateRestore restorer; debugManager.flags.SelectCmdListHeapAddressModel.set(0); @@ -1187,7 +1187,7 @@ HWTEST2_F(CommandQueueDestroy, givenCommandQueueAndCommandListWithSshAndPrivateS alignedFree(alloc); } -HWTEST2_F(ExecuteCommandListTests, givenBindlessHelperWhenCommandListIsExecutedOnCommandQueueThenHeapContainerIsEmpty, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenBindlessHelperWhenCommandListIsExecutedOnCommandQueueThenHeapContainerIsEmpty) { DebugManagerStateRestore dbgRestorer; debugManager.flags.UseExternalAllocatorForSshAndDsh.set(1); debugManager.flags.SelectCmdListHeapAddressModel.set(0); @@ -1214,7 +1214,7 @@ HWTEST2_F(ExecuteCommandListTests, givenBindlessHelperWhenCommandListIsExecutedO commandList->destroy(); } -HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenExecuteCommandListReturnsErrorUnknown, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenExecuteCommandListReturnsErrorUnknown) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; device->getCsrForOrdinalAndIndex(&csr, 0u, 0u, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false); @@ -1234,7 +1234,7 @@ HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenExecuteComma commandList->destroy(); } -HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphicsTaskCountsLatestFlushedTaskCountZero, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphicsTaskCountsLatestFlushedTaskCountZero) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; @@ -1266,7 +1266,7 @@ HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphic alignedFree(alloc); } -HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphicsTaskCountsLatestFlushedTaskCountNonZero, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphicsTaskCountsLatestFlushedTaskCountNonZero) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; @@ -1298,7 +1298,7 @@ HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenResetGraphic alignedFree(alloc); } -HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenWaitForCompletionFalse, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenWaitForCompletionFalse) { auto &compilerProductHelper = device->getCompilerProductHelper(); auto heaplessEnabled = compilerProductHelper.isHeaplessModeEnabled(*defaultHwInfo); @@ -1328,7 +1328,7 @@ HWTEST2_F(ExecuteCommandListTests, givenFailingSubmitBatchBufferThenWaitForCompl commandList->destroy(); } -HWTEST2_F(ExecuteCommandListTests, givenSuccessfulSubmitBatchBufferThenExecuteCommandListReturnsSuccess, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenSuccessfulSubmitBatchBufferThenExecuteCommandListReturnsSuccess) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; device->getCsrForOrdinalAndIndex(&csr, 0u, 0u, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false); @@ -1353,7 +1353,7 @@ HWTEST2_F(ExecuteCommandListTests, givenSuccessfulSubmitBatchBufferThenExecuteCo commandList->destroy(); } -HWTEST2_F(ExecuteCommandListTests, givenCommandQueueHavingTwoB2BCommandListsThenMVSDirtyFlagAndGSBADirtyFlagAreSetOnlyOnce, MatchAny) { +HWTEST_F(ExecuteCommandListTests, givenCommandQueueHavingTwoB2BCommandListsThenMVSDirtyFlagAndGSBADirtyFlagAreSetOnlyOnce) { auto &compilerProductHelper = device->getCompilerProductHelper(); auto heaplessEnabled = compilerProductHelper.isHeaplessModeEnabled(*defaultHwInfo); diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp index b997231928..f11e3a32c7 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp @@ -1039,7 +1039,7 @@ HWTEST2_F(CommandQueueScratchTests, givenCommandsToPatchToNotSupportedPlatformWh using CommandQueueCreate = Test; -HWTEST2_F(CommandQueueCreate, givenCommandsToPatchWithNoopSpacePatchWhenPatchCommandsIsCalledThenSpaceIsNooped, MatchAny) { +HWTEST_F(CommandQueueCreate, givenCommandsToPatchWithNoopSpacePatchWhenPatchCommandsIsCalledThenSpaceIsNooped) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr = nullptr; device->getCsrForOrdinalAndIndex(&csr, 0u, 0u, ZE_COMMAND_QUEUE_PRIORITY_NORMAL, false); diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp index f57e0440e8..e329e7b645 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp @@ -699,7 +699,7 @@ struct SingleSliceDispatchSupportMatcher { } }; -HWTEST2_F(CommandQueueIndirectAllocations, givenCtxWithIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessCalled, MatchAny) { +HWTEST_F(CommandQueueIndirectAllocations, givenCtxWithIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessCalled) { ze_command_queue_desc_t desc = {}; auto csr = neoDevice->getDefaultEngine().commandStreamReceiver; auto commandQueue = new MockCommandQueueHandleIndirectAllocs(device, csr, &desc); @@ -727,7 +727,7 @@ HWTEST2_F(CommandQueueIndirectAllocations, givenCtxWithIndirectAccessWhenExecuti commandQueue->destroy(); } -HWTEST2_F(CommandQueueIndirectAllocations, givenCtxWitNohIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessNotCalled, MatchAny) { +HWTEST_F(CommandQueueIndirectAllocations, givenCtxWitNohIndirectAccessWhenExecutingCommandListImmediateWithFlushTaskThenHandleIndirectAccessNotCalled) { ze_command_queue_desc_t desc = {}; auto csr = neoDevice->getDefaultEngine().commandStreamReceiver; auto commandQueue = new MockCommandQueueHandleIndirectAllocs(device, csr, &desc); @@ -755,7 +755,7 @@ HWTEST2_F(CommandQueueIndirectAllocations, givenCtxWitNohIndirectAccessWhenExecu commandQueue->destroy(); } -HWTEST2_F(CommandQueueIndirectAllocations, givenCommandQueueWhenHandleIndirectAllocationResidencyCalledAndSubmitPackDiasabledThenMakeResidentAndMigrateCalled, MatchAny) { +HWTEST_F(CommandQueueIndirectAllocations, givenCommandQueueWhenHandleIndirectAllocationResidencyCalledAndSubmitPackDiasabledThenMakeResidentAndMigrateCalled) { DebugManagerStateRestore restore; debugManager.flags.MakeIndirectAllocationsResidentAsPack.set(0); diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_debugger.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_debugger.cpp index 21d53e1982..37f48bcb4e 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_debugger.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_debugger.cpp @@ -170,7 +170,7 @@ HWTEST2_F(L0CmdQueueDebuggerTest, givenDebuggingEnabledAndRequiredGsbaWhenIntern cmdQ->destroy(); } -HWTEST2_F(L0CmdQueueDebuggerTest, givenDebugEnabledWhenCommandsAreExecutedTwoTimesThenCsrBaseProgrammedOnlyTheFirstTime, MatchAny) { +HWTEST_F(L0CmdQueueDebuggerTest, givenDebugEnabledWhenCommandsAreExecutedTwoTimesThenCsrBaseProgrammedOnlyTheFirstTime) { DebugManagerStateRestore restorer; auto &compilerProductHelper = device->getCompilerProductHelper(); diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp index d418f1a05c..63e729494c 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp @@ -443,7 +443,7 @@ HWTEST_F(CommandQueueExecuteCommandLists, givenMidThreadPreemptionWhenCommandsAr } } -HWTEST2_F(CommandQueueExecuteCommandLists, givenMidThreadPreemptionWhenCommandsAreExecutedTwoTimesThenStateSipIsAddedOnlyTheFirstTime, MatchAny) { +HWTEST_F(CommandQueueExecuteCommandLists, givenMidThreadPreemptionWhenCommandsAreExecutedTwoTimesThenStateSipIsAddedOnlyTheFirstTime) { using STATE_SIP = typename FamilyType::STATE_SIP; using Parse = typename FamilyType::Parse; @@ -864,14 +864,14 @@ void CommandQueueExecuteCommandListsFixture::twoCommandListCommandPreemptionTest commandQueue->destroy(); } -HWTEST2_F(CommandQueueExecuteCommandLists, GivenCmdListsWithDifferentPreemptionModesWhenExecutingThenQueuePreemptionIsSwitchedAndStateSipProgrammedOnce, MatchAny) { +HWTEST_F(CommandQueueExecuteCommandLists, GivenCmdListsWithDifferentPreemptionModesWhenExecutingThenQueuePreemptionIsSwitchedAndStateSipProgrammedOnce) { if (heaplessStateInit) { GTEST_SKIP(); } twoCommandListCommandPreemptionTest(false); } -HWTEST2_F(CommandQueueExecuteCommandLists, GivenCmdListsWithDifferentPreemptionModesWhenNoCmdStreamPreemptionRequiredThenNoCmdStreamProgrammingAndStateSipProgrammedOnce, MatchAny) { +HWTEST_F(CommandQueueExecuteCommandLists, GivenCmdListsWithDifferentPreemptionModesWhenNoCmdStreamPreemptionRequiredThenNoCmdStreamProgrammingAndStateSipProgrammedOnce) { if (heaplessStateInit) { GTEST_SKIP(); } diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp index 4fbf2d62c5..9bb73c7327 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp @@ -25,7 +25,7 @@ namespace ult { using CommandQueueExecuteCommandListsSimpleTest = Test; -HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, GivenSynchronousModeWhenExecutingCommandListThenSynchronizeIsCalled, MatchAny) { +HWTEST_F(CommandQueueExecuteCommandListsSimpleTest, GivenSynchronousModeWhenExecutingCommandListThenSynchronizeIsCalled) { ze_command_queue_desc_t desc; desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS; auto mockCmdQ = new MockCommandQueueHw(device, neoDevice->getDefaultEngine().commandStreamReceiver, &desc); @@ -40,7 +40,7 @@ HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, GivenSynchronousModeWhenExe mockCmdQ->destroy(); } -HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, GivenSynchronousModeAndDeviceLostSynchronizeWhenExecutingCommandListThenSynchronizeIsCalledAndDeviceLostIsReturned, MatchAny) { +HWTEST_F(CommandQueueExecuteCommandListsSimpleTest, GivenSynchronousModeAndDeviceLostSynchronizeWhenExecutingCommandListThenSynchronizeIsCalledAndDeviceLostIsReturned) { ze_command_queue_desc_t desc; desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS; @@ -60,7 +60,7 @@ HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, GivenSynchronousModeAndDevi mockCmdQ->destroy(); } -HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, GivenAsynchronousModeWhenExecutingCommandListThenSynchronizeIsNotCalled, MatchAny) { +HWTEST_F(CommandQueueExecuteCommandListsSimpleTest, GivenAsynchronousModeWhenExecutingCommandListThenSynchronizeIsNotCalled) { ze_command_queue_desc_t desc; desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS; auto mockCmdQ = new MockCommandQueueHw(device, neoDevice->getDefaultEngine().commandStreamReceiver, &desc); @@ -75,7 +75,7 @@ HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, GivenAsynchronousModeWhenEx mockCmdQ->destroy(); } -HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, whenUsingFenceThenLastPipeControlUpdatesFenceAllocation, MatchAny) { +HWTEST_F(CommandQueueExecuteCommandListsSimpleTest, whenUsingFenceThenLastPipeControlUpdatesFenceAllocation) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename FamilyType::PIPE_CONTROL::POST_SYNC_OPERATION; diff --git a/level_zero/core/test/unit_tests/sources/context/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/test_context.cpp index 4de258d43d..61a7112acb 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context.cpp @@ -800,8 +800,7 @@ HWTEST_F(ContextMakeMemoryResidentAndMigrationTests, commandQueue->destroy(); context->freeMem(ptr); } -HWTEST2_F(ContextMakeMemoryResidentAndMigrationTests, - whenExecutingKernelWithIndirectAccessThenSharedAllocationsAreMigrated, MatchAny) { +HWTEST_F(ContextMakeMemoryResidentAndMigrationTests, whenExecutingKernelWithIndirectAccessThenSharedAllocationsAreMigrated) { DriverHandleImp *driverHandleImp = static_cast(hostDriverHandle.get()); size_t previousSize = driverHandleImp->sharedMakeResidentAllocations.size(); @@ -2445,7 +2444,7 @@ HWTEST2_F(ContextTest, WhenCreatingImageThenSuccessIsReturned, IsAtMostProductDG EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -HWTEST2_F(ContextTest, givenBindlessModeDisabledWhenMakeImageResidentAndEvictThenImageImplicitArgsAllocationIsNotMadeResidentAndEvicted, MatchAny) { +HWTEST_F(ContextTest, givenBindlessModeDisabledWhenMakeImageResidentAndEvictThenImageImplicitArgsAllocationIsNotMadeResidentAndEvicted) { if (!device->getNEODevice()->getRootDeviceEnvironment().getReleaseHelper() || !device->getNEODevice()->getDeviceInfo().imageSupport) { GTEST_SKIP(); @@ -2497,7 +2496,7 @@ HWTEST2_F(ContextTest, givenBindlessModeDisabledWhenMakeImageResidentAndEvictThe EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -HWTEST2_F(ContextTest, givenBindlessImageWhenMakeImageResidentAndEvictThenImageImplicitArgsAllocationIsMadeResidentAndEvicted, MatchAny) { +HWTEST_F(ContextTest, givenBindlessImageWhenMakeImageResidentAndEvictThenImageImplicitArgsAllocationIsMadeResidentAndEvicted) { if (!device->getNEODevice()->getRootDeviceEnvironment().getReleaseHelper() || !device->getNEODevice()->getDeviceInfo().imageSupport) { GTEST_SKIP(); @@ -2560,7 +2559,7 @@ HWTEST2_F(ContextTest, givenBindlessImageWhenMakeImageResidentAndEvictThenImageI EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -HWTEST2_F(ContextTest, givenMakeImageResidentThenMakeImageResidentIsCalledWithForcePagingFenceTrue, MatchAny) { +HWTEST_F(ContextTest, givenMakeImageResidentThenMakeImageResidentIsCalledWithForcePagingFenceTrue) { if (!device->getNEODevice()->getRootDeviceEnvironment().getReleaseHelper() || !device->getNEODevice()->getDeviceInfo().imageSupport) { GTEST_SKIP(); 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 a2e5e8b775..2a4b8b9a6b 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 @@ -602,7 +602,7 @@ HWTEST_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionDisabledForRegularC commandQueue->destroy(); } -HWTEST2_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionEnabledCommandListAndAppendPageFaultCopyThenSuccessIsReturned, MatchAny) { +HWTEST_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionEnabledCommandListAndAppendPageFaultCopyThenSuccessIsReturned) { DebugManagerStateRestore restorer; NEO::debugManager.flags.EnableFlushTaskSubmission.set(true); @@ -625,7 +625,7 @@ HWTEST2_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionEnabledCommandList commandList->destroy(); } -HWTEST2_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionDisabledCommandListAndAppendPageFaultCopyThenSuccessIsReturned, MatchAny) { +HWTEST_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionDisabledCommandListAndAppendPageFaultCopyThenSuccessIsReturned) { DebugManagerStateRestore restorer; NEO::debugManager.flags.EnableFlushTaskSubmission.set(false); @@ -706,7 +706,7 @@ struct MockKernelImmutableData : public KernelImmutableData { MockKernelImmutableData(L0::Device *device) : KernelImmutableData(device) {} }; -HWTEST2_F(L0DebuggerTest, givenFlushTaskSubmissionAndSharedHeapsEnabledWhenAppendingKernelUsingNewHeapThenDebugSurfaceIsProgrammedOnce, MatchAny) { +HWTEST_F(L0DebuggerTest, givenFlushTaskSubmissionAndSharedHeapsEnabledWhenAppendingKernelUsingNewHeapThenDebugSurfaceIsProgrammedOnce) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; DebugManagerStateRestore restorer; 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 3f717d9cd5..b56756f273 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 @@ -551,7 +551,7 @@ HWTEST2_P(L0DebuggerWithBlitterTest, givenUseCsrImmediateSubmissionDisabledComma commandList->destroy(); } -HWTEST2_P(L0DebuggerWithBlitterTest, givenDebuggingEnabledWhenInternalCmdQIsUsedThenDebuggerPathsAreNotExecuted, MatchAny) { +HWTEST_P(L0DebuggerWithBlitterTest, givenDebuggingEnabledWhenInternalCmdQIsUsedThenDebuggerPathsAreNotExecuted) { ze_command_queue_desc_t queueDesc = {}; std::unique_ptr, Deleter> commandQueue(new MockCommandQueueHw(device, neoDevice->getDefaultEngine().commandStreamReceiver, &queueDesc)); diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp index 2ac0d6ff02..1ce5b79023 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp @@ -120,7 +120,7 @@ HWTEST_P(L0DebuggerParameterizedTests, givenL0DebuggerWhenCreatedThenPerContextS using Gen12Plus = IsAtLeastGfxCore; -HWTEST2_F(L0DebuggerPerContextAddressSpaceTest, givenDebuggingEnabledAndRequiredGsbaWhenCommandListIsExecutedThenProgramGsbaWritesToSbaTrackingBuffer, MatchAny) { +HWTEST_F(L0DebuggerPerContextAddressSpaceTest, givenDebuggingEnabledAndRequiredGsbaWhenCommandListIsExecutedThenProgramGsbaWritesToSbaTrackingBuffer) { using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; @@ -513,7 +513,7 @@ struct L0DebuggerSingleAddressSpace : public Test { DebugManagerStateRestore restorer; }; -HWTEST2_F(L0DebuggerSingleAddressSpace, givenDebuggingEnabledWhenCommandListIsExecutedThenValidKernelDebugCommandsAreAdded, MatchAny) { +HWTEST_F(L0DebuggerSingleAddressSpace, givenDebuggingEnabledWhenCommandListIsExecutedThenValidKernelDebugCommandsAreAdded) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; ze_command_queue_desc_t queueDesc = {}; diff --git a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp index 2e037b45dd..a1d5b89042 100644 --- a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp @@ -1180,7 +1180,7 @@ HWTEST2_F(DeviceTest, givenIncorrectThreadArbitrationPolicyWhenPassingScheduling EXPECT_EQ(0u, schedulingHintProperties.schedulingHintFlags); } -HWTEST2_F(DeviceTest, whenPassingRaytracingExpStructToGetPropertiesThenPropertiesWithCorrectFlagIsReturned, MatchAny) { +HWTEST_F(DeviceTest, whenPassingRaytracingExpStructToGetPropertiesThenPropertiesWithCorrectFlagIsReturned) { ze_device_module_properties_t kernelProperties = {}; kernelProperties.stype = ZE_STRUCTURE_TYPE_KERNEL_PROPERTIES; @@ -1207,7 +1207,7 @@ HWTEST2_F(DeviceTest, whenPassingRaytracingExpStructToGetPropertiesThenPropertie EXPECT_EQ(expectedMaxBVHLevels, rayTracingProperties.maxBVHLevels); } -HWTEST2_F(DeviceTest, givenSetMaxBVHLevelsWhenPassingRaytracingExpStructToGetPropertiesThenPropertiesWithCorrectFlagIsReturned, MatchAny) { +HWTEST_F(DeviceTest, givenSetMaxBVHLevelsWhenPassingRaytracingExpStructToGetPropertiesThenPropertiesWithCorrectFlagIsReturned) { DebugManagerStateRestore dbgRestorer; debugManager.flags.SetMaxBVHLevels.set(7); @@ -6576,7 +6576,7 @@ bool RTASDeviceTest::MockOsLibrary::libraryLoaded = false; bool RTASDeviceTest::MockOsLibrary::failLibraryLoad = false; bool RTASDeviceTest::MockOsLibrary::failGetProcAddress = false; -HWTEST2_F(RTASDeviceTest, GivenValidRTASLibraryWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned, MatchAny) { +HWTEST_F(RTASDeviceTest, GivenValidRTASLibraryWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned) { MockOsLibrary::libraryLoaded = false; MockOsLibrary::failLibraryLoad = false; MockOsLibrary::failGetProcAddress = false; @@ -6602,7 +6602,7 @@ HWTEST2_F(RTASDeviceTest, GivenValidRTASLibraryWhenQueryingRTASProptertiesThenCo } } -HWTEST2_F(RTASDeviceTest, GivenRTASLibraryPreLoadedWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned, MatchAny) { +HWTEST_F(RTASDeviceTest, GivenRTASLibraryPreLoadedWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned) { MockOsLibrary::libraryLoaded = false; MockOsLibrary::failLibraryLoad = false; MockOsLibrary::failGetProcAddress = false; @@ -6627,7 +6627,7 @@ HWTEST2_F(RTASDeviceTest, GivenRTASLibraryPreLoadedWhenQueryingRTASProptertiesTh } } -HWTEST2_F(RTASDeviceTest, GivenInvalidRTASLibraryWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned, MatchAny) { +HWTEST_F(RTASDeviceTest, GivenInvalidRTASLibraryWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned) { auto releaseHelper = this->neoDevice->getReleaseHelper(); if (!releaseHelper || !releaseHelper->isRayTracingSupported()) { @@ -6653,7 +6653,7 @@ HWTEST2_F(RTASDeviceTest, GivenInvalidRTASLibraryWhenQueryingRTASProptertiesThen EXPECT_EQ(ZE_RTAS_FORMAT_EXP_INVALID, rtasProperties.rtasFormat); } -HWTEST2_F(RTASDeviceTest, GivenMissingSymbolsInRTASLibraryWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned, MatchAny) { +HWTEST_F(RTASDeviceTest, GivenMissingSymbolsInRTASLibraryWhenQueryingRTASProptertiesThenCorrectPropertiesIsReturned) { auto releaseHelper = this->neoDevice->getReleaseHelper(); if (!releaseHelper || !releaseHelper->isRayTracingSupported()) { diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp index 6ec9905b84..03105d048e 100644 --- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp +++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp @@ -4800,11 +4800,11 @@ struct EventDynamicPacketUseFixture : public DeviceFixture { }; using EventDynamicPacketUseTest = Test>; -HWTEST2_F(EventDynamicPacketUseTest, givenDynamicPacketEstimationWhenGettingMaxPacketFromAllDevicesThenMaxPossibleSelected, MatchAny) { +HWTEST_F(EventDynamicPacketUseTest, givenDynamicPacketEstimationWhenGettingMaxPacketFromAllDevicesThenMaxPossibleSelected) { testAllDevices(); } -HWTEST2_F(EventDynamicPacketUseTest, givenDynamicPacketEstimationWhenGettingMaxPacketFromSingleDeviceThenMaxFromThisDeviceSelected, MatchAny) { +HWTEST_F(EventDynamicPacketUseTest, givenDynamicPacketEstimationWhenGettingMaxPacketFromSingleDeviceThenMaxFromThisDeviceSelected) { testSingleDevice(); } diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp index 0e3af8392a..51121084e9 100644 --- a/level_zero/core/test/unit_tests/sources/image/test_image.cpp +++ b/level_zero/core/test/unit_tests/sources/image/test_image.cpp @@ -36,7 +36,7 @@ namespace ult { using ImageCreate = Test; using ImageView = Test; -HWTEST2_F(ImageCreate, givenValidImageDescriptionWhenImageCreateThenImageIsCreatedCorrectly, MatchAny) { +HWTEST_F(ImageCreate, givenValidImageDescriptionWhenImageCreateThenImageIsCreatedCorrectly) { ze_image_desc_t zeDesc = {}; zeDesc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; zeDesc.arraylevels = 1u; @@ -78,7 +78,7 @@ HWTEST2_F(ImageCreate, givenValidImageDescriptionWhenImageCreateThenImageIsCreat EXPECT_EQ(imageInfo.useLocalMemory, false); } -HWTEST2_F(ImageCreate, givenValidImageDescriptionWhenImageCreateWithUnsupportedImageThenNullPtrImageIsReturned, MatchAny) { +HWTEST_F(ImageCreate, givenValidImageDescriptionWhenImageCreateWithUnsupportedImageThenNullPtrImageIsReturned) { ze_image_desc_t zeDesc = {}; zeDesc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; zeDesc.arraylevels = 1u; @@ -109,7 +109,7 @@ class TestImageFormats : public DeviceFixture, public testing::TestWithParamgetNEODevice()->getRootDeviceEnvironment().getReleaseHelper()) { GTEST_SKIP(); } @@ -231,7 +231,7 @@ HWTEST2_F(ImageCreate, givenBindlessImageWhenImageInitializeThenImageImplicitArg } } -HWTEST2_F(ImageCreate, givenBindlessModeDisabledWhenImageInitializeThenImageImplicitArgsAllocationAndSurfaceStateAreNotCreated, MatchAny) { +HWTEST_F(ImageCreate, givenBindlessModeDisabledWhenImageInitializeThenImageImplicitArgsAllocationAndSurfaceStateAreNotCreated) { if (!device->getNEODevice()->getRootDeviceEnvironment().getReleaseHelper()) { GTEST_SKIP(); } @@ -265,7 +265,7 @@ HWTEST2_F(ImageCreate, givenBindlessModeDisabledWhenImageInitializeThenImageImpl EXPECT_EQ(nullptr, reinterpret_cast(implicitArgsSurfaceState->getSurfaceBaseAddress())); } -HWTEST2_F(ImageView, givenPlanarImageWhenCreateImageViewThenProperPlaneIsCreated, MatchAny) { +HWTEST_F(ImageView, givenPlanarImageWhenCreateImageViewThenProperPlaneIsCreated) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -346,7 +346,7 @@ HWTEST2_F(ImageView, givenPlanarImageWhenCreateImageViewThenProperPlaneIsCreated zeImageDestroy(planeUV); } -HWTEST2_F(ImageView, given3ChannelImageWhenCreateImageViewIsCalledThenProperViewIsCreated, MatchAny) { +HWTEST_F(ImageView, given3ChannelImageWhenCreateImageViewIsCalledThenProperViewIsCreated) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -381,7 +381,7 @@ HWTEST2_F(ImageView, given3ChannelImageWhenCreateImageViewIsCalledThenProperView zeImageDestroy(imgHandle); } -HWTEST2_F(ImageView, given3Channel16BitImageWhenCreateImageViewIsCalledThenProperViewIsCreated, MatchAny) { +HWTEST_F(ImageView, given3Channel16BitImageWhenCreateImageViewIsCalledThenProperViewIsCreated) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -416,7 +416,7 @@ HWTEST2_F(ImageView, given3Channel16BitImageWhenCreateImageViewIsCalledThenPrope zeImageDestroy(imgHandle); } -HWTEST2_F(ImageView, given3ChannelMickedImageWhenCreateImageViewIsCalledThenProperViewIsCreated, MatchAny) { +HWTEST_F(ImageView, given3ChannelMickedImageWhenCreateImageViewIsCalledThenProperViewIsCreated) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -460,7 +460,7 @@ HWTEST2_F(ImageView, given3ChannelMickedImageWhenCreateImageViewIsCalledThenProp zeImageDestroy(imgHandle); } -HWTEST2_F(ImageView, given32bitImageWhenCreateImageViewIsCalledWith3ChannelThenNotSuppotedIsReturned, MatchAny) { +HWTEST_F(ImageView, given32bitImageWhenCreateImageViewIsCalledWith3ChannelThenNotSuppotedIsReturned) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -503,7 +503,7 @@ HWTEST2_F(ImageView, given32bitImageWhenCreateImageViewIsCalledWith3ChannelThenN zeImageDestroy(imgHandle); } -HWTEST2_F(ImageView, givenPlanarImageWhenCreateImageWithInvalidStructViewThenProperErrorIsReturned, MatchAny) { +HWTEST_F(ImageView, givenPlanarImageWhenCreateImageWithInvalidStructViewThenProperErrorIsReturned) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -547,7 +547,7 @@ HWTEST2_F(ImageView, givenPlanarImageWhenCreateImageWithInvalidStructViewThenPro ASSERT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_ENUMERATION, ret); } -HWTEST2_F(ImageCreate, givenFDWhenCreatingImageThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreate, givenFDWhenCreatingImageThenSuccessIsReturned) { ze_image_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; @@ -575,7 +575,7 @@ HWTEST2_F(ImageCreate, givenFDWhenCreatingImageThenSuccessIsReturned, MatchAny) ASSERT_EQ(static_cast(imageHW->getAllocation()->peekSharedHandle()), importFd.fd); } -HWTEST2_F(ImageCreate, givenOpaqueFdWhenCreatingImageThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreate, givenOpaqueFdWhenCreatingImageThenSuccessIsReturned) { ze_image_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; @@ -602,7 +602,7 @@ HWTEST2_F(ImageCreate, givenOpaqueFdWhenCreatingImageThenSuccessIsReturned, Matc ASSERT_EQ(ZE_RESULT_SUCCESS, ret); } -HWTEST2_F(ImageCreate, givenExportStructWhenCreatingImageThenUnsupportedErrorIsReturned, MatchAny) { +HWTEST_F(ImageCreate, givenExportStructWhenCreatingImageThenUnsupportedErrorIsReturned) { ze_image_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; @@ -676,7 +676,7 @@ class ImageCreateExternalMemory : public DeviceFixtureWithCustomMemoryManager; -HWTEST2_F(ImageCreateExternalMemoryTest, givenNTHandleWhenCreatingImageThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreateExternalMemoryTest, givenNTHandleWhenCreatingImageThenSuccessIsReturned) { ze_external_memory_import_win32_handle_t importNTHandle = {}; importNTHandle.handle = &imageHandle; importNTHandle.flags = ZE_EXTERNAL_MEMORY_TYPE_FLAG_OPAQUE_WIN32; @@ -695,7 +695,7 @@ HWTEST2_F(ImageCreateExternalMemoryTest, givenNTHandleWhenCreatingImageThenSucce imageHW.reset(nullptr); } -HWTEST2_F(ImageCreateExternalMemoryTest, givenD3D12HeapHandleWhenCreatingImageThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreateExternalMemoryTest, givenD3D12HeapHandleWhenCreatingImageThenSuccessIsReturned) { ze_external_memory_import_win32_handle_t importNTHandle = {}; importNTHandle.handle = &imageHandle; importNTHandle.flags = ZE_EXTERNAL_MEMORY_TYPE_FLAG_D3D12_HEAP; @@ -714,7 +714,7 @@ HWTEST2_F(ImageCreateExternalMemoryTest, givenD3D12HeapHandleWhenCreatingImageTh imageHW.reset(nullptr); } -HWTEST2_F(ImageCreateExternalMemoryTest, givenD3D12ResourceHandleWhenCreatingImageThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreateExternalMemoryTest, givenD3D12ResourceHandleWhenCreatingImageThenSuccessIsReturned) { ze_external_memory_import_win32_handle_t importNTHandle = {}; importNTHandle.handle = &imageHandle; importNTHandle.flags = ZE_EXTERNAL_MEMORY_TYPE_FLAG_D3D12_RESOURCE; @@ -733,7 +733,7 @@ HWTEST2_F(ImageCreateExternalMemoryTest, givenD3D12ResourceHandleWhenCreatingIma imageHW.reset(nullptr); } -HWTEST2_F(ImageCreateExternalMemoryTest, givenD3D11TextureHandleWhenCreatingImageThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreateExternalMemoryTest, givenD3D11TextureHandleWhenCreatingImageThenSuccessIsReturned) { ze_external_memory_import_win32_handle_t importNTHandle = {}; importNTHandle.handle = &imageHandle; importNTHandle.flags = ZE_EXTERNAL_MEMORY_TYPE_FLAG_D3D11_TEXTURE; @@ -754,7 +754,7 @@ HWTEST2_F(ImageCreateExternalMemoryTest, givenD3D11TextureHandleWhenCreatingImag using ImageCreateWithMemoryManagerNTHandleMock = Test>; -HWTEST2_F(ImageCreateWithMemoryManagerNTHandleMock, givenNTHandleWhenCreatingNV12ImageThenSuccessIsReturnedAndUVOffsetIsSet, MatchAny) { +HWTEST_F(ImageCreateWithMemoryManagerNTHandleMock, givenNTHandleWhenCreatingNV12ImageThenSuccessIsReturnedAndUVOffsetIsSet) { constexpr uint32_t yOffsetForUVPlane = 8u; // mock sets reqOffsetInfo.Lock.Offset to 16 and reqOffsetInfo.Lock.Pitch to 2 ze_image_desc_t desc = {}; @@ -805,7 +805,7 @@ class FailMemoryManagerMock : public NEO::OsAgnosticMemoryManager { using ImageCreateWithFailMemoryManagerMock = Test>; -HWTEST2_F(ImageCreateWithFailMemoryManagerMock, givenImageDescWhenFailImageAllocationThenProperErrorIsReturned, MatchAny) { +HWTEST_F(ImageCreateWithFailMemoryManagerMock, givenImageDescWhenFailImageAllocationThenProperErrorIsReturned) { VariableBackup backupSipInitType{&MockSipData::useMockSip}; ze_image_desc_t desc = {}; @@ -841,7 +841,7 @@ HWTEST2_F(ImageCreateWithFailMemoryManagerMock, givenImageDescWhenFailImageAlloc EXPECT_EQ(imageHandle, nullptr); } -HWTEST2_F(ImageCreate, givenMediaBlockOptionWhenCopySurfaceStateThenSurfaceStateIsSet, MatchAny) { +HWTEST_F(ImageCreate, givenMediaBlockOptionWhenCopySurfaceStateThenSurfaceStateIsSet) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; ze_image_desc_t desc = {}; @@ -872,7 +872,7 @@ HWTEST2_F(ImageCreate, givenMediaBlockOptionWhenCopySurfaceStateThenSurfaceState EXPECT_EQ(surfaceState->getWidth(), (static_cast(imageHW->getImageInfo().surfaceFormat->imageElementSizeInBytes) * static_cast(imageHW->getImageInfo().imgDesc.imageWidth)) / sizeof(uint32_t)); } -HWTEST2_P(TestImageFormats, givenValidLayoutAndTypeWhenCreateImageCoreFamilyThenValidImageIsCreated, MatchAny) { +HWTEST_P(TestImageFormats, givenValidLayoutAndTypeWhenCreateImageCoreFamilyThenValidImageIsCreated) { auto params = GetParam(); ze_image_desc_t zeDesc = {}; @@ -1181,7 +1181,7 @@ TEST(ImageFormatDescHelperTest, givenSupportedSwizzlesThenProperClEnumIsReturned using ImageGetMemoryProperties = Test; -HWTEST2_F(ImageGetMemoryProperties, givenImageMemoryPropertiesExpStructureWhenGetMemroyPropertiesThenProperDataAreSet, MatchAny) { +HWTEST_F(ImageGetMemoryProperties, givenImageMemoryPropertiesExpStructureWhenGetMemroyPropertiesThenProperDataAreSet) { ze_image_desc_t zeDesc = {}; zeDesc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; zeDesc.arraylevels = 1u; @@ -1217,7 +1217,7 @@ HWTEST2_F(ImageGetMemoryProperties, givenImageMemoryPropertiesExpStructureWhenGe EXPECT_EQ(imageInfo.rowPitch, imageMemoryPropertiesExp.rowPitch); } -HWTEST2_F(ImageGetMemoryProperties, givenDebugFlagSetWhenCreatingImageThenEnableCompression, MatchAny) { +HWTEST_F(ImageGetMemoryProperties, givenDebugFlagSetWhenCreatingImageThenEnableCompression) { DebugManagerStateRestore restore; device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.ftrRenderCompressedImages = true; @@ -1295,7 +1295,7 @@ HWTEST2_F(ImageGetMemoryProperties, givenDebugFlagSetWhenCreatingImageThenEnable } } -HWTEST2_F(ImageGetMemoryProperties, givenDebugFlagSetWhenCreatingLinearImageThenDontEnableCompression, MatchAny) { +HWTEST_F(ImageGetMemoryProperties, givenDebugFlagSetWhenCreatingLinearImageThenDontEnableCompression) { DebugManagerStateRestore restore; device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.ftrRenderCompressedImages = true; @@ -1641,7 +1641,7 @@ HWTEST2_F(ImageCreate, WhenCopyingToSshThenSurfacePropertiesAreRetained, IsAtMos delete imageB; } -HWTEST2_F(ImageCreate, WhenImageViewCreateExpThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreate, WhenImageViewCreateExpThenSuccessIsReturned) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -1695,7 +1695,7 @@ HWTEST2_F(ImageCreate, WhenImageViewCreateExpThenSuccessIsReturned, MatchAny) { zeImageDestroy(planeY); } -HWTEST2_F(ImageCreate, WhenImageViewCreateExtThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreate, WhenImageViewCreateExtThenSuccessIsReturned) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; @@ -2546,7 +2546,7 @@ HWTEST2_F(ImageCreate, given2DImageFormatWithPixelSizeOf6BytesWhenRowPitchIsQuer EXPECT_EQ(rowPitch, imageHW->imgInfo.rowPitch); } -HWTEST2_F(ImageCreate, givenValidImageDescriptionFor3ChannelWhenImageCreateThenImageIsCreatedCorrectly, MatchAny) { +HWTEST_F(ImageCreate, givenValidImageDescriptionFor3ChannelWhenImageCreateThenImageIsCreatedCorrectly) { ze_image_desc_t zeDesc = {}; zeDesc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; zeDesc.arraylevels = 1u; @@ -2572,7 +2572,7 @@ HWTEST2_F(ImageCreate, givenValidImageDescriptionFor3ChannelWhenImageCreateThenI ASSERT_NE(image, nullptr); } -HWTEST2_F(ImageCreate, givenValidImageDescriptionFor3Channel16BitFloatWhenImageCreateThenImageIsCreatedCorrectly, MatchAny) { +HWTEST_F(ImageCreate, givenValidImageDescriptionFor3Channel16BitFloatWhenImageCreateThenImageIsCreatedCorrectly) { ze_image_desc_t zeDesc = {}; zeDesc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; zeDesc.arraylevels = 1u; @@ -2598,7 +2598,7 @@ HWTEST2_F(ImageCreate, givenValidImageDescriptionFor3Channel16BitFloatWhenImageC ASSERT_NE(image, nullptr); } -HWTEST2_F(ImageCreateExternalMemoryTest, givenNTHandleWhenCreatingInteropImageThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreateExternalMemoryTest, givenNTHandleWhenCreatingInteropImageThenSuccessIsReturned) { ze_external_memory_import_win32_handle_t importNTHandle = {}; importNTHandle.handle = &imageHandle; importNTHandle.flags = ZE_EXTERNAL_MEMORY_TYPE_FLAG_OPAQUE_WIN32; @@ -2617,7 +2617,7 @@ HWTEST2_F(ImageCreateExternalMemoryTest, givenNTHandleWhenCreatingInteropImageTh ASSERT_NE(image, nullptr); } -HWTEST2_F(ImageCreate, givenFDWhenCreatingImageWith3Channel8bitUintThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreate, givenFDWhenCreatingImageWith3Channel8bitUintThenSuccessIsReturned) { ze_image_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; @@ -2647,7 +2647,7 @@ HWTEST2_F(ImageCreate, givenFDWhenCreatingImageWith3Channel8bitUintThenSuccessIs ASSERT_NE(image, nullptr); } -HWTEST2_F(ImageCreateExternalMemoryTest, givenNtHandleWhenCreatingImageWith3Channel8bitUintThenNotSupportedIsReturned, MatchAny) { +HWTEST_F(ImageCreateExternalMemoryTest, givenNtHandleWhenCreatingImageWith3Channel8bitUintThenNotSupportedIsReturned) { ze_image_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; @@ -2676,7 +2676,7 @@ HWTEST2_F(ImageCreateExternalMemoryTest, givenNtHandleWhenCreatingImageWith3Chan EXPECT_EQ(image, nullptr); } -HWTEST2_F(ImageCreate, givenFDWhenCreatingImageWith3Channel16bitUintThenSuccessIsReturned, MatchAny) { +HWTEST_F(ImageCreate, givenFDWhenCreatingImageWith3Channel16bitUintThenSuccessIsReturned) { ze_image_desc_t desc = {}; desc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; @@ -2706,7 +2706,7 @@ HWTEST2_F(ImageCreate, givenFDWhenCreatingImageWith3Channel16bitUintThenSuccessI ASSERT_NE(image, nullptr); } -HWTEST2_F(ImageCreate, givenValidImageDescriptionFor3Channel32BitFloatWhenImageCreateThenUnsupportedIsReturned, MatchAny) { +HWTEST_F(ImageCreate, givenValidImageDescriptionFor3Channel32BitFloatWhenImageCreateThenUnsupportedIsReturned) { ze_image_desc_t zeDesc = {}; zeDesc.stype = ZE_STRUCTURE_TYPE_IMAGE_DESC; zeDesc.arraylevels = 1u; @@ -2732,7 +2732,7 @@ HWTEST2_F(ImageCreate, givenValidImageDescriptionFor3Channel32BitFloatWhenImageC EXPECT_EQ(image, nullptr); } -HWTEST2_F(ImageView, given3ChannelImageWhenCreateImageViewWithNtHandleIsCalledThenNotSupportedIsReturned, MatchAny) { +HWTEST_F(ImageView, given3ChannelImageWhenCreateImageViewWithNtHandleIsCalledThenNotSupportedIsReturned) { const size_t width = 32; const size_t height = 32; const size_t depth = 1; diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp index d99f7197e8..d4fade693e 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp @@ -2100,7 +2100,7 @@ TEST_F(KernelPropertiesTests, givenValidKernelWithIndirectAccessFlagsAndDisableI EXPECT_TRUE(unifiedMemoryControls.indirectSharedAllocationsAllowed); } -HWTEST2_F(KernelPropertiesTests, whenHasRTCallsIsTrueThenUsesRayTracingIsTrue, MatchAny) { +HWTEST_F(KernelPropertiesTests, whenHasRTCallsIsTrueThenUsesRayTracingIsTrue) { WhiteBoxKernelHw mockKernel; KernelDescriptor mockDescriptor = {}; mockDescriptor.kernelAttributes.flags.hasRTCalls = true; @@ -2112,7 +2112,7 @@ HWTEST2_F(KernelPropertiesTests, whenHasRTCallsIsTrueThenUsesRayTracingIsTrue, M EXPECT_TRUE(mockKernel.usesRayTracing()); } -HWTEST2_F(KernelPropertiesTests, whenHasRTCallsIsFalseThenUsesRayTracingIsFalse, MatchAny) { +HWTEST_F(KernelPropertiesTests, whenHasRTCallsIsFalseThenUsesRayTracingIsFalse) { WhiteBoxKernelHw mockKernel; KernelDescriptor mockDescriptor = {}; mockDescriptor.kernelAttributes.flags.hasRTCalls = false; @@ -2435,7 +2435,7 @@ TEST_F(KernelImpPatchBindlessTest, GivenKernelImpWhenPatchBindlessOffsetCalledTh neoDevice->decRefInternal(); } -HWTEST2_F(KernelImpPatchBindlessTest, GivenBindlessKernelAndNoGlobalBindlessAllocatorWhenInitializedThenBindlessOffsetSetAndUsingSurfaceStateAreFalse, MatchAny) { +HWTEST_F(KernelImpPatchBindlessTest, GivenBindlessKernelAndNoGlobalBindlessAllocatorWhenInitializedThenBindlessOffsetSetAndUsingSurfaceStateAreFalse) { ModuleBuildLog *moduleBuildLog = nullptr; this->module.reset(new WhiteBox<::L0::Module>{this->device, moduleBuildLog, ModuleType::user}); this->createModuleFromMockBinary(ModuleType::user); @@ -2459,7 +2459,7 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenBindlessKernelAndNoGlobalBindlessAllo EXPECT_FALSE(mockKernel.usingSurfaceStateHeap[0]); } -HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindlessThenSurfaceStateUpdated, MatchAny) { +HWTEST_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindlessThenSurfaceStateUpdated) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; ze_kernel_desc_t desc = {}; @@ -2497,7 +2497,7 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindlessT EXPECT_FALSE(mockKernel.usingSurfaceStateHeap[0]); } -HWTEST2_F(KernelImpPatchBindlessTest, GivenMisalignedBufferAddressWhenSettingSurfaceStateThenSurfaceStateInKernelHeapIsUsed, MatchAny) { +HWTEST_F(KernelImpPatchBindlessTest, GivenMisalignedBufferAddressWhenSettingSurfaceStateThenSurfaceStateInKernelHeapIsUsed) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; ze_kernel_desc_t desc = {}; @@ -2546,7 +2546,7 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenMisalignedBufferAddressWhenSettingSur EXPECT_EQ(mockKernel.surfaceStateHeapDataSize, mockKernel.getSurfaceStateHeapDataSize()); } -HWTEST2_F(KernelImpPatchBindlessTest, GivenMisalignedAndAlignedBufferAddressWhenSettingSurfaceStateThenKernelReportsNonZeroSurfaceStateHeapDataSize, MatchAny) { +HWTEST_F(KernelImpPatchBindlessTest, GivenMisalignedAndAlignedBufferAddressWhenSettingSurfaceStateThenKernelReportsNonZeroSurfaceStateHeapDataSize) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; ze_kernel_desc_t desc = {}; @@ -2596,7 +2596,7 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenMisalignedAndAlignedBufferAddressWhen EXPECT_EQ(mockKernel.surfaceStateHeapDataSize, mockKernel.getSurfaceStateHeapDataSize()); } -HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindfulThenSurfaceStateNotUpdated, MatchAny) { +HWTEST_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindfulThenSurfaceStateNotUpdated) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; ze_kernel_desc_t desc = {}; desc.pKernelName = kernelName.c_str(); @@ -2632,7 +2632,7 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindfulTh using KernelImpL3CachingTests = Test; -HWTEST2_F(KernelImpL3CachingTests, GivenKernelImpWhenSetSurfaceStateWithUnalignedMemoryThenL3CachingIsDisabled, MatchAny) { +HWTEST_F(KernelImpL3CachingTests, GivenKernelImpWhenSetSurfaceStateWithUnalignedMemoryThenL3CachingIsDisabled) { ze_kernel_desc_t desc = {}; desc.pKernelName = kernelName.c_str(); @@ -3380,7 +3380,7 @@ HWTEST2_F(SetKernelArg, givenBindlessKernelAndNoAvailableSpaceOnSshWhenSetArgRed EXPECT_EQ(nullptr, bindlessInfo.heapAllocation); } -HWTEST2_F(SetKernelArg, givenBindlessKernelAndNoAvailableSpaceOnSshWhenSetArgBufferCalledThenOutOfMemoryErrorReturned, MatchAny) { +HWTEST_F(SetKernelArg, givenBindlessKernelAndNoAvailableSpaceOnSshWhenSetArgBufferCalledThenOutOfMemoryErrorReturned) { auto mockMemManager = static_cast(neoDevice->getMemoryManager()); auto bindlessHelper = new MockBindlesHeapsHelper(neoDevice, @@ -3411,7 +3411,7 @@ HWTEST2_F(SetKernelArg, givenBindlessKernelAndNoAvailableSpaceOnSshWhenSetArgBuf svmAllocsManager->freeSVMAlloc(svmAllocation); } -HWTEST2_F(SetKernelArg, givenSlmPointerWhenSettingKernelArgThenPropertyIsSaved, MatchAny) { +HWTEST_F(SetKernelArg, givenSlmPointerWhenSettingKernelArgThenPropertyIsSaved) { ze_kernel_desc_t desc = {}; desc.pKernelName = kernelName.c_str(); WhiteBoxKernelHw mockKernel; diff --git a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp index e7b2e98289..12cc7f3b8c 100644 --- a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp @@ -350,7 +350,7 @@ struct CompressionMemoryTest : public MemoryTest { void *ptr = nullptr; }; -HWTEST2_F(CompressionMemoryTest, givenDeviceUsmWhenAllocatingThenEnableCompressionIfPossible, MatchAny) { +HWTEST_F(CompressionMemoryTest, givenDeviceUsmWhenAllocatingThenEnableCompressionIfPossible) { device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable.ftrRenderCompressedBuffers = true; auto &hwInfo = device->getHwInfo(); auto &l0GfxCoreHelper = device->getL0GfxCoreHelper(); @@ -2634,8 +2634,7 @@ TEST_F(MemoryRelaxedSizeTests, EXPECT_EQ(nullptr, ptr); } -HWTEST2_F(MemoryRelaxedSizeTests, - givenCallToDeviceAllocWithPhysicalMemSizeThenAllocationLargerThanPhysicalMemSizeFails, MatchAny) { +HWTEST_F(MemoryRelaxedSizeTests, givenCallToDeviceAllocWithPhysicalMemSizeThenAllocationLargerThanPhysicalMemSizeFails) { NEO::RAIIProductHelperFactory> raii(*device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[0]); size_t size = 1024u + 1; size_t alignment = 1u; @@ -2654,8 +2653,7 @@ HWTEST2_F(MemoryRelaxedSizeTests, EXPECT_EQ(nullptr, ptr); } -HWTEST2_F(MemoryRelaxedSizeTests, - givenCallToSharedAllocWithNoPhysicalMemSizeThenAllocationLargerThanPhysicalMemSizeFails, MatchAny) { +HWTEST_F(MemoryRelaxedSizeTests, givenCallToSharedAllocWithNoPhysicalMemSizeThenAllocationLargerThanPhysicalMemSizeFails) { NEO::RAIIProductHelperFactory> raii(*device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[0]); size_t size = 1024 + 1; size_t alignment = 1u; @@ -3517,8 +3515,7 @@ TEST_F(MemoryExportImportWinHandleTest, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(MemoryTest, - givenCallToGetImageAllocPropertiesWithNoBackingAllocationErrorIsReturned, MatchAny) { +HWTEST_F(MemoryTest, givenCallToGetImageAllocPropertiesWithNoBackingAllocationErrorIsReturned) { ze_image_allocation_ext_properties_t imageProperties = {}; imageProperties.stype = ZE_STRUCTURE_TYPE_IMAGE_ALLOCATION_EXT_PROPERTIES; @@ -3841,9 +3838,7 @@ struct MultipleDevicePeerAllocationTest : public ::testing::Test { const uint32_t numSubDevices = 2u; }; -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenCallToMPrepareIndirectAllocationForDestructionThenOnlyValidAllocationCountsAreUpdated, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenCallToMPrepareIndirectAllocationForDestructionThenOnlyValidAllocationCountsAreUpdated) { MemoryManagerOpenIpcMock *fixtureMemoryManager = static_cast(currMemoryManager); fixtureMemoryManager->failOnCreateGraphicsAllocationFromSharedHandle = true; L0::Device *device0 = driverHandle->devices[0]; @@ -3883,9 +3878,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(ret, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - whenisRemoteResourceNeededIsCalledWithDifferentCombinationsOfInputsThenExpectedOutputIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, whenisRemoteResourceNeededIsCalledWithDifferentCombinationsOfInputsThenExpectedOutputIsReturned) { MemoryManagerOpenIpcMock *fixtureMemoryManager = static_cast(currMemoryManager); fixtureMemoryManager->failOnCreateGraphicsAllocationFromSharedHandle = true; L0::Device *device0 = driverHandle->devices[0]; @@ -3933,9 +3926,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(ret, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenCallToMakeIndirectAllocationsResidentThenOnlyValidAllocationsAreMadeResident, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenCallToMakeIndirectAllocationsResidentThenOnlyValidAllocationsAreMadeResident) { MemoryManagerOpenIpcMock *fixtureMemoryManager = static_cast(currMemoryManager); fixtureMemoryManager->failOnCreateGraphicsAllocationFromSharedHandle = true; L0::Device *device0 = driverHandle->devices[0]; @@ -3980,9 +3971,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(ret, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenCallToMakeInternalAllocationsResidentThenOnlyValidAllocationsAreMadeResident, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenCallToMakeInternalAllocationsResidentThenOnlyValidAllocationsAreMadeResident) { MemoryManagerOpenIpcMock *fixtureMemoryManager = static_cast(currMemoryManager); fixtureMemoryManager->failOnCreateGraphicsAllocationFromSharedHandle = true; L0::Device *device0 = driverHandle->devices[0]; @@ -4027,18 +4016,14 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(ret, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - whenFreeingNotKnownPointerThenInvalidArgumentIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, whenFreeingNotKnownPointerThenInvalidArgumentIsReturned) { void *ptr = calloc(1, 1u); ze_result_t result = context->freeMem(ptr); EXPECT_EQ(result, ZE_RESULT_ERROR_INVALID_ARGUMENT); free(ptr); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenDeviceAllocationPassedToAppendBlitFillAndImportFdHandleFailingThenInvalidArgumentIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenDeviceAllocationPassedToAppendBlitFillAndImportFdHandleFailingThenInvalidArgumentIsReturned) { MemoryManagerOpenIpcMock *fixtureMemoryManager = static_cast(currMemoryManager); fixtureMemoryManager->failOnCreateGraphicsAllocationFromSharedHandle = true; L0::Device *device0 = driverHandle->devices[0]; @@ -4065,9 +4050,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenDeviceAllocationPassedToAppendBlitFillUsingSameDeviceThenSuccessIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenDeviceAllocationPassedToAppendBlitFillUsingSameDeviceThenSuccessIsReturned) { L0::Device *device0 = driverHandle->devices[0]; size_t size = 1024; @@ -4091,9 +4074,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenDeviceAllocationPassedToAppendBlitFillUsingDevice1ThenSuccessIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenDeviceAllocationPassedToAppendBlitFillUsingDevice1ThenSuccessIsReturned) { L0::Device *device0 = driverHandle->devices[0]; L0::Device *device1 = driverHandle->devices[1]; @@ -4118,9 +4099,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenSubDeviceAllocationPassedToAppendBlitFillUsingDevice1ThenSuccessIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenSubDeviceAllocationPassedToAppendBlitFillUsingDevice1ThenSuccessIsReturned) { DebugManagerStateRestore restorer; L0::Device *device0 = driverHandle->devices[0]; @@ -4149,9 +4128,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenDeviceAllocationPassedToAppendBlitFillUsingDevice0ThenSuccessIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenDeviceAllocationPassedToAppendBlitFillUsingDevice0ThenSuccessIsReturned) { L0::Device *device0 = driverHandle->devices[0]; L0::Device *device1 = driverHandle->devices[1]; @@ -4176,9 +4153,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenHostPointerAllocationPassedToAppendBlitFillUsingDevice0ThenInvalidArgumentIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenHostPointerAllocationPassedToAppendBlitFillUsingDevice0ThenInvalidArgumentIsReturned) { L0::Device *device0 = driverHandle->devices[0]; size_t size = 1024; @@ -4194,9 +4169,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, delete[] ptr; } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenDeviceAllocationPassedToGetAllignedAllocationAndImportFdHandleFailingThenPeerAllocNotFoundReturnsTrue, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenDeviceAllocationPassedToGetAllignedAllocationAndImportFdHandleFailingThenPeerAllocNotFoundReturnsTrue) { MemoryManagerOpenIpcMock *fixtureMemoryManager = static_cast(currMemoryManager); fixtureMemoryManager->failOnCreateGraphicsAllocationFromSharedHandle = true; L0::Device *device0 = driverHandle->devices[0]; @@ -4222,9 +4195,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenDeviceAllocationPassedToGetAllignedAllocationUsingDevice1ThenAlignedAllocationWithPeerAllocationIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenDeviceAllocationPassedToGetAllignedAllocationUsingDevice1ThenAlignedAllocationWithPeerAllocationIsReturned) { L0::Device *device0 = driverHandle->devices[0]; L0::Device *device1 = driverHandle->devices[1]; @@ -4248,9 +4219,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenSharedAllocationPassedToGetAllignedAllocationUsingDevice1ThenAlignedAllocationWithPeerAllocationIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenSharedAllocationPassedToGetAllignedAllocationUsingDevice1ThenAlignedAllocationWithPeerAllocationIsReturned) { L0::Device *device0 = driverHandle->devices[0]; L0::Device *device1 = driverHandle->devices[1]; @@ -4276,9 +4245,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenDeviceAllocationPassedToGetAllignedAllocationUsingDevice0ThenAlignedAllocationWithPeerAllocationIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenDeviceAllocationPassedToGetAllignedAllocationUsingDevice0ThenAlignedAllocationWithPeerAllocationIsReturned) { L0::Device *device0 = driverHandle->devices[0]; L0::Device *device1 = driverHandle->devices[1]; @@ -4302,9 +4269,7 @@ HWTEST2_F(MultipleDevicePeerAllocationTest, ASSERT_EQ(result, ZE_RESULT_SUCCESS); } -HWTEST2_F(MultipleDevicePeerAllocationTest, - givenSharedAllocationPassedToGetAllignedAllocationUsingDevice0ThenAlignedAllocationWithPeerAllocationIsReturned, - MatchAny) { +HWTEST_F(MultipleDevicePeerAllocationTest, givenSharedAllocationPassedToGetAllignedAllocationUsingDevice0ThenAlignedAllocationWithPeerAllocationIsReturned) { L0::Device *device0 = driverHandle->devices[0]; L0::Device *device1 = driverHandle->devices[1]; diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index ead71b96e4..d13407b331 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -5057,7 +5057,7 @@ TEST_F(ModuleKernelImmDatasTest, givenDeviceOOMWhenMemoryManagerFailsToAllocateM }; using MultiTileModuleTest = Test; -HWTEST2_F(MultiTileModuleTest, givenTwoKernelPrivateAllocsWhichExceedGlobalMemSizeOfSingleTileButNotEntireGlobalMemSizeThenPrivateMemoryShouldBeAllocatedPerDispatch, MatchAny) { +HWTEST_F(MultiTileModuleTest, givenTwoKernelPrivateAllocsWhichExceedGlobalMemSizeOfSingleTileButNotEntireGlobalMemSizeThenPrivateMemoryShouldBeAllocatedPerDispatch) { auto devInfo = device->getNEODevice()->getDeviceInfo(); auto kernelsNb = 2u; uint32_t margin128KB = 131072u; diff --git a/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp b/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp index 5b568589b5..7bb2132de7 100644 --- a/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp +++ b/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp @@ -65,7 +65,7 @@ HWTEST_F(ExternalSemaphoreTest, DISABLED_givenExternalSemaphoreControllerStartCa EXPECT_NE(driverHandle->externalSemaphoreController, nullptr); } -HWTEST2_F(ExternalSemaphoreTest, givenRegularCommandListWhenAppendWaitExternalSemaphoresIsCalledThenInvalidArgumentIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenRegularCommandListWhenAppendWaitExternalSemaphoresIsCalledThenInvalidArgumentIsReturned) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -75,7 +75,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenRegularCommandListWhenAppendWaitExternalSe EXPECT_EQ(result, ZE_RESULT_ERROR_INVALID_ARGUMENT); } -HWTEST2_F(ExternalSemaphoreTest, givenRegularCommandListWhenAppendSignalExternalSemaphoresIsCalledThenInvalidArgumentIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenRegularCommandListWhenAppendSignalExternalSemaphoresIsCalledThenInvalidArgumentIsReturned) { MockCommandListCoreFamily cmdList; cmdList.initialize(device, NEO::EngineGroupType::renderCompute, 0u); @@ -122,7 +122,7 @@ struct MockCommandListImmediateExtSem : public WhiteBox<::L0::CommandListCoreFam using MockDriverHandleImp = Mock; -HWTEST2_F(ExternalSemaphoreTest, givenImmediateCommandListWhenAppendSignalExternalSemaphoresExpIsCalledThenSuccessIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenImmediateCommandListWhenAppendSignalExternalSemaphoresExpIsCalledThenSuccessIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -152,7 +152,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenImmediateCommandListWhenAppendSignalExtern EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 1u); } -HWTEST2_F(ExternalSemaphoreTest, givenAppendWaitOnEventFailsWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenAppendWaitOnEventFailsWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -184,7 +184,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenAppendWaitOnEventFailsWhenAppendSignalExte EXPECT_EQ(cmdList.appendWaitOnEventsCalledTimes, 1u); } -HWTEST2_F(ExternalSemaphoreTest, givenAppendSignalInternalProxyEventFailsWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenAppendSignalInternalProxyEventFailsWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -215,7 +215,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenAppendSignalInternalProxyEventFailsWhenApp EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 1u); } -HWTEST2_F(ExternalSemaphoreTest, givenAppendSignalEventFailsWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenAppendSignalEventFailsWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -249,7 +249,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenAppendSignalEventFailsWhenAppendSignalExte EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 2u); } -HWTEST2_F(ExternalSemaphoreTest, givenFailingMemoryManagerWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenFailingMemoryManagerWhenAppendSignalExternalSemaphoresExpIsCalledThenErrorIsReturned) { DebugManagerStateRestore restorer; auto externalSemaphore = std::make_unique(); @@ -281,7 +281,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenFailingMemoryManagerWhenAppendSignalExtern EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 0u); } -HWTEST2_F(ExternalSemaphoreTest, givenImmediateCommandListWhenAppendWaitExternalSemaphoresExpIsCalledThenSuccessIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenImmediateCommandListWhenAppendWaitExternalSemaphoresExpIsCalledThenSuccessIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -310,7 +310,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenImmediateCommandListWhenAppendWaitExternal EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 0u); } -HWTEST2_F(ExternalSemaphoreTest, givenAppendWaitOnEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenAppendWaitOnEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -340,7 +340,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenAppendWaitOnEventFailsWhenAppendWaitExtern EXPECT_EQ(cmdList.appendWaitOnEventsCalledTimes, 1u); } -HWTEST2_F(ExternalSemaphoreTest, givenAppendWaitOnInternalProxyEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenAppendWaitOnInternalProxyEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -370,7 +370,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenAppendWaitOnInternalProxyEventFailsWhenApp EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 0u); } -HWTEST2_F(ExternalSemaphoreTest, givenAppendSignalEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenAppendSignalEventFailsWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned) { auto externalSemaphore = std::make_unique(); auto mockMemoryManager = std::make_unique(); auto l0Device = std::make_unique(neoDevice, neoDevice->getExecutionEnvironment()); @@ -403,7 +403,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenAppendSignalEventFailsWhenAppendWaitExtern EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 1u); } -HWTEST2_F(ExternalSemaphoreTest, givenFailingMemoryManagerWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenFailingMemoryManagerWhenAppendWaitExternalSemaphoresExpIsCalledThenErrorIsReturned) { DebugManagerStateRestore restorer; auto externalSemaphore = std::make_unique(); @@ -435,7 +435,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenFailingMemoryManagerWhenAppendWaitExternal EXPECT_EQ(cmdList.appendSignalEventCalledTimes, 0u); } -HWTEST2_F(ExternalSemaphoreTest, givenExternalSemaphoreControllerWhenAllocateProxyEventMultipleIsCalledMultipleTimesThenSuccessIsReturned, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenExternalSemaphoreControllerWhenAllocateProxyEventMultipleIsCalledMultipleTimesThenSuccessIsReturned) { auto externalSemaphore1 = std::make_unique(); auto externalSemaphore2 = std::make_unique(); @@ -461,7 +461,7 @@ HWTEST2_F(ExternalSemaphoreTest, givenExternalSemaphoreControllerWhenAllocatePro EXPECT_EQ(driverHandleImp->externalSemaphoreController->proxyEvents.size(), 2u); } -HWTEST2_F(ExternalSemaphoreTest, givenMaxEventsInPoolCreatedWhenAllocateProxyEventCalledThenEventPoolSizeIncreases, MatchAny) { +HWTEST_F(ExternalSemaphoreTest, givenMaxEventsInPoolCreatedWhenAllocateProxyEventCalledThenEventPoolSizeIncreases) { auto externalSemaphore1 = std::make_unique(); auto externalSemaphore2 = std::make_unique(); diff --git a/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp b/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp index e8d6a53207..e83b02119f 100644 --- a/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp +++ b/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp @@ -24,8 +24,8 @@ namespace L0 { namespace ult { -HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyThenAppendProfilingCalledOnceBeforeAndAfterCommand_MatchAny, IGFX_XE3_CORE); -HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyRegionBlitThenTimeStampRegistersAreAdded_MatchAny, IGFX_XE3_CORE); +HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyThenAppendProfilingCalledOnceBeforeAndAfterCommand, IGFX_XE3_CORE); +HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToMemoryCopyRegionBlitThenTimeStampRegistersAreAdded, IGFX_XE3_CORE); using CommandListAppendLaunchKernelXe3 = Test; HWTEST2_F(CommandListAppendLaunchKernelXe3, givenVariousKernelsWhenUpdateStreamPropertiesIsCalledThenRequiredStateFinalStateAndCommandsToPatchAreCorrectlySet, IsXe3Core) { diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/test_debug_api_linux.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/test_debug_api_linux.cpp index 80d36274bb..88ce6b891c 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/test_debug_api_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/prelim/test_debug_api_linux.cpp @@ -5585,7 +5585,7 @@ TEST_F(DebugApiLinuxTest, GivenStoppedThreadResumeCausingPageFaultAndFEBitSetWhe EXPECT_EQ(0u, sessionMock->apiEvents.size()); } -HWTEST2_F(DebugApiLinuxTest, GivenNoAttentionBitsWhenMultipleThreadsPassedToCheckStoppedThreadsAndGenerateEventsThenThreadsStateNotCheckedAndEventsNotGenerated, MatchAny) { +HWTEST_F(DebugApiLinuxTest, GivenNoAttentionBitsWhenMultipleThreadsPassedToCheckStoppedThreadsAndGenerateEventsThenThreadsStateNotCheckedAndEventsNotGenerated) { MockL0GfxCoreHelperSupportsThreadControlStopped mockL0GfxCoreHelper; std::unique_ptr l0GfxCoreHelperBackup(static_cast(&mockL0GfxCoreHelper)); device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[0]->apiGfxCoreHelper.swap(l0GfxCoreHelperBackup); @@ -5696,7 +5696,7 @@ TEST_F(DebugApiLinuxTest, GivenNoAttentionBitsWhenSingleThreadPassedToCheckStopp EXPECT_EQ(0u, sessionMock->apiEvents.size()); } -HWTEST2_F(DebugApiLinuxTest, GivenErrorFromSynchronousAttScanWhenMultipleThreadsPassedToCheckStoppedThreadsAndGenerateEventsThenThreadsStateNotChecked, MatchAny) { +HWTEST_F(DebugApiLinuxTest, GivenErrorFromSynchronousAttScanWhenMultipleThreadsPassedToCheckStoppedThreadsAndGenerateEventsThenThreadsStateNotChecked) { MockL0GfxCoreHelperSupportsThreadControlStopped mockL0GfxCoreHelper; std::unique_ptr l0GfxCoreHelperBackup(static_cast(&mockL0GfxCoreHelper)); device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[0]->apiGfxCoreHelper.swap(l0GfxCoreHelperBackup); diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp index ebd0b07819..5b2a8492d7 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/xe/test_debug_api_linux_xe.cpp @@ -2229,7 +2229,7 @@ TEST_F(DebugApiLinuxTestXe, WhenCallingThreadControlForResumeThenProperIoctlsIsC EXPECT_EQ(nullptr, bitmaskOut.get()); } -HWTEST2_F(DebugApiLinuxTestXe, GivenNoAttentionBitsWhenMultipleThreadsPassedToCheckStoppedThreadsAndGenerateEventsThenThreadsStateNotCheckedAndEventsNotGenerated, MatchAny) { +HWTEST_F(DebugApiLinuxTestXe, GivenNoAttentionBitsWhenMultipleThreadsPassedToCheckStoppedThreadsAndGenerateEventsThenThreadsStateNotCheckedAndEventsNotGenerated) { MockL0GfxCoreHelperSupportsThreadControlStopped mockL0GfxCoreHelper; std::unique_ptr l0GfxCoreHelperBackup(static_cast(&mockL0GfxCoreHelper)); device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[0]->apiGfxCoreHelper.swap(l0GfxCoreHelperBackup);