[SYCL] Fix review comments

Signed-off-by: Sergey Kanaev <[email protected]>

Author: Sergey Kanaev

sycl/include/CL/sycl/detail/kernel_program_cache.hpp

@@ -35,25 +35,25 @@ class KernelProgramCache {
   /// State of the entity is provided by the user of cache instance.
   /// Currently there is only a single user - ProgramManager class.
   template<typename T>
-  struct EntityWithState {
+  struct EntityWithBuildResult {
     std::atomic<T *> Ptr;
     std::atomic<int> State;
     std::unique_ptr<BuildResultT> BuildResult;
 
-    EntityWithState(T* P, int S)
+    EntityWithBuildResult(T* P, int S)
       : Ptr{P}, State{S}
     {}
   };
 
   using PiProgramT = std::remove_pointer<RT::PiProgram>::type;
   using PiProgramPtrT = std::atomic<PiProgramT *>;
-  using ProgramWithBuildStateT = EntityWithState<PiProgramT>;
+  using ProgramWithBuildStateT = EntityWithBuildResult<PiProgramT>;
   using ProgramCacheT = std::map<OSModuleHandle, ProgramWithBuildStateT>;
   using ContextPtr = context_impl *;
 
   using PiKernelT = std::remove_pointer<RT::PiKernel>::type;
   using PiKernelPtrT = std::atomic<PiKernelT *>;
-  using KernelWithBuildStateT = EntityWithState<PiKernelT>;
+  using KernelWithBuildStateT = EntityWithBuildResult<PiKernelT>;
   using KernelByNameT = std::map<string_class, KernelWithBuildStateT>;
   using KernelCacheT = std::map<RT::PiProgram, KernelByNameT>;
 

sycl/source/detail/program_manager/program_manager.cpp

@@ -110,9 +110,9 @@ DeviceImage &ProgramManager::getDeviceImage(OSModuleHandle M,
 }
 
 template <typename ExceptionT, typename RetT>
-RetT *
-waitUntilBuilt(KernelProgramCache &Cache,
-               KernelProgramCache::EntityWithState<RetT> *WithBuildState) {
+RetT *waitUntilBuilt(
+    KernelProgramCache &Cache,
+    KernelProgramCache::EntityWithBuildResult<RetT> *WithBuildState) {
   // any thread which will find nullptr in cache will wait until the pointer
   // is not null anymore
   Cache.waitUntilBuilt([WithBuildState]() {
@@ -129,8 +129,7 @@ waitUntilBuilt(KernelProgramCache &Cache,
 
   RetT *Result = WithBuildState->Ptr.load();
 
-  if (!Result)
-    throw ExceptionT("Build of the program/kernel did not succeed previously.");
+  assert(Result && "An exception should have been thrown");
 
   return Result;
 }
@@ -157,7 +156,7 @@ template <typename RetT, typename ExceptionT, typename KeyT, typename AcquireFT,
 RetT *getOrBuild(KernelProgramCache &KPCache, const KeyT &CacheKey,
                  AcquireFT &&Acquire, GetCacheFT &&GetCache, BuildFT &&Build) {
   bool InsertionTookPlace;
-  KernelProgramCache::EntityWithState<RetT> *WithState;
+  KernelProgramCache::EntityWithBuildResult<RetT> *WithState;
 
   {
     auto LockedCache = Acquire(KPCache);