From be65e592abfd57381908ae9a151ffb300104929d Mon Sep 17 00:00:00 2001
From: Michael Aziz <michael.aziz@intel.com>
Date: Tue, 10 Dec 2024 20:35:38 -0800
Subject: [PATCH] [SYCL][NFC] Use move on `queue` parameters

Signed-off-by: Michael Aziz <michael.aziz@intel.com>
---
 sycl/source/detail/kernel_impl.hpp |  9 ++++++---
 sycl/source/kernel.cpp             | 12 ++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sycl/source/detail/kernel_impl.hpp b/sycl/source/detail/kernel_impl.hpp
index 0ba62bd642efb..57f1f10392997 100644
--- a/sycl/source/detail/kernel_impl.hpp
+++ b/sycl/source/detail/kernel_impl.hpp
@@ -355,7 +355,8 @@ inline typename syclex::info::kernel_queue_specific::max_num_work_groups::
         syclex::info::kernel_queue_specific::max_num_work_groups>(
         queue Queue, const range<1> &WorkGroupSize,
         size_t DynamicLocalMemorySize) const {
-  return queryMaxNumWorkGroups(Queue, WorkGroupSize, DynamicLocalMemorySize);
+  return queryMaxNumWorkGroups(std::move(Queue), WorkGroupSize,
+                               DynamicLocalMemorySize);
 }
 
 template <>
@@ -365,7 +366,8 @@ inline typename syclex::info::kernel_queue_specific::max_num_work_groups::
         syclex::info::kernel_queue_specific::max_num_work_groups>(
         queue Queue, const range<2> &WorkGroupSize,
         size_t DynamicLocalMemorySize) const {
-  return queryMaxNumWorkGroups(Queue, WorkGroupSize, DynamicLocalMemorySize);
+  return queryMaxNumWorkGroups(std::move(Queue), WorkGroupSize,
+                               DynamicLocalMemorySize);
 }
 
 template <>
@@ -375,7 +377,8 @@ inline typename syclex::info::kernel_queue_specific::max_num_work_groups::
         syclex::info::kernel_queue_specific::max_num_work_groups>(
         queue Queue, const range<3> &WorkGroupSize,
         size_t DynamicLocalMemorySize) const {
-  return queryMaxNumWorkGroups(Queue, WorkGroupSize, DynamicLocalMemorySize);
+  return queryMaxNumWorkGroups(std::move(Queue), WorkGroupSize,
+                               DynamicLocalMemorySize);
 }
 
 } // namespace detail
diff --git a/sycl/source/kernel.cpp b/sycl/source/kernel.cpp
index 14abc40e6108d..b0055f74ef4bc 100644
--- a/sycl/source/kernel.cpp
+++ b/sycl/source/kernel.cpp
@@ -108,14 +108,14 @@ kernel::get_info<info::kernel_device_specific::max_sub_group_size>(
 template <typename Param>
 typename detail::is_kernel_queue_specific_info_desc<Param>::return_type
 kernel::ext_oneapi_get_info(queue Queue) const {
-  return impl->ext_oneapi_get_info<Param>(Queue);
+  return impl->ext_oneapi_get_info<Param>(std::move(Queue));
 }
 
 template <typename Param>
 typename detail::is_kernel_queue_specific_info_desc<Param>::return_type
 kernel::ext_oneapi_get_info(queue Queue, const range<1> &WorkGroupSize,
                             size_t DynamicLocalMemorySize) const {
-  return impl->ext_oneapi_get_info<Param>(Queue, WorkGroupSize,
+  return impl->ext_oneapi_get_info<Param>(std::move(Queue), WorkGroupSize,
                                           DynamicLocalMemorySize);
 }
 
@@ -123,7 +123,7 @@ template <typename Param>
 typename detail::is_kernel_queue_specific_info_desc<Param>::return_type
 kernel::ext_oneapi_get_info(queue Queue, const range<2> &WorkGroupSize,
                             size_t DynamicLocalMemorySize) const {
-  return impl->ext_oneapi_get_info<Param>(Queue, WorkGroupSize,
+  return impl->ext_oneapi_get_info<Param>(std::move(Queue), WorkGroupSize,
                                           DynamicLocalMemorySize);
 }
 
@@ -131,7 +131,7 @@ template <typename Param>
 typename detail::is_kernel_queue_specific_info_desc<Param>::return_type
 kernel::ext_oneapi_get_info(queue Queue, const range<3> &WorkGroupSize,
                             size_t DynamicLocalMemorySize) const {
-  return impl->ext_oneapi_get_info<Param>(Queue, WorkGroupSize,
+  return impl->ext_oneapi_get_info<Param>(std::move(Queue), WorkGroupSize,
                                           DynamicLocalMemorySize);
 }
 
@@ -185,7 +185,7 @@ __SYCL_EXPORT typename ext::oneapi::experimental::info::kernel_queue_specific::
                                      size_t DynamicLocalMemorySize) const {
   return ext_oneapi_get_info<ext::oneapi::experimental::info::
                                  kernel_queue_specific::max_num_work_groups>(
-      Queue, WorkGroupSize, DynamicLocalMemorySize);
+      std::move(Queue), WorkGroupSize, DynamicLocalMemorySize);
 }
 template <>
 __SYCL2020_DEPRECATED(
@@ -201,7 +201,7 @@ __SYCL_EXPORT typename ext::oneapi::experimental::info::kernel_queue_specific::
   const sycl::range<3> WorkGroupSize{MaxWorkGroupSize, 1, 1};
   return ext_oneapi_get_info<ext::oneapi::experimental::info::
                                  kernel_queue_specific::max_num_work_groups>(
-      Queue, WorkGroupSize,
+      std::move(Queue), WorkGroupSize,
       /* DynamicLocalMemorySize */ 0);
 }
 #endif