Addressed review comments

Author: maximdimakov

sycl/unittests/kernel-and-program/MultipleDevsCache.cpp

@@ -23,10 +23,7 @@
 
 using namespace sycl;
 
-class MultTestKernel {
-public:
-  void operator()(cl::sycl::item<1>){};
-};
+class MultTestKernel;
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
@@ -84,8 +81,10 @@ static pi_result redefinedDevicesGet(pi_platform platform,
     return PI_SUCCESS;
   }
 
-  devices[0] = reinterpret_cast<pi_device>(1111);
-  devices[1] = reinterpret_cast<pi_device>(2222);
+  if (num_entries == 2 && devices) {
+    devices[0] = reinterpret_cast<pi_device>(1111);
+    devices[1] = reinterpret_cast<pi_device>(2222);
+  }
   return PI_SUCCESS;
 }
 
@@ -188,15 +187,18 @@ TEST_F(MultipleDeviceCacheTest, ProgramRetain) {
 
     auto Bundle = cl::sycl::get_kernel_bundle<sycl::bundle_state::input>(
         Queue.get_context());
-
     Queue.submit([&](cl::sycl::handler &cgh) {
-      cgh.parallel_for<MultTestKernel>(cl::sycl::nd_range<1>(10, 10),
-                                       MultTestKernel{});
+      cgh.single_task<MultTestKernel>([](){});
     });
 
     auto BundleObject = cl::sycl::build(Bundle, Bundle.get_devices());
     auto KernelID = cl::sycl::get_kernel_id<MultTestKernel>();
     auto Kernel = BundleObject.get_kernel(KernelID);
+
+    // Because of emulating 2 devices program is retained for each one in build().
+    // It is also depends on number of device images. This test has one image,
+    // but other tests can create other images. Additional variable is added
+    // to control count of piProgramRetain calls
     auto BundleImpl = getSyclObjImpl(Bundle);
     int NumRetains = BundleImpl->size() * 2;
 
@@ -210,5 +212,7 @@ TEST_F(MultipleDeviceCacheTest, ProgramRetain) {
     EXPECT_EQ(KernelCache.size(), (size_t)2) << "Expect 2 kernels in cache";
   }
   // Cache is cleared here, check kernel release
+  // 3 kernel releases is expected because kernel_bundle::get_kernel() calls piKernelRetain
+  // so one more kernel release is needed
   EXPECT_EQ(KernelReleaseCounter, 3) << "Expect 3 piKernelRelease calls";
 }