Fix test failures

Author: uditagarwal97

sycl/source/detail/kernel_program_cache.hpp

@@ -360,29 +360,29 @@ class KernelProgramCache {
   template <typename KeyT, typename ValT>
   void saveKernel(KeyT &&CacheKey, ValT &&CacheVal) {
 
-    ur_program_handle_t Program = std::get<3>(CacheVal);
-    // Save kernel in fast cache only if the corresponding program is also
-    // in the cache.
-    {
-      auto LockedCache = acquireCachedPrograms();
-      auto &ProgCache = LockedCache.get();
-      if (ProgCache.ProgramSizeMap.find(Program) ==
-          ProgCache.ProgramSizeMap.end())
-        return;
+    if (SYCLConfig<SYCL_IN_MEM_CACHE_EVICTION_THRESHOLD>::
+            isProgramCacheEvictionEnabled()) {
+
+      ur_program_handle_t Program = std::get<3>(CacheVal);
+      // Save kernel in fast cache only if the corresponding program is also
+      // in the cache.
+      {
+        auto LockedCache = acquireCachedPrograms();
+        auto &ProgCache = LockedCache.get();
+        if (ProgCache.ProgramSizeMap.find(Program) ==
+            ProgCache.ProgramSizeMap.end())
+          return;
+      }
+
+      // Save reference between the program and the fast cache key.
+      MProgramToKernelFastCacheKeyMap[Program].emplace_back(CacheKey);
     }
 
     std::unique_lock<std::mutex> Lock(MKernelFastCacheMutex);
     // if no insertion took place, thus some other thread has already inserted
     // smth in the cache
     traceKernel("Kernel inserted.", std::get<3>(CacheKey), true);
     MKernelFastCache.emplace(CacheKey, CacheVal);
-
-    if (SYCLConfig<
-            SYCL_IN_MEM_CACHE_EVICTION_THRESHOLD>::getProgramCacheSize()) {
-
-      // Save reference between the program and the fast cache key.
-      MProgramToKernelFastCacheKeyMap[Program].emplace_back(CacheKey);
-    }
   }
 
   // Evict programs from cache to free up space.

sycl/source/detail/program_manager/program_manager.cpp

@@ -39,7 +39,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
-#include <functional>
 #include <memory>
 #include <mutex>
 #include <sstream>