[SYCL] Use context passed to queue instead of new one.

Before this patch, the context passed to queue constructor was ignored,
and a new context created from the device was stored inside the queue.

Signed-off-by: Voronov, Alexey <[email protected]>
Signed-off-by: Vladimir Lazarev <[email protected]>

Author: alexeyvoronov-intel

sycl/include/CL/sycl/detail/queue_impl.hpp

@@ -27,7 +27,11 @@ class queue_impl {
 public:
   queue_impl(const device &SyclDevice, async_handler AsyncHandler,
              const property_list &PropList)
-      : m_Device(SyclDevice), m_Context(m_Device), m_AsyncHandler(AsyncHandler),
+      : queue_impl(SyclDevice, context(SyclDevice), AsyncHandler, PropList){};
+
+  queue_impl(const device &SyclDevice, const context &Context,
+             async_handler AsyncHandler, const property_list &PropList)
+      : m_Device(SyclDevice), m_Context(Context), m_AsyncHandler(AsyncHandler),
         m_PropList(PropList), m_HostQueue(m_Device.is_host()) {
     m_OpenCLInterop = !m_HostQueue;
     if (!m_HostQueue) {
@@ -160,8 +164,7 @@ class queue_impl {
     if (m_Queues.empty()) {
       m_Queues.push_back(m_CommandQueue);
       return m_CommandQueue;
-    }
-    else if (m_Queues.size() < MaxNumQueues) {
+    } else if (m_Queues.size() < MaxNumQueues) {
       m_Queues.push_back(createQueue());
       return m_Queues.back();
     }

sycl/source/queue.cpp

@@ -20,8 +20,9 @@ queue::queue(const context &syclContext, const device_selector &deviceSelector,
     return deviceSelector(d1) < deviceSelector(d2);
   };
 
-  *this = queue(*std::max_element(Devs.begin(), Devs.end(), Comp), asyncHandler,
-                propList);
+  const device &syclDevice = *std::max_element(Devs.begin(), Devs.end(), Comp);
+  impl = std::make_shared<detail::queue_impl>(syclDevice, syclContext,
+                                              asyncHandler, propList);
 }
 
 queue::queue(const device &syclDevice, const async_handler &asyncHandler,

sycl/test/basic_tests/queue.cpp

@@ -88,10 +88,18 @@ int main() {
     queue Queue(pl);
     try {
       Queue.throw_asynchronous();
-    }
-    catch (const std::bad_function_call& e) {
-      std::cout << "Default asynchronous handler call failed: " << e.what() << std::endl;
+    } catch (const std::bad_function_call &e) {
+      std::cout << "Default asynchronous handler call failed: " << e.what()
+                << std::endl;
       throw;
     }
   }
+
+  {
+    default_selector Selector;
+    device Device = Selector.select_device();
+    context Context(Device);
+    queue Queue(Context, Selector);
+    assert(Context == Queue.get_context());
+  }
 }