Move MKernelCacheConfig to KernelData

Author: vinser52

sycl/source/detail/handler_impl.hpp

@@ -104,8 +104,6 @@ class handler_impl {
   // If the pipe operation is read or write, 1 for read 0 for write.
   bool HostPipeRead = true;
 
-  ur_kernel_cache_config_t MKernelCacheConfig = UR_KERNEL_CACHE_CONFIG_DEFAULT;
-
   // Extra information for bindless image copy
   ur_image_desc_t MSrcImageDesc = {};
   ur_image_desc_t MDstImageDesc = {};

sycl/source/detail/kernel_data.hpp

@@ -115,6 +115,14 @@ class KernelData {
 
   bool usesAssert() const { return MDeviceKernelInfoPtr->usesAssert(); }
 
+  ur_kernel_cache_config_t getKernelCacheConfig() const {
+    return MKernelCacheConfig;
+  }
+
+  void setKernelCacheConfig(ur_kernel_cache_config_t Config) {
+    MKernelCacheConfig = Config;
+  }
+
   bool isCooperative() const { return MKernelIsCooperative; }
 
   void setCooperative(bool IsCooperative) {
@@ -152,6 +160,8 @@ class KernelData {
   /// The list of arguments for the kernel.
   std::vector<detail::ArgDesc> MArgs;
 
+  ur_kernel_cache_config_t MKernelCacheConfig = UR_KERNEL_CACHE_CONFIG_DEFAULT;
+
   bool MKernelIsCooperative = false;
   bool MKernelUsesClusterLaunch = false;
   uint32_t MKernelWorkGroupMemorySize = 0;

sycl/source/handler.cpp

@@ -663,7 +663,8 @@ event handler::finalize() {
                          impl->MKernelData.getArgs(), KernelBundleImpPtr,
                          MKernel.get(), toKernelNameStrT(MKernelName),
                          *impl->MKernelData.getDeviceKernelInfoPtr(), RawEvents,
-                         ResultEvent.get(), nullptr, impl->MKernelCacheConfig,
+                         ResultEvent.get(), nullptr,
+                         impl->MKernelData.getKernelCacheConfig(),
                          impl->MKernelData.isCooperative(),
                          impl->MKernelData.usesClusterLaunch(),
                          impl->MKernelData.getKernelWorkGroupMemorySize(),
@@ -731,7 +732,8 @@ event handler::finalize() {
         toKernelNameStrT(MKernelName),
         *impl->MKernelData.getDeviceKernelInfoPtr(), std::move(MStreamStorage),
         std::move(impl->MAuxiliaryResources), getType(),
-        impl->MKernelCacheConfig, impl->MKernelData.isCooperative(),
+        impl->MKernelData.getKernelCacheConfig(),
+        impl->MKernelData.isCooperative(),
         impl->MKernelData.usesClusterLaunch(),
         impl->MKernelData.getKernelWorkGroupMemorySize(), MCodeLoc));
     break;
@@ -2011,13 +2013,13 @@ detail::context_impl &handler::getContextImpl() const {
 void handler::setKernelCacheConfig(handler::StableKernelCacheConfig Config) {
   switch (Config) {
   case handler::StableKernelCacheConfig::Default:
-    impl->MKernelCacheConfig = UR_KERNEL_CACHE_CONFIG_DEFAULT;
+    impl->MKernelData.setKernelCacheConfig(UR_KERNEL_CACHE_CONFIG_DEFAULT);
     break;
   case handler::StableKernelCacheConfig::LargeSLM:
-    impl->MKernelCacheConfig = UR_KERNEL_CACHE_CONFIG_LARGE_SLM;
+    impl->MKernelData.setKernelCacheConfig(UR_KERNEL_CACHE_CONFIG_LARGE_SLM);
     break;
   case handler::StableKernelCacheConfig::LargeData:
-    impl->MKernelCacheConfig = UR_KERNEL_CACHE_CONFIG_LARGE_DATA;
+    impl->MKernelData.setKernelCacheConfig(UR_KERNEL_CACHE_CONFIG_LARGE_DATA);
     break;
   }
 }