[SYCL] Return images from universal kernel set for kernel bundle too (#10812)

KseniyaTikhomirova · web-flow · commit 70f911b8e2de · 2023-08-14T10:52:30.000-07:00
Signed-off-by: Tikhomirova, Kseniya &lt;kseniya.tikhomirova@intel.com&gt;
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
@@ -1061,7 +1061,7 @@ ProgramManager::getDeviceImage(const std::string &KernelName,
     return *Img;
   }
 
-  if (m_UniversalKernelSet.size())
+  if (!m_UniversalKernelSet.empty())
     return getDeviceImage(m_UniversalKernelSet, Context, Device,
                           JITCompilationIsRequired);
   else
@@ -1780,6 +1780,9 @@ ProgramManager::getSYCLDeviceImagesWithCompatibleState(
     for (auto &ImageUPtr : m_BinImg2KernelIDs) {
       BinImages.insert(ImageUPtr.first);
     }
+    for (auto &ImageUPtr : m_UniversalKernelSet) {
+      BinImages.insert(ImageUPtr);
+    }
   }
 
   assert(BinImages.size() > 0 && "Expected to find at least one device image");

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ ProgramManager::getDeviceImage(const std::string &KernelName,`
`1061`	`1061`	`return *Img;`
`1062`	`1062`	`}`
`1063`	`1063`
`1064`		`- if (m_UniversalKernelSet.size())`
	`1064`	`+ if (!m_UniversalKernelSet.empty())`
`1065`	`1065`	`return getDeviceImage(m_UniversalKernelSet, Context, Device,`
`1066`	`1066`	`JITCompilationIsRequired);`
`1067`	`1067`	`else`
`@@ -1780,6 +1780,9 @@ ProgramManager::getSYCLDeviceImagesWithCompatibleState(`
`1780`	`1780`	`for (auto &ImageUPtr : m_BinImg2KernelIDs) {`
`1781`	`1781`	`BinImages.insert(ImageUPtr.first);`
`1782`	`1782`	`}`
	`1783`	`+ for (auto &ImageUPtr : m_UniversalKernelSet) {`
	`1784`	`+ BinImages.insert(ImageUPtr);`
	`1785`	`+ }`
`1783`	`1786`	`}`
`1784`	`1787`
`1785`	`1788`	`assert(BinImages.size() > 0 && "Expected to find at least one device image");`