diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index a7a3e9268b743..ed520578b22f0 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit 232e62f5221d565ec40d051d3c640b836ca91244 -# Merge: 76a96238 59b37e3f +# commit 93fc1331edfd5519ea1fab42a8b96abe9e53672f +# Merge: 259b67db d2c04518 # Author: aarongreig -# Date: Mon Dec 23 18:26:58 2024 +0000 -# Merge pull request #2498 from Bensuo/fabio/fix_l0_old_loader_no_translate -# Update usage of zeCommandListImmediateAppendCommandListsExp to use dlsym -set(UNIFIED_RUNTIME_TAG 232e62f5221d565ec40d051d3c640b836ca91244) +# Date: Thu Dec 26 16:52:33 2024 +0000 +# Merge pull request #2402 from yingcong-wu/yc/1202-mmap-failure +# [DevASAN][CPU] bugfix for mmap return value check. +set(UNIFIED_RUNTIME_TAG 93fc1331edfd5519ea1fab42a8b96abe9e53672f) diff --git a/sycl/source/detail/compression.hpp b/sycl/source/detail/compression.hpp index 1878010cd5bad..cf4c9b2c3765b 100644 --- a/sycl/source/detail/compression.hpp +++ b/sycl/source/detail/compression.hpp @@ -41,8 +41,8 @@ class ZSTDCompressor { public: // Blob (de)compression do not assume format/structure of the input buffer. // This function can be used in future for compression in on-disk cache. - static std::unique_ptr CompressBlob(const char *src, size_t srcSize, - size_t &dstSize, int level) { + static std::unique_ptr CompressBlob(const char *src, size_t srcSize, + size_t &dstSize, int level) { auto &instance = GetSingletonInstance(); // Lazy initialize compression context. @@ -61,7 +61,7 @@ class ZSTDCompressor { // Get maximum size of the compressed buffer and allocate it. auto dstBufferSize = ZSTD_compressBound(srcSize); - auto dstBuffer = std::unique_ptr(new char[dstBufferSize]); + auto dstBuffer = std::make_unique(dstBufferSize); if (!dstBuffer) throw sycl::exception(sycl::make_error_code(sycl::errc::runtime), @@ -93,8 +93,8 @@ class ZSTDCompressor { return dstBufferSize; } - static std::unique_ptr DecompressBlob(const char *src, size_t srcSize, - size_t &dstSize) { + static std::unique_ptr DecompressBlob(const char *src, size_t srcSize, + size_t &dstSize) { auto &instance = GetSingletonInstance(); // Lazy initialize decompression context. @@ -116,7 +116,7 @@ class ZSTDCompressor { auto dstBufferSize = GetDecompressedSize(src, srcSize); // Allocate buffer for decompressed data. - auto dstBuffer = std::unique_ptr(new char[dstBufferSize]); + auto dstBuffer = std::make_unique(dstBufferSize); if (!dstBuffer) throw sycl::exception(sycl::make_error_code(sycl::errc::runtime), diff --git a/sycl/source/detail/device_binary_image.hpp b/sycl/source/detail/device_binary_image.hpp index 9aab698ef2749..50d44ad4a0e4c 100644 --- a/sycl/source/detail/device_binary_image.hpp +++ b/sycl/source/detail/device_binary_image.hpp @@ -306,7 +306,7 @@ class CompressedRTDeviceBinaryImage : public RTDeviceBinaryImage { } private: - std::unique_ptr m_DecompressedData; + std::unique_ptr m_DecompressedData; size_t m_ImageSize; }; #endif // SYCL_RT_ZSTD_NOT_AVAIABLE diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp index d54bcdf93df1d..bae87a0144c89 100644 --- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp +++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp @@ -9,8 +9,8 @@ // XFAIL: (opencl && gpu) // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364 -// UNSUPPORTED: gpu-intel-dg2 -// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/15029 +// Test requires at least this version of the Intel GPU driver on Arc. +// REQUIRES-INTEL-DRIVER: lin: 31294 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}