[SYCL] Fix program class always getting a built OpenCL program from program manager

Signed-off-by: Semenov, Sergey <[email protected]>
Signed-off-by: Vladimir Lazarev <[email protected]>

Author: sergey-semenov

sycl/include/CL/sycl/detail/program_impl.hpp

@@ -274,7 +274,7 @@ class program_impl {
 private:
   void create_cl_program_with_il() {
     assert(!ClProgram && "This program already has an encapsulated cl_program");
-    ClProgram = ProgramManager::getInstance().getBuiltOpenCLProgram(Context);
+    ClProgram = ProgramManager::getInstance().createOpenCLProgram(Context);
   }
 
   void create_cl_program_with_source(const string_class &Source) {

sycl/include/CL/sycl/detail/program_manager/program_manager.hpp

@@ -51,6 +51,7 @@ namespace detail {
 class ProgramManager {
 public:
   static ProgramManager &getInstance();
+  cl_program createOpenCLProgram(const context &Context);
   cl_program getBuiltOpenCLProgram(const context &Context);
   cl_kernel getOrCreateKernel(const context &Context, const char *KernelName);
   cl_program getClProgramFromClKernel(cl_kernel ClKernel);

sycl/source/detail/program_manager/program_manager.cpp

@@ -112,16 +112,21 @@ static cl_program createProgram(const platform &Platform,
   return Program;
 }
 
+cl_program ProgramManager::createOpenCLProgram(const context &Context) {
+  vector_class<char> DeviceProg = getSpirvSource();
+  cl_context ClContext = Context.get();
+  const platform &Platform = Context.get_platform();
+  cl_program ClProgram = createProgram(Platform, ClContext, DeviceProg);
+  clReleaseContext(ClContext);
+  return ClProgram;
+}
+
 cl_program ProgramManager::getBuiltOpenCLProgram(const context &Context) {
   cl_program &ClProgram = m_CachedSpirvPrograms[Context];
   if (!ClProgram) {
     vector_class<char> DeviceProg = getSpirvSource();
 
-    cl_context ClContext = Context.get();
-    const platform &Platform = Context.get_platform();
-    ClProgram = createProgram(Platform, ClContext, DeviceProg);
-    clReleaseContext(ClContext);
-
+    ClProgram = createOpenCLProgram(Context);
     build(ClProgram);
   }
   return ClProgram;