Remove std::move to allow copy ellision; Moved header to source/detail

intel · Sep 9, 2024 · 312bd38 · 312bd38
1 parent 7fdbd5e
commit 312bd38
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/sycl/include/sycl/detail/compression.hpp → sycl/source/detail/compression.hpp b/sycl/include/sycl/detail/compression.hpp → sycl/source/detail/compression.hpp
@@ -82,7 +82,7 @@ class ZSTDCompressor {
       instance.m_lastError = 0;
 
     // Pass ownership of the buffer to the caller.
-    return std::move(dstBuffer);
+    return dstBuffer;
   }
 
   static std::unique_ptr<unsigned char>
@@ -120,7 +120,7 @@ class ZSTDCompressor {
     }
 
     // Pass ownership of the buffer to the caller.
-    return std::move(dstBuffer);
+    return dstBuffer;
   }
 
   // Data fields

diff --git a/sycl/source/detail/device_binary_image.cpp b/sycl/source/detail/device_binary_image.cpp
@@ -10,7 +10,7 @@
 #include <sycl/detail/ur.hpp>
 
 // For device image compression.
-#include <sycl/detail/compression.hpp>
+#include <detail/compression.hpp>
 
 #include <algorithm>
 #include <cstring>
@@ -239,9 +239,9 @@ CompressedRTDeviceBinaryImage::CompressedRTDeviceBinaryImage(
                                                   CompressedBin->BinaryStart);
 
   size_t DecompressedSize = 0;
-  m_DecompressedData = std::move(ZSTDCompressor::DecompressBlob(
+  m_DecompressedData = ZSTDCompressor::DecompressBlob(
       reinterpret_cast<const char *>(CompressedBin->BinaryStart),
-      compressedDataSize, DecompressedSize));
+      compressedDataSize, DecompressedSize);
 
   if (!m_DecompressedData) {
     throw sycl::exception(

diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
@@ -1653,9 +1653,9 @@ void ProgramManager::addImages(sycl_device_binaries DeviceBinary) {
 
     std::unique_ptr<RTDeviceBinaryImage> Img;
     if (isDeviceImageCompressed(RawImg))
-      Img = std::move(std::make_unique<CompressedRTDeviceBinaryImage>(RawImg));
+      Img = std::make_unique<CompressedRTDeviceBinaryImage>(RawImg);
     else
-      Img = std::move(std::make_unique<RTDeviceBinaryImage>(RawImg));
+      Img = std::make_unique<RTDeviceBinaryImage>(RawImg);
 
     static uint32_t SequenceID = 0;
 

diff --git a/sycl/unittests/compression/CompressionTests.cpp b/sycl/unittests/compression/CompressionTests.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <sycl/detail/compression.hpp>
+#include <detail/compression.hpp>
 
 #include <string>