@@ -87,8 +87,8 @@ TEST_F(QueueID, QueueID_QueueCreationAndDestroy) {
8787 std::string Queue1IDSTr;
8888 {
8989 sycl::queue Q0{Context, sycl::default_selector{}};
90- auto Queue0ImplPtr = sycl::detail::getSyclObjImpl (Q0);
91- Queue0IDSTr = std::to_string (Queue0ImplPtr-> getQueueID ());
90+ sycl::detail::queue_impl &Queue0Impl = * sycl::detail::getSyclObjImpl (Q0);
91+ Queue0IDSTr = std::to_string (Queue0Impl. getQueueID ());
9292 ASSERT_TRUE (queryReceivedNotifications (TraceType, Message));
9393 EXPECT_EQ (TraceType, xpti::trace_queue_create);
9494 EXPECT_THAT (Message, HasSubstr (" create:queue_id:" + Queue0IDSTr));
@@ -97,8 +97,8 @@ TEST_F(QueueID, QueueID_QueueCreationAndDestroy) {
9797 std::to_string (size_t (QueueHandle))));
9898
9999 sycl::queue Q1{Context, sycl::default_selector{}};
100- auto Queue1ImplPtr = sycl::detail::getSyclObjImpl (Q1);
101- Queue1IDSTr = std::to_string (Queue1ImplPtr-> getQueueID ());
100+ sycl::detail::queue_impl &Queue1Impl = * sycl::detail::getSyclObjImpl (Q1);
101+ Queue1IDSTr = std::to_string (Queue1Impl. getQueueID ());
102102 ASSERT_TRUE (queryReceivedNotifications (TraceType, Message));
103103 EXPECT_EQ (TraceType, xpti::trace_queue_create);
104104 EXPECT_THAT (Message, HasSubstr (" create:queue_id:" + Queue1IDSTr));
@@ -118,8 +118,8 @@ TEST_F(QueueID, QueueID_QueueCreationAndDestroy) {
118118TEST_F (QueueID, QueueCreationAndKernelWithDeps) {
119119 sycl::queue Q0;
120120 sycl::queue Q1;
121- auto Queue0ImplPtr = sycl::detail::getSyclObjImpl (Q0);
122- auto Queue1ImplPtr = sycl::detail::getSyclObjImpl (Q1);
121+ sycl::detail::queue_impl &Queue0Impl = * sycl::detail::getSyclObjImpl (Q0);
122+ sycl::detail::queue_impl &Queue1Impl = * sycl::detail::getSyclObjImpl (Q1);
123123 sycl::buffer<int , 1 > buf (sycl::range<1 >(1 ));
124124 Q1.submit (
125125 [&](handler &Cgh) {
@@ -128,8 +128,8 @@ TEST_F(QueueID, QueueCreationAndKernelWithDeps) {
128128 },
129129 {FileName, FunctionName, 1 , 0 })
130130 .wait ();
131- EXPECT_NE (Queue1ImplPtr-> getQueueID (), Queue0ImplPtr-> getQueueID ());
132- auto QueueIDSTr = std::to_string (Queue1ImplPtr-> getQueueID ());
131+ EXPECT_NE (Queue1Impl. getQueueID (), Queue0Impl. getQueueID ());
132+ auto QueueIDSTr = std::to_string (Queue1Impl. getQueueID ());
133133 // alloca
134134 checkTaskBeginEnd (QueueIDSTr);
135135 // kernel
@@ -140,8 +140,8 @@ TEST_F(QueueID, QueueCreationAndKernelWithDeps) {
140140// https://github.com/intel/llvm/issues/12963
141141TEST_F (QueueID, DISABLED_QueueCreationUSMOperations) {
142142 sycl::queue Q0;
143- auto Queue0ImplPtr = sycl::detail::getSyclObjImpl (Q0);
144- auto QueueIDSTr = std::to_string (Queue0ImplPtr-> getQueueID ());
143+ sycl::detail::queue_impl &Queue0Impl = * sycl::detail::getSyclObjImpl (Q0);
144+ auto QueueIDSTr = std::to_string (Queue0Impl. getQueueID ());
145145
146146 unsigned char *AllocSrc = (unsigned char *)sycl::malloc_device (1 , Q0);
147147 unsigned char *AllocDst = (unsigned char *)sycl::malloc_device (1 , Q0);
@@ -165,11 +165,11 @@ TEST_F(QueueID, QueueCreationAndKernelNoDeps) {
165165 sycl::queue Q0;
166166 sycl::queue Q1;
167167
168- auto Queue0ImplPtr = sycl::detail::getSyclObjImpl (Q0);
169- auto Queue0IDSTr = std::to_string (Queue0ImplPtr-> getQueueID ());
168+ sycl::detail::queue_impl &Queue0Impl = * sycl::detail::getSyclObjImpl (Q0);
169+ auto Queue0IDSTr = std::to_string (Queue0Impl. getQueueID ());
170170
171- auto Queue1ImplPtr = sycl::detail::getSyclObjImpl (Q1);
172- auto Queue1IDSTr = std::to_string (Queue1ImplPtr-> getQueueID ());
171+ sycl::detail::queue_impl &Queue1Impl = * sycl::detail::getSyclObjImpl (Q1);
172+ auto Queue1IDSTr = std::to_string (Queue1Impl. getQueueID ());
173173
174174 Q0.submit (
175175 [&](handler &Cgh) {
0 commit comments