From c46227d72ccc83631e562890b1f493b60cf5a111 Mon Sep 17 00:00:00 2001 From: Young Jin Yoon Date: Mon, 19 May 2025 19:56:53 +0000 Subject: [PATCH] test: fix in-order ULTs for additional blit properties Modified some of ULTs for in-order command list and copy offload tests to make them work when useAdditionalBlitProperties is set to true Related-To: NEO-13003 Signed-off-by: Young Jin Yoon --- .../test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp | 1 + .../sources/cmdlist/test_in_order_cmdlist_1.cpp | 4 ++++ .../sources/cmdlist/test_in_order_cmdlist_2.cpp | 8 ++++++++ 3 files changed, 13 insertions(+) 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 2346255d2d..99ff64dcac 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 @@ -292,6 +292,7 @@ HWTEST_F(AppendMemoryCopyTests, givenCopyCommandListWhenTimestampPassedToImageCo using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; auto commandList = std::make_unique>>(); commandList->initialize(device, NEO::EngineGroupType::copy, 0u); + commandList->useAdditionalBlitProperties = false; ze_event_pool_desc_t eventPoolDesc = {}; eventPoolDesc.count = 1; eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp index 47ca86286e..c770f3feb7 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_1.cpp @@ -3937,6 +3937,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, InOrderCmdListTests, givenCopyOnlyInOrderModeWhenPr using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; auto immCmdList = createCopyOnlyImmCmdList(); + immCmdList->useAdditionalBlitProperties = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -4066,6 +4067,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, InOrderCmdListTests, givenCopyOnlyInOrderModeWhenPr using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; auto immCmdList = createCopyOnlyImmCmdList(); + immCmdList->useAdditionalBlitProperties = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -4281,6 +4283,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, InOrderCmdListTests, givenCopyOnlyInOrderModeWhenPr using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; auto immCmdList = createCopyOnlyImmCmdList(); + immCmdList->useAdditionalBlitProperties = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -4319,6 +4322,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, InOrderCmdListTests, givenCopyOnlyInOrderModeWhenPr using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM; auto immCmdList = createCopyOnlyImmCmdList(); + immCmdList->useAdditionalBlitProperties = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); 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 bb8dd5f2f1..f8905736b5 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 @@ -820,6 +820,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh debugManager.flags.InOrderAtomicSignallingEnabled.set(1); auto immCmdList = createMultiTileImmCmdListWithOffload(partitionCount); + immCmdList->useAdditionalBlitProperties = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -849,6 +850,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh debugManager.flags.InOrderAtomicSignallingEnabled.set(0); auto immCmdList = createMultiTileImmCmdListWithOffload(partitionCount); + immCmdList->useAdditionalBlitProperties = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -878,6 +880,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh debugManager.flags.InOrderDuplicatedCounterStorageEnabled.set(1); auto immCmdList = createMultiTileImmCmdListWithOffload(partitionCount); + immCmdList->useAdditionalBlitProperties = false; auto cmdStream = immCmdList->getCmdContainer().getCommandStream(); @@ -1362,6 +1365,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenInterruptEventWhenDispatchingTheProgramU using MI_USER_INTERRUPT = typename FamilyType::MI_USER_INTERRUPT; auto immCmdList = createImmCmdListWithOffload(); + immCmdList->useAdditionalBlitProperties = false; auto eventPool = createEvents(1, false); events[0]->enableInterruptMode(); @@ -1400,6 +1404,7 @@ HWTEST2_F(InOrderRegularCmdListTests, whenUsingRegularCmdListThenAddCmdsToPatch, auto mockCmdQHw = makeZeUniquePtr>(device, device->getNEODevice()->getDefaultEngine().commandStreamReceiver, &desc); mockCmdQHw->initialize(true, false, false); auto regularCmdList = createRegularCmdList(true); + regularCmdList->useAdditionalBlitProperties = false; auto cmdStream = regularCmdList->getCmdContainer().getCommandStream(); @@ -1880,6 +1885,8 @@ HWTEST2_F(InOrderRegularCmdListTests, givenInOrderModeWhenDispatchingRegularCmdL auto regularCmdList = createRegularCmdList(false); auto regularCopyOnlyCmdList = createRegularCmdList(true); + regularCmdList->useAdditionalBlitProperties = false; + regularCopyOnlyCmdList->useAdditionalBlitProperties = false; auto cmdStream = regularCmdList->getCmdContainer().getCommandStream(); auto copyOnlyCmdStream = regularCopyOnlyCmdList->getCmdContainer().getCommandStream(); @@ -1936,6 +1943,7 @@ HWTEST2_F(InOrderRegularCopyOnlyCmdListTests, givenInOrderModeWhenDispatchingReg using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; auto regularCmdList = createRegularCmdList(true); + regularCmdList->useAdditionalBlitProperties = false; auto cmdStream = regularCmdList->getCmdContainer().getCommandStream();