From eae4596a9c65edb943596060bb443ea30e2b2ad5 Mon Sep 17 00:00:00 2001
From: Rafal Maziejuk <rafal.maziejuk@intel.com>
Date: Wed, 22 Sep 2021 11:57:47 +0000
Subject: [PATCH] Add isAdditionalCapabilityCoherencyFlagSettingRequired ULT
 helper function

Signed-off-by: Rafal Maziejuk <rafal.maziejuk@intel.com>
---
 opencl/test/unit_test/gen12lp/CMakeLists.txt           |  2 +-
 .../test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl |  2 +-
 .../unit_test/gen12lp/special_ult_helper_gen12lp.cpp   | 10 ++++------
 .../unit_test/gen12lp/special_ult_helper_gen12lp.h     |  8 +++-----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/opencl/test/unit_test/gen12lp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/CMakeLists.txt
index a44645561d..4c374c59c2 100644
--- a/opencl/test/unit_test/gen12lp/CMakeLists.txt
+++ b/opencl/test/unit_test/gen12lp/CMakeLists.txt
@@ -29,7 +29,7 @@ if(TESTS_GEN12LP)
       ${CMAKE_CURRENT_SOURCE_DIR}/profiling_tests_gen12lp.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen12lp.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_source_tests_gen12lp.inl
-      ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}special_ult_helper_gen12lp.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.h
       ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_tests_gen12lp.inl
       ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen12lp.inl
diff --git a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl
index 5de45eca6f..79782de6fc 100644
--- a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl
@@ -50,7 +50,7 @@ GEN12LPTEST_F(HwHelperTestGen12Lp, givenGen12LpSkuWhenGettingCapabilityCoherency
         return;
     }
 
-    if (hardwareInfo.platform.eProductFamily == IGFX_TIGERLAKE_LP) {
+    if (SpecialUltHelperGen12lp::isAdditionalCapabilityCoherencyFlagSettingRequired(hardwareInfo.platform.eProductFamily)) {
         hardwareInfo.platform.usRevId = hwInfoConfig.getHwRevIdFromStepping(REVISION_A1, hardwareInfo);
         helper.setCapabilityCoherencyFlag(&hardwareInfo, coherency);
         EXPECT_TRUE(coherency);
diff --git a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp
index 0ebd30596b..e89f5572f2 100644
--- a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp
+++ b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp
@@ -7,8 +7,6 @@
 
 #include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
 
-#include "shared/source/helpers/hw_info.h"
-
 #include "test.h"
 
 namespace NEO {
@@ -21,12 +19,12 @@ bool SpecialUltHelperGen12lp::additionalCoherencyCheck(PRODUCT_FAMILY productFam
     return false;
 }
 
-bool SpecialUltHelperGen12lp::shouldPerformimagePitchAlignment(PRODUCT_FAMILY productFamily) {
-    return productFamily == PRODUCT_FAMILY::IGFX_TIGERLAKE_LP || productFamily == PRODUCT_FAMILY::IGFX_DG1;
+bool SpecialUltHelperGen12lp::isAdditionalCapabilityCoherencyFlagSettingRequired(PRODUCT_FAMILY productFamily) {
+    return productFamily == IGFX_TIGERLAKE_LP;
 }
 
-bool SpecialUltHelperGen12lp::shouldTestDefaultImplementationOfSetupHardwareCapabilities(PRODUCT_FAMILY productFamily) {
-    return false;
+bool SpecialUltHelperGen12lp::shouldPerformimagePitchAlignment(PRODUCT_FAMILY productFamily) {
+    return productFamily == IGFX_TIGERLAKE_LP || productFamily == IGFX_DG1;
 }
 
 bool SpecialUltHelperGen12lp::isPipeControlWArequired(PRODUCT_FAMILY productFamily) {
diff --git a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h
index a007c2a796..9c62ce6244 100644
--- a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h
+++ b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,15 +9,13 @@
 
 #include "igfxfmid.h"
 
-#include <cstddef>
-
 namespace NEO {
-struct HardwareInfo;
 
 struct SpecialUltHelperGen12lp {
     static bool additionalCoherencyCheck(PRODUCT_FAMILY productFamily, bool coherency);
+    static bool isAdditionalCapabilityCoherencyFlagSettingRequired(PRODUCT_FAMILY productFamily);
     static bool shouldPerformimagePitchAlignment(PRODUCT_FAMILY productFamily);
-    static bool shouldTestDefaultImplementationOfSetupHardwareCapabilities(PRODUCT_FAMILY productFamily);
     static bool isPipeControlWArequired(PRODUCT_FAMILY productFamily);
 };
+
 } // namespace NEO