[NFC][SYCL] Minor refactoring in source/detail/kernel_program_cache.hpp (#19555)

* Inline type aliases that don't bring much value
* Init `MParentContext` in ctor, change to be a reference

Author: aelovikov-intel

sycl/source/detail/context_impl.cpp

@@ -35,7 +35,8 @@ context_impl::context_impl(const std::vector<sycl::device> Devices,
     : MOwnedByRuntime(true), MAsyncHandler(std::move(AsyncHandler)),
       MDevices(std::move(Devices)), MContext(nullptr),
       MPlatform(detail::getSyclObjImpl(MDevices[0].get_platform())),
-      MPropList(PropList), MSupportBufferLocationByDevices(NotChecked) {
+      MPropList(PropList), MKernelProgramCache(*this),
+      MSupportBufferLocationByDevices(NotChecked) {
   verifyProps(PropList);
   std::vector<ur_device_handle_t> DeviceIds;
   for (const auto &D : MDevices) {
@@ -56,8 +57,6 @@ context_impl::context_impl(const std::vector<sycl::device> Devices,
 
   getAdapter().call<UrApiKind::urContextCreate>(
       DeviceIds.size(), DeviceIds.data(), nullptr, &MContext);
-
-  MKernelProgramCache.setContextPtr(this);
 }
 
 context_impl::context_impl(ur_context_handle_t UrContext,
@@ -66,7 +65,7 @@ context_impl::context_impl(ur_context_handle_t UrContext,
                            bool OwnedByRuntime, private_tag)
     : MOwnedByRuntime(OwnedByRuntime), MAsyncHandler(std::move(AsyncHandler)),
       MDevices(DeviceList), MContext(UrContext), MPlatform(),
-      MSupportBufferLocationByDevices(NotChecked) {
+      MKernelProgramCache(*this), MSupportBufferLocationByDevices(NotChecked) {
   if (!MDevices.empty()) {
     MPlatform = detail::getSyclObjImpl(MDevices[0].get_platform());
   } else {
@@ -104,7 +103,6 @@ context_impl::context_impl(ur_context_handle_t UrContext,
   if (getBackend() == sycl::backend::opencl) {
     getAdapter().call<UrApiKind::urContextRetain>(MContext);
   }
-  MKernelProgramCache.setContextPtr(this);
 }
 
 cl_context context_impl::get() const {
@@ -501,7 +499,7 @@ std::optional<ur_program_handle_t> context_impl::getProgramForDevImgs(
     const device &Device, const std::set<std::uintptr_t> &ImgIdentifiers,
     const std::string &ObjectTypeName) {
 
-  KernelProgramCache::ProgramBuildResultPtr BuildRes = nullptr;
+  std::shared_ptr<KernelProgramCache::ProgramBuildResult> BuildRes = nullptr;
   {
     auto LockedCache = MKernelProgramCache.acquireCachedPrograms();
     auto &KeyMap = LockedCache.get().KeyMap;

sycl/source/detail/kernel_program_cache.cpp

@@ -13,11 +13,11 @@ namespace sycl {
 inline namespace _V1 {
 namespace detail {
 adapter_impl &KernelProgramCache::getAdapter() {
-  return MParentContext->getAdapter();
+  return MParentContext.getAdapter();
 }
 
 ur_context_handle_t KernelProgramCache::getURContext() const {
-  return MParentContext->getHandleRef();
+  return MParentContext.getHandleRef();
 }
 
 } // namespace detail

sycl/source/detail/kernel_program_cache.hpp

@@ -134,7 +134,6 @@ class KernelProgramCache {
 #pragma warning(pop)
 #endif
   };
-  using ProgramBuildResultPtr = std::shared_ptr<ProgramBuildResult>;
 
   /* Drop LinkOptions and CompileOptions from CacheKey since they are only used
    * when debugging environment variables are set and we can just ignore them
@@ -179,7 +178,8 @@ class KernelProgramCache {
   };
 
   struct ProgramCache {
-    emhash8::HashMap<ProgramCacheKeyT, ProgramBuildResultPtr> Cache;
+    emhash8::HashMap<ProgramCacheKeyT, std::shared_ptr<ProgramBuildResult>>
+        Cache;
     UnorderedMultimap<CommonProgramKeyT, ProgramCacheKeyT> KeyMap;
     // Mapping between a UR program and its size.
     std::unordered_map<ur_program_handle_t, size_t> ProgramSizeMap;
@@ -193,11 +193,9 @@ class KernelProgramCache {
     size_t size() const noexcept { return Cache.size(); }
   };
 
-  using ContextPtr = context_impl *;
-
-  using KernelArgMaskPairT =
-      std::pair<ur_kernel_handle_t, const KernelArgMask *>;
-  struct KernelBuildResult : public BuildResult<KernelArgMaskPairT> {
+  struct KernelBuildResult
+      : public BuildResult<
+            std::pair<ur_kernel_handle_t, const KernelArgMask *>> {
     const adapter_impl &MAdapter;
     KernelBuildResult(const adapter_impl &Adapter) : MAdapter(Adapter) {
       Val.first = nullptr;
@@ -214,10 +212,10 @@ class KernelProgramCache {
       }
     }
   };
-  using KernelBuildResultPtr = std::shared_ptr<KernelBuildResult>;
 
-  using KernelByNameT = emhash8::HashMap<KernelNameStrT, KernelBuildResultPtr>;
-  using KernelCacheT = emhash8::HashMap<ur_program_handle_t, KernelByNameT>;
+  using KernelCacheT = emhash8::HashMap<
+      ur_program_handle_t,
+      emhash8::HashMap<KernelNameStrT, std::shared_ptr<KernelBuildResult>>>;
 
   class FastKernelSubcacheWrapper {
   public:
@@ -339,8 +337,7 @@ class KernelProgramCache {
   };
 
   ~KernelProgramCache() = default;
-
-  void setContextPtr(const ContextPtr &AContext) { MParentContext = AContext; }
+  KernelProgramCache(context_impl &Ctx) : MParentContext(Ctx) {}
 
   // Sends message to std:cerr stream when SYCL_CACHE_TRACE environemnt is
   // set.
@@ -404,7 +401,7 @@ class KernelProgramCache {
     return {MEvictionList, MProgramEvictionListMutex};
   }
 
-  std::pair<ProgramBuildResultPtr, bool>
+  std::pair<std::shared_ptr<ProgramBuildResult>, bool>
   getOrInsertProgram(const ProgramCacheKeyT &CacheKey) {
     auto LockedCache = acquireCachedPrograms();
     auto &ProgCache = LockedCache.get();
@@ -444,7 +441,7 @@ class KernelProgramCache {
     return DidInsert;
   }
 
-  std::pair<KernelBuildResultPtr, bool>
+  std::pair<std::shared_ptr<KernelBuildResult>, bool>
   getOrInsertKernel(ur_program_handle_t Program, KernelNameStrRefT KernelName) {
     auto LockedCache = acquireKernelsPerProgramCache();
     auto &Cache = LockedCache.get()[Program];
@@ -850,7 +847,7 @@ class KernelProgramCache {
 
   ProgramCache MCachedPrograms;
   KernelCacheT MKernelsPerProgramCache;
-  ContextPtr MParentContext;
+  context_impl &MParentContext;
 
   using FastKernelCacheMutexT = SpinLock;
   using FastKernelCacheReadLockT = std::lock_guard<FastKernelCacheMutexT>;

sycl/source/detail/program_manager/program_manager.cpp

@@ -1104,8 +1104,6 @@ FastKernelCacheValPtr ProgramManager::getOrCreateKernel(
               << ", " << &DeviceImpl << ", " << KernelName << ")\n";
   }
 
-  using KernelArgMaskPairT = KernelProgramCache::KernelArgMaskPairT;
-
   KernelProgramCache &Cache = ContextImpl.getKernelProgramCache();
   ur_device_handle_t UrDevice = DeviceImpl.getHandleRef();
   FastKernelSubcacheT *CacheHintPtr =
@@ -1160,7 +1158,8 @@ FastKernelCacheValPtr ProgramManager::getOrCreateKernel(
   auto BuildResult = Cache.getOrBuild<errc::invalid>(GetCachedBuildF, BuildF);
   // getOrBuild is not supposed to return nullptr
   assert(BuildResult != nullptr && "Invalid build result");
-  const KernelArgMaskPairT &KernelArgMaskPair = BuildResult->Val;
+  const std::pair<ur_kernel_handle_t, const KernelArgMask *>
+      &KernelArgMaskPair = BuildResult->Val;
   auto ret_val = std::make_shared<FastKernelCacheVal>(
       KernelArgMaskPair.first, &(BuildResult->MBuildResultMutex),
       KernelArgMaskPair.second, Program, ContextImpl.getAdapter());