From 285414e8523717d2db0fe60cc90cd5ae27b5fa72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Zwoli=C5=84ski?= <fabian.zwolinski@intel.com>
Date: Mon, 20 Jan 2025 15:39:41 +0000
Subject: [PATCH] fix: cl_cache - add cm header includes to whitelist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch adds following includes to the whitelist:
<cm/cm.h>
<cm/cmtl.h>

Related-To: NEO-13641
Signed-off-by: Fabian Zwoliński <fabian.zwolinski@intel.com>
---
 shared/source/compiler_interface/compiler_interface.cpp       | 4 +++-
 shared/source/compiler_interface/compiler_interface.h         | 2 +-
 .../unit_test/compiler_interface/compiler_cache_tests.cpp     | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/shared/source/compiler_interface/compiler_interface.cpp b/shared/source/compiler_interface/compiler_interface.cpp
index 1f5551c6f4..700bf43b1f 100644
--- a/shared/source/compiler_interface/compiler_interface.cpp
+++ b/shared/source/compiler_interface/compiler_interface.cpp
@@ -764,6 +764,8 @@ bool CompilerCacheHelper::validateIncludes(const ArrayRef<const char> source, co
     return true;
 }
 
-CompilerCacheHelper::WhitelistedIncludesVec CompilerCacheHelper::whitelistedIncludes{};
+CompilerCacheHelper::WhitelistedIncludesVec CompilerCacheHelper::whitelistedIncludes{
+    "#include <cm/cm.h>",
+    "#include <cm/cmtl.h>"};
 
 } // namespace NEO
\ No newline at end of file
diff --git a/shared/source/compiler_interface/compiler_interface.h b/shared/source/compiler_interface/compiler_interface.h
index 4c198e8e1b..8bbac331f3 100644
--- a/shared/source/compiler_interface/compiler_interface.h
+++ b/shared/source/compiler_interface/compiler_interface.h
@@ -257,7 +257,7 @@ class CompilerCacheHelper {
   protected:
     static bool processPackedCacheBinary(ArrayRef<const uint8_t> archive, TranslationOutput &output, const NEO::Device &device);
 
-    using WhitelistedIncludesVec = StackVec<std::string_view, 1>;
+    using WhitelistedIncludesVec = StackVec<std::string_view, 2>;
     static bool validateIncludes(const ArrayRef<const char> source, const WhitelistedIncludesVec &whitelistedIncludes);
     static WhitelistedIncludesVec whitelistedIncludes;
 };
diff --git a/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp
index f0807a365a..8620be6bc0 100644
--- a/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp
+++ b/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp
@@ -860,7 +860,9 @@ TEST_F(CompilerCacheHelperWhitelistedTest, GivenWhitelistedIncludesWhenCheckingF
 }
 
 TEST_F(CompilerCacheHelperWhitelistedTest, GivenWhitelistedIncludesWhenCheckingContentsThenExpectCorrectEntries) {
-    std::vector<std::string_view> expectedEntries;
+    std::vector<std::string_view> expectedEntries{
+        "#include <cm/cm.h>",
+        "#include <cm/cmtl.h>"};
 
     for (const auto &expectedEntry : expectedEntries) {
         auto it = std::find(whitelistedIncludes.begin(), whitelistedIncludes.end(), expectedEntry);