@@ -340,9 +340,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
340340 if (crossEngineCacheFlushRequired) {
341341 EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
342342 EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
343- } else if (device->getProductHelper ().useAdditionalBlitProperties ()) {
344- EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
345- EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
346343 } else {
347344 EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
348345 EXPECT_NE (nullptr , cmdList->cmdQImmediateCopyOffload );
@@ -370,9 +367,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
370367 if (crossEngineCacheFlushRequired) {
371368 EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
372369 EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
373- } else if (device->getProductHelper ().useAdditionalBlitProperties ()) {
374- EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
375- EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
376370 } else {
377371 EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
378372 EXPECT_NE (nullptr , cmdList->cmdQImmediateCopyOffload );
@@ -423,11 +417,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
423417
424418 EXPECT_EQ (ZE_RESULT_SUCCESS, zeCommandListCreateImmediate (context, device, &cmdQueueDesc, &cmdListHandle));
425419 auto cmdList = static_cast <WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle (cmdListHandle));
426- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
427- EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
428- } else {
429- EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
430- }
420+ EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
431421 EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
432422
433423 zeCommandListDestroy (cmdListHandle);
@@ -457,9 +447,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWhenCreatingCmdListThenEn
457447 if (crossEngineCacheFlushRequired) {
458448 EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
459449 EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
460- } else if (device->getProductHelper ().useAdditionalBlitProperties ()) {
461- EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
462- EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
463450 } else {
464451 EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
465452 EXPECT_NE (nullptr , cmdList->cmdQImmediateCopyOffload );
@@ -473,11 +460,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWhenCreatingCmdListThenEn
473460
474461 EXPECT_EQ (ZE_RESULT_SUCCESS, zeCommandListCreateImmediate (context, device, &cmdQueueDesc, &cmdListHandle));
475462 auto cmdList = static_cast <WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle (cmdListHandle));
476- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
477- EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
478- } else {
479- EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
480- }
463+ EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
481464 EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
482465
483466 zeCommandListDestroy (cmdListHandle);
@@ -503,9 +486,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWithCopyOffloadFlagWhenCr
503486 if (crossEngineCacheFlushRequired) {
504487 EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
505488 EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
506- } else if (device->getProductHelper ().useAdditionalBlitProperties ()) {
507- EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
508- EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
509489 } else {
510490 EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
511491 EXPECT_NE (nullptr , cmdList->cmdQImmediateCopyOffload );
@@ -519,11 +499,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWithCopyOffloadFlagWhenCr
519499
520500 EXPECT_EQ (ZE_RESULT_SUCCESS, zeCommandListCreateImmediate (context, device, &cmdQueueDesc, &cmdListHandle));
521501 auto cmdList = static_cast <WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle (cmdListHandle));
522- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
523- EXPECT_NE (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
524- } else {
525- EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
526- }
502+ EXPECT_EQ (CopyOffloadModes::disabled, cmdList->copyOffloadMode );
527503 EXPECT_EQ (nullptr , cmdList->cmdQImmediateCopyOffload );
528504
529505 zeCommandListDestroy (cmdListHandle);
@@ -589,12 +565,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
589565 auto mainQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (false ));
590566 auto copyQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (true ));
591567
592- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
593- ASSERT_EQ (mainQueueCsr, copyQueueCsr);
594- } else {
595- ASSERT_NE (mainQueueCsr, copyQueueCsr);
596- }
597-
598568 auto cmdStream = immCmdList->getCmdContainer ().getCommandStream ();
599569
600570 auto initialMainTaskCount = mainQueueCsr->taskCount .load ();
@@ -613,9 +583,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
613583 auto copyItor = find<XY_COPY_BLT *>(cmdList.begin (), cmdList.end ());
614584 EXPECT_NE (cmdList.end (), copyItor);
615585
616- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
617- EXPECT_EQ (initialMainTaskCount, mainQueueCsr->taskCount );
618- }
586+ EXPECT_EQ (initialMainTaskCount, mainQueueCsr->taskCount );
619587 EXPECT_EQ (initialCopyTaskCount + 1 , copyQueueCsr->taskCount );
620588 }
621589
@@ -633,9 +601,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
633601 auto copyItor = find<XY_COPY_BLT *>(cmdList.begin (), cmdList.end ());
634602 ASSERT_NE (cmdList.end (), copyItor);
635603
636- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
637- EXPECT_EQ (initialMainTaskCount, mainQueueCsr->taskCount );
638- }
604+ EXPECT_EQ (initialMainTaskCount, mainQueueCsr->taskCount );
639605 EXPECT_EQ (initialCopyTaskCount + 2 , copyQueueCsr->taskCount );
640606 }
641607
@@ -653,9 +619,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
653619 auto fillItor = findBltFillCmd<FamilyType>(cmdList.begin (), cmdList.end ());
654620 EXPECT_NE (cmdList.end (), fillItor);
655621
656- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
657- EXPECT_EQ (initialMainTaskCount, mainQueueCsr->taskCount );
658- }
622+ EXPECT_EQ (initialMainTaskCount, mainQueueCsr->taskCount );
659623 EXPECT_EQ (initialCopyTaskCount + 3 , copyQueueCsr->taskCount );
660624 }
661625
@@ -703,9 +667,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
703667 auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin (), cmdList.end ());
704668 EXPECT_NE (cmdList.end (), itor);
705669
706- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
707- EXPECT_EQ (initialMainTaskCount + 1 , mainQueueCsr->taskCount );
708- }
670+ EXPECT_EQ (initialMainTaskCount + 1 , mainQueueCsr->taskCount );
709671 EXPECT_EQ (initialCopyTaskCount + 4 , copyQueueCsr->taskCount );
710672 }
711673
@@ -722,9 +684,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
722684 auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin (), cmdList.end ());
723685 EXPECT_NE (cmdList.end (), itor);
724686
725- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
726- EXPECT_EQ (initialMainTaskCount + 1 , mainQueueCsr->taskCount );
727- }
687+ EXPECT_EQ (initialMainTaskCount + 1 , mainQueueCsr->taskCount );
728688 EXPECT_EQ (initialCopyTaskCount + 5 , copyQueueCsr->taskCount );
729689 }
730690
@@ -741,9 +701,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
741701 auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin (), cmdList.end ());
742702 EXPECT_NE (cmdList.end (), itor);
743703
744- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
745- EXPECT_EQ (initialMainTaskCount + 1 , mainQueueCsr->taskCount );
746- }
704+ EXPECT_EQ (initialMainTaskCount + 1 , mainQueueCsr->taskCount );
747705 EXPECT_EQ (initialCopyTaskCount + 6 , copyQueueCsr->taskCount );
748706 }
749707 context->freeMem (data);
@@ -895,12 +853,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
895853 auto mainQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (false ));
896854 auto copyQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (true ));
897855
898- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
899- ASSERT_EQ (mainQueueCsr, copyQueueCsr);
900- } else {
901- ASSERT_NE (mainQueueCsr, copyQueueCsr);
902- }
903-
904856 auto initialMainTaskCount = mainQueueCsr->taskCount .load ();
905857 auto initialCopyTaskCount = copyQueueCsr->taskCount .load ();
906858
@@ -918,9 +870,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
918870 EXPECT_EQ (cmdList.end (), copyItor);
919871
920872 EXPECT_EQ (initialMainTaskCount + 1 , mainQueueCsr->taskCount );
921- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
922- EXPECT_EQ (initialCopyTaskCount, copyQueueCsr->taskCount );
923- }
873+ EXPECT_EQ (initialCopyTaskCount, copyQueueCsr->taskCount );
924874 }
925875
926876 {
@@ -938,9 +888,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
938888 EXPECT_EQ (cmdList.end (), copyItor);
939889
940890 EXPECT_EQ (initialMainTaskCount + 2 , mainQueueCsr->taskCount );
941- if (!device->getProductHelper ().useAdditionalBlitProperties ()) {
942- EXPECT_EQ (initialCopyTaskCount, copyQueueCsr->taskCount );
943- }
891+ EXPECT_EQ (initialCopyTaskCount, copyQueueCsr->taskCount );
944892 }
945893
946894 context->freeMem (deviceMem);
@@ -951,9 +899,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenProfilingEventWhenAppendingThenUseBcsCom
951899 using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM;
952900 using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
953901
954- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
955- GTEST_SKIP ();
956- }
957902 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
958903
959904 auto eventPool = createEvents<FamilyType>(1 , true );
@@ -1004,16 +949,11 @@ HWTEST2_F(CopyOffloadInOrderTests, givenProfilingEventWithRelaxedOrderingWhenApp
1004949 using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
1005950 debugManager.flags .DirectSubmissionRelaxedOrdering .set (1 );
1006951
1007- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1008- GTEST_SKIP ();
1009- }
1010952 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
1011953
1012954 auto mainQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (false ));
1013955 auto copyQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (true ));
1014956
1015- EXPECT_NE (mainQueueCsr, copyQueueCsr);
1016-
1017957 auto mainQueueDirectSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(*mainQueueCsr);
1018958 auto offloadDirectSubmission = new MockDirectSubmissionHw<FamilyType, BlitterDispatcher<FamilyType>>(*copyQueueCsr);
1019959
@@ -1094,10 +1034,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
10941034
10951035 constexpr uint32_t partitionCount = 4 ;
10961036
1097- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1098- GTEST_SKIP ();
1099- }
1100-
11011037 debugManager.flags .InOrderDuplicatedCounterStorageEnabled .set (0 );
11021038
11031039 auto gmmHelper = device->getNEODevice ()->getGmmHelper ();
@@ -1106,6 +1042,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
11061042 debugManager.flags .InOrderAtomicSignallingEnabled .set (1 );
11071043
11081044 auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
1045+ immCmdList->useAdditionalBlitProperties = false ;
11091046
11101047 auto cmdStream = immCmdList->getCmdContainer ().getCommandStream ();
11111048
@@ -1135,6 +1072,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
11351072 debugManager.flags .InOrderAtomicSignallingEnabled .set (0 );
11361073
11371074 auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
1075+ immCmdList->useAdditionalBlitProperties = false ;
11381076
11391077 auto cmdStream = immCmdList->getCmdContainer ().getCommandStream ();
11401078
@@ -1164,6 +1102,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
11641102 debugManager.flags .InOrderDuplicatedCounterStorageEnabled .set (1 );
11651103
11661104 auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
1105+ immCmdList->useAdditionalBlitProperties = false ;
11671106
11681107 auto cmdStream = immCmdList->getCmdContainer ().getCommandStream ();
11691108
@@ -1240,10 +1179,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDeviceToHostCopyWhenProgrammingThenAddFe
12401179}
12411180
12421181HWTEST2_F (CopyOffloadInOrderTests, whenDispatchingSelectCorrectQueueAndCsr, IsAtLeastXeHpcCore) {
1243- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1244- GTEST_SKIP ();
1245- }
1246-
12471182 auto regularEventsPool = createEvents<FamilyType>(1 , false );
12481183
12491184 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
@@ -1329,9 +1264,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
13291264 bool latestRelaxedOrderingMode = false ;
13301265 };
13311266
1332- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1333- GTEST_SKIP ();
1334- }
13351267 debugManager.flags .DirectSubmissionRelaxedOrdering .set (1 );
13361268 debugManager.flags .DirectSubmissionRelaxedOrderingCounterHeuristic .set (0 );
13371269
@@ -1340,8 +1272,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
13401272 auto mainQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (false ));
13411273 auto copyQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (true ));
13421274
1343- EXPECT_NE (mainQueueCsr, copyQueueCsr);
1344-
13451275 auto mainQueueDirectSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(*mainQueueCsr);
13461276 auto offloadDirectSubmission = new MockDirectSubmissionHw<FamilyType, BlitterDispatcher<FamilyType>>(*copyQueueCsr);
13471277
@@ -1383,9 +1313,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
13831313}
13841314
13851315HWTEST2_F (CopyOffloadInOrderTests, givenInOrderModeWhenCallingSyncThenHandleCompletionOnCorrectCsr, IsAtLeastXeCore) {
1386- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1387- GTEST_SKIP ();
1388- }
13891316 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
13901317
13911318 if (!immCmdList->isHeaplessModeEnabled ()) {
@@ -1466,9 +1393,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenInOrderModeWhenCallingSyncThenHandleComp
14661393}
14671394
14681395HWTEST2_F (CopyOffloadInOrderTests, givenTbxModeWhenSyncCalledAlwaysDownloadAllocationsFromBothCsrs, IsAtLeastXeCore) {
1469- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1470- GTEST_SKIP ();
1471- }
14721396 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
14731397 immCmdList->isTbxMode = true ;
14741398
@@ -1510,9 +1434,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenTbxModeWhenSyncCalledAlwaysDownloadAlloc
15101434}
15111435
15121436HWTEST2_F (CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHandleCompletionOnCorrectCsr, IsAtLeastXeCore) {
1513- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1514- GTEST_SKIP ();
1515- }
15161437 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
15171438
15181439 auto mainQueueCsr = static_cast <UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr (false ));
@@ -1554,9 +1475,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHan
15541475}
15551476
15561477HWTEST2_F (CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHandleCompletionAndTempAllocations, IsAtLeastXeCore) {
1557- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1558- GTEST_SKIP ();
1559- }
15601478 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
15611479
15621480 auto memoryManager = static_cast <MockMemoryManager *>(device->getNEODevice ()->getMemoryManager ());
@@ -1670,11 +1588,8 @@ HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHan
16701588
16711589HWTEST2_F (CopyOffloadInOrderTests, givenInterruptEventWhenDispatchingTheProgramUserInterrupt, IsAtLeastXeHpcCore) {
16721590 using MI_USER_INTERRUPT = typename FamilyType::MI_USER_INTERRUPT;
1673-
1674- if (device->getProductHelper ().useAdditionalBlitProperties ()) {
1675- GTEST_SKIP ();
1676- }
16771591 auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
1592+ immCmdList->useAdditionalBlitProperties = false ;
16781593 auto eventPool = createEvents<FamilyType>(1 , false );
16791594 events[0 ]->enableInterruptMode ();
16801595
0 commit comments