From 292970a5d3d522ef89ede798f93a0266a8eb35b3 Mon Sep 17 00:00:00 2001
From: Kamil Kopryk <kamil.kopryk@intel.com>
Date: Fri, 22 Aug 2025 15:29:18 +0000
Subject: [PATCH] test: temporarily skip ults

Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
---
 .../cmdlist/test_in_order_cmdlist_1.cpp        |  7 ++++++-
 .../tests/mutable_cmdlist_tests.cpp            | 18 ++++++++++++++++++
 ...drm_command_stream_xehp_and_later_tests.cpp |  7 +++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

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 258e29f258..c15a50876e 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
@@ -4401,7 +4401,12 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, InOrderCmdListTests, givenInOrderModeWhenProgrammin
         EXPECT_EQ(0u, postSync.getImmediateData());
     }
 
-    EXPECT_EQ(0u, postSync.getDestinationAddress());
+    auto l3FlushAfterPostSyncRequired = this->neoDevice->getProductHelper().isL3FlushAfterPostSyncRequired(true);
+    if (l3FlushAfterPostSyncRequired) {
+        EXPECT_NE(0u, postSync.getDestinationAddress());
+    } else {
+        EXPECT_EQ(0u, postSync.getDestinationAddress());
+    }
 
     context->freeMem(data);
 }
diff --git a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/tests/mutable_cmdlist_tests.cpp b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/tests/mutable_cmdlist_tests.cpp
index ac15a51ef3..ef009711ba 100644
--- a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/tests/mutable_cmdlist_tests.cpp
+++ b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/tests/mutable_cmdlist_tests.cpp
@@ -1095,6 +1095,11 @@ HWCMDTEST_F(IGFX_XE_HP_CORE,
             givenMutableCommandListOnDcFlushPlatformAndSignalEventWithSignalScopeSelectedWhenAppendingWithSignalEventThenMutationIsPerformedOnDcFlushCommand) {
     using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
 
+    auto &productHelper = this->neoDevice->getProductHelper();
+    if (productHelper.isL3FlushAfterPostSyncRequired(true)) {
+        GTEST_SKIP();
+    }
+
     auto mockBaseCmdList = static_cast<L0::ult::MockCommandList *>(this->mutableCommandList.get()->base);
     mockBaseCmdList->dcFlushSupport = true;
 
@@ -1140,6 +1145,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE,
             givenMutableCommandListOnDcFlushPlatformAndSignalEventWithTimestampSignalScopeSelectedWhenAppendingWithSignalEventThenMutationIsPerformedOnRegisterCommand) {
     using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
 
+    auto &productHelper = this->neoDevice->getProductHelper();
+    if (productHelper.isL3FlushAfterPostSyncRequired(true)) {
+        GTEST_SKIP();
+    }
     auto mockBaseCmdList = static_cast<L0::ult::MockCommandList *>(this->mutableCommandList.get()->base);
     mockBaseCmdList->dcFlushSupport = true;
 
@@ -1997,6 +2006,10 @@ HWCMDTEST_F(IGFX_XE_HP_CORE,
     using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
     using MI_STORE_DATA_IMM = typename FamilyType::MI_STORE_DATA_IMM;
     using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT;
+    auto &productHelper = this->neoDevice->getProductHelper();
+    if (productHelper.isL3FlushAfterPostSyncRequired(true)) {
+        GTEST_SKIP();
+    }
 
     auto mockBaseCmdListHw = static_cast<WhiteBox<::L0::CommandListCoreFamily<FamilyType::gfxCoreFamily>> *>(this->mutableCommandList.get()->base);
     mockBaseCmdListHw->dcFlushSupport = true;
@@ -2082,6 +2095,11 @@ HWCMDTEST_F(IGFX_XE_HP_CORE,
     using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT;
     using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
 
+    auto &productHelper = this->neoDevice->getProductHelper();
+    if (productHelper.isL3FlushAfterPostSyncRequired(true)) {
+        GTEST_SKIP();
+    }
+
     auto mockBaseCmdListHw = static_cast<WhiteBox<::L0::CommandListCoreFamily<FamilyType::gfxCoreFamily>> *>(this->mutableCommandList.get()->base);
     mockBaseCmdListHw->dcFlushSupport = true;
 
diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
index 79574bae10..b6b1a46caf 100644
--- a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
@@ -14,6 +14,7 @@
 #include "shared/source/os_interface/linux/drm_memory_operations_handler.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/source/os_interface/product_helper.h"
 #include "shared/test/common/helpers/batch_buffer_helper.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
@@ -104,6 +105,12 @@ struct DrmCommandStreamMultiTileMemExecTestWithCsr : public DrmCommandStreamMult
 };
 
 HWCMDTEST_TEMPLATED_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTestWithCsr, GivenDrmSupportsCompletionFenceAndVmBindWhenCallingCsrExecThenMultipleTagAllocationIsPassed) {
+
+    auto &productHelper = device->getProductHelper();
+    if (productHelper.isL3FlushAfterPostSyncRequired(true)) {
+        GTEST_SKIP();
+    }
+
     auto testCsr = static_cast<TestedDrmCommandStreamReceiver<FamilyType> *>(&device->getGpgpuCommandStreamReceiver());
     EXPECT_EQ(2u, testCsr->activePartitions);