Revert "test: remove some offload test cases temporarily"

This reverts commit c88556e691. Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
2025-12-31 12:11:31 +08:00 · 2025-11-02 15:53:43 +01:00
parent d6c77ff77b
commit 8736c784fb
2 changed files with 99 additions and 17 deletions
--- 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
@@ -1646,7 +1646,6 @@ HWTEST2_F(MultiTileAggregatedBcsSplitTests, givenMuliTileBcsSplitWhenOffloadEnab
    };
    std::unique_ptr<L0::CommandList> commandList1(CommandList::createImmediate(productFamily, device, &desc, false, NEO::EngineGroupType::compute, returnValue));
    auto mockCmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(commandList1.get());
-    mockCmdList->useAdditionalBlitProperties = false;

    if (!mockCmdList->isBcsSplitNeeded) {
        GTEST_SKIP();
--- 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
@@ -340,6 +340,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
        if (crossEngineCacheFlushRequired) {
            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
+        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
        } else {
            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -367,6 +370,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
        if (crossEngineCacheFlushRequired) {
            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
+        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
        } else {
            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -417,7 +423,11 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl

        EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
        auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
-        EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        if (device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        } else {
+            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        }
        EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);

        zeCommandListDestroy(cmdListHandle);
@@ -444,10 +454,12 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWhenCreatingCmdListThenEn
    {
        EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
        auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
-
        if (crossEngineCacheFlushRequired) {
            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
+        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
        } else {
            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -461,7 +473,11 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWhenCreatingCmdListThenEn

        EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
        auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
-        EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        if (device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        } else {
+            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        }
        EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);

        zeCommandListDestroy(cmdListHandle);
@@ -487,6 +503,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWithCopyOffloadFlagWhenCr
        if (crossEngineCacheFlushRequired) {
            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
+        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
        } else {
            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
            EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -500,7 +519,11 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWithCopyOffloadFlagWhenCr

        EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
        auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
-        EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        if (device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        } else {
+            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
+        }
        EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);

        zeCommandListDestroy(cmdListHandle);
@@ -566,6 +589,12 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
    auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
    auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));

+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        ASSERT_EQ(mainQueueCsr, copyQueueCsr);
+    } else {
+        ASSERT_NE(mainQueueCsr, copyQueueCsr);
+    }
+
    auto cmdStream = immCmdList->getCmdContainer().getCommandStream();

    auto initialMainTaskCount = mainQueueCsr->taskCount.load();
@@ -584,7 +613,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
        auto copyItor = find<XY_COPY_BLT *>(cmdList.begin(), cmdList.end());
        EXPECT_NE(cmdList.end(), copyItor);

-        EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
+        }
        EXPECT_EQ(initialCopyTaskCount + 1, copyQueueCsr->taskCount);
    }

@@ -602,7 +633,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
        auto copyItor = find<XY_COPY_BLT *>(cmdList.begin(), cmdList.end());
        ASSERT_NE(cmdList.end(), copyItor);

-        EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
+        }
        EXPECT_EQ(initialCopyTaskCount + 2, copyQueueCsr->taskCount);
    }

@@ -620,7 +653,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
        auto fillItor = findBltFillCmd<FamilyType>(cmdList.begin(), cmdList.end());
        EXPECT_NE(cmdList.end(), fillItor);

-        EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
+        }
        EXPECT_EQ(initialCopyTaskCount + 3, copyQueueCsr->taskCount);
    }

@@ -668,7 +703,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
        auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin(), cmdList.end());
        EXPECT_NE(cmdList.end(), itor);

-        EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
+        }
        EXPECT_EQ(initialCopyTaskCount + 4, copyQueueCsr->taskCount);
    }

@@ -685,7 +722,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
        auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin(), cmdList.end());
        EXPECT_NE(cmdList.end(), itor);

-        EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
+        }
        EXPECT_EQ(initialCopyTaskCount + 5, copyQueueCsr->taskCount);
    }

@@ -702,7 +741,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
        auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin(), cmdList.end());
        EXPECT_NE(cmdList.end(), itor);

-        EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
+        }
        EXPECT_EQ(initialCopyTaskCount + 6, copyQueueCsr->taskCount);
    }
    context->freeMem(data);
@@ -854,6 +895,12 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
    auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
    auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));

+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        ASSERT_EQ(mainQueueCsr, copyQueueCsr);
+    } else {
+        ASSERT_NE(mainQueueCsr, copyQueueCsr);
+    }
+
    auto initialMainTaskCount = mainQueueCsr->taskCount.load();
    auto initialCopyTaskCount = copyQueueCsr->taskCount.load();

@@ -871,7 +918,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
        EXPECT_EQ(cmdList.end(), copyItor);

        EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
-        EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
+        }
    }

    {
@@ -889,7 +938,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
        EXPECT_EQ(cmdList.end(), copyItor);

        EXPECT_EQ(initialMainTaskCount + 2, mainQueueCsr->taskCount);
-        EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
+        if (!device->getProductHelper().useAdditionalBlitProperties()) {
+            EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
+        }
    }

    context->freeMem(deviceMem);
@@ -900,6 +951,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenProfilingEventWhenAppendingThenUseBcsCom
    using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM;
    using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;

+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();

    auto eventPool = createEvents<FamilyType>(1, true);
@@ -950,11 +1004,16 @@ HWTEST2_F(CopyOffloadInOrderTests, givenProfilingEventWithRelaxedOrderingWhenApp
    using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
    debugManager.flags.DirectSubmissionRelaxedOrdering.set(1);

+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();

    auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
    auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));

+    EXPECT_NE(mainQueueCsr, copyQueueCsr);
+
    auto mainQueueDirectSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(*mainQueueCsr);
    auto offloadDirectSubmission = new MockDirectSubmissionHw<FamilyType, BlitterDispatcher<FamilyType>>(*copyQueueCsr);

@@ -1035,6 +1094,10 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh

    constexpr uint32_t partitionCount = 4;

+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
+
    debugManager.flags.InOrderDuplicatedCounterStorageEnabled.set(0);

    auto gmmHelper = device->getNEODevice()->getGmmHelper();
@@ -1043,7 +1106,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
        debugManager.flags.InOrderAtomicSignallingEnabled.set(1);

        auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
-        immCmdList->useAdditionalBlitProperties = false;

        auto cmdStream = immCmdList->getCmdContainer().getCommandStream();

@@ -1073,7 +1135,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
        debugManager.flags.InOrderAtomicSignallingEnabled.set(0);

        auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
-        immCmdList->useAdditionalBlitProperties = false;

        auto cmdStream = immCmdList->getCmdContainer().getCommandStream();

@@ -1103,7 +1164,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
        debugManager.flags.InOrderDuplicatedCounterStorageEnabled.set(1);

        auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
-        immCmdList->useAdditionalBlitProperties = false;

        auto cmdStream = immCmdList->getCmdContainer().getCommandStream();

@@ -1180,6 +1240,10 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDeviceToHostCopyWhenProgrammingThenAddFe
 }

 HWTEST2_F(CopyOffloadInOrderTests, whenDispatchingSelectCorrectQueueAndCsr, IsAtLeastXeHpcCore) {
+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
+
    auto regularEventsPool = createEvents<FamilyType>(1, false);

    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
@@ -1265,6 +1329,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
        bool latestRelaxedOrderingMode = false;
    };

+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    debugManager.flags.DirectSubmissionRelaxedOrdering.set(1);
    debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0);

@@ -1273,6 +1340,8 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
    auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
    auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));

+    EXPECT_NE(mainQueueCsr, copyQueueCsr);
+
    auto mainQueueDirectSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(*mainQueueCsr);
    auto offloadDirectSubmission = new MockDirectSubmissionHw<FamilyType, BlitterDispatcher<FamilyType>>(*copyQueueCsr);

@@ -1314,6 +1383,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
 }

 HWTEST2_F(CopyOffloadInOrderTests, givenInOrderModeWhenCallingSyncThenHandleCompletionOnCorrectCsr, IsAtLeastXeCore) {
+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();

    if (!immCmdList->isHeaplessModeEnabled()) {
@@ -1394,6 +1466,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenInOrderModeWhenCallingSyncThenHandleComp
 }

 HWTEST2_F(CopyOffloadInOrderTests, givenTbxModeWhenSyncCalledAlwaysDownloadAllocationsFromBothCsrs, IsAtLeastXeCore) {
+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
    immCmdList->isTbxMode = true;

@@ -1435,6 +1510,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenTbxModeWhenSyncCalledAlwaysDownloadAlloc
 }

 HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHandleCompletionOnCorrectCsr, IsAtLeastXeCore) {
+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();

    auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
@@ -1476,6 +1554,9 @@ HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHan
 }

 HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHandleCompletionAndTempAllocations, IsAtLeastXeCore) {
+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();

    auto memoryManager = static_cast<MockMemoryManager *>(device->getNEODevice()->getMemoryManager());
@@ -1590,8 +1671,10 @@ HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHan
 HWTEST2_F(CopyOffloadInOrderTests, givenInterruptEventWhenDispatchingTheProgramUserInterrupt, IsAtLeastXeHpcCore) {
    using MI_USER_INTERRUPT = typename FamilyType::MI_USER_INTERRUPT;

+    if (device->getProductHelper().useAdditionalBlitProperties()) {
+        GTEST_SKIP();
+    }
    auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
-    immCmdList->useAdditionalBlitProperties = false;
    auto eventPool = createEvents<FamilyType>(1, false);
    events[0]->enableInterruptMode();