move ManagedQueue

oneapi-src · Mar 13, 2024 · e198d84 · e198d84
1 parent 726435d
commit e198d84
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/source/loader/layers/sanitizer/asan_interceptor.cpp b/source/loader/layers/sanitizer/asan_interceptor.cpp
@@ -51,29 +51,6 @@ constexpr auto kSPIR_DeviceSanitizerReportMem = "__DeviceSanitizerReportMem";
 constexpr auto kSPIR_AsanDeviceGlobalCount = "__AsanDeviceGlobalCount";
 constexpr auto kSPIR_AsanDeviceGlobalMetadata = "__AsanDeviceGlobalMetadata";
 
-struct ManagedQueue {
-    ManagedQueue(ur_context_handle_t Context, ur_device_handle_t Device) {
-        [[maybe_unused]] auto Result = context.urDdiTable.Queue.pfnCreate(
-            Context, Device, nullptr, &Handle);
-        assert(Result == UR_RESULT_SUCCESS);
-    }
-
-    ~ManagedQueue() {
-        [[maybe_unused]] auto Result =
-            context.urDdiTable.Queue.pfnRelease(Handle);
-        assert(Result == UR_RESULT_SUCCESS);
-    }
-
-    // Disable copy semantics
-    ManagedQueue(const ManagedQueue &) = delete;
-    ManagedQueue &operator=(const ManagedQueue &) = delete;
-
-    operator ur_queue_handle_t() { return Handle; }
-
-  private:
-    ur_queue_handle_t Handle = nullptr;
-};
-
 uptr MemToShadow_CPU(uptr USM_SHADOW_BASE, uptr UPtr) {
     return USM_SHADOW_BASE + (UPtr >> 3);
 }

diff --git a/source/loader/layers/sanitizer/ur_sanitizer_utils.cpp b/source/loader/layers/sanitizer/ur_sanitizer_utils.cpp
@@ -15,6 +15,18 @@
 
 namespace ur_sanitizer_layer {
 
+ManagedQueue::ManagedQueue(ur_context_handle_t Context,
+                           ur_device_handle_t Device) {
+    [[maybe_unused]] auto Result =
+        context.urDdiTable.Queue.pfnCreate(Context, Device, nullptr, &Handle);
+    assert(Result == UR_RESULT_SUCCESS);
+}
+
+ManagedQueue::~ManagedQueue() {
+    [[maybe_unused]] auto Result = context.urDdiTable.Queue.pfnRelease(Handle);
+    assert(Result == UR_RESULT_SUCCESS);
+}
+
 ur_context_handle_t GetContext(ur_queue_handle_t Queue) {
     ur_context_handle_t Context{};
     [[maybe_unused]] auto Result = context.urDdiTable.Queue.pfnGetInfo(

diff --git a/source/loader/layers/sanitizer/ur_sanitizer_utils.hpp b/source/loader/layers/sanitizer/ur_sanitizer_utils.hpp
@@ -16,6 +16,20 @@
 
 namespace ur_sanitizer_layer {
 
+struct ManagedQueue {
+    ManagedQueue(ur_context_handle_t Context, ur_device_handle_t Device);
+    ~ManagedQueue();
+
+    // Disable copy semantics
+    ManagedQueue(const ManagedQueue &) = delete;
+    ManagedQueue &operator=(const ManagedQueue &) = delete;
+
+    operator ur_queue_handle_t() { return Handle; }
+
+  private:
+    ur_queue_handle_t Handle = nullptr;
+};
+
 ur_context_handle_t GetContext(ur_queue_handle_t Queue);
 ur_context_handle_t GetContext(ur_program_handle_t Program);
 ur_device_handle_t GetDevice(ur_queue_handle_t Queue);