[SYCL][NFC] Fix typo and double-negative in SYCL_RT_ZSTD_NOT_AVAIABLE macro (#18922)

Author: uditagarwal97

sycl/source/CMakeLists.txt

@@ -142,9 +142,8 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
     target_link_libraries(${LIB_NAME} PRIVATE ${ARG_XPTI_LIB})
   endif()
 
-  if (NOT LLVM_ENABLE_ZSTD)
-    target_compile_definitions(${LIB_OBJ_NAME} PRIVATE SYCL_RT_ZSTD_NOT_AVAIABLE)
-  else()
+  if (LLVM_ENABLE_ZSTD)
+    target_compile_definitions(${LIB_OBJ_NAME} PRIVATE SYCL_RT_ZSTD_AVAILABLE)
     target_link_libraries(${LIB_NAME} PRIVATE ${zstd_STATIC_LIBRARY})
     target_include_directories(${LIB_OBJ_NAME} PRIVATE ${zstd_INCLUDE_DIR})
   endif()

sycl/source/detail/compression.hpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 #pragma once
 
-#ifndef SYCL_RT_ZSTD_NOT_AVAIABLE
+#ifdef SYCL_RT_ZSTD_AVAILABLE
 
 #include <sycl/exception.hpp>
 
@@ -150,4 +150,4 @@ class ZSTDCompressor {
 } // namespace _V1
 } // namespace sycl
 
-#endif // SYCL_RT_ZSTD_NOT_AVAIABLE
+#endif // SYCL_RT_ZSTD_AVAILABLE

sycl/source/detail/device_binary_image.cpp

@@ -672,7 +672,7 @@ DynRTDeviceBinaryImage::DynRTDeviceBinaryImage(
   }
 }
 
-#ifndef SYCL_RT_ZSTD_NOT_AVAIABLE
+#ifdef SYCL_RT_ZSTD_AVAILABLE
 CompressedRTDeviceBinaryImage::CompressedRTDeviceBinaryImage(
     sycl_device_binary CompressedBin)
     : RTDeviceBinaryImage() {
@@ -712,7 +712,7 @@ CompressedRTDeviceBinaryImage::~CompressedRTDeviceBinaryImage() {
   delete Bin;
   Bin = nullptr;
 }
-#endif // SYCL_RT_ZSTD_NOT_AVAIABLE
+#endif // SYCL_RT_ZSTD_AVAILABLE
 
 } // namespace detail
 } // namespace _V1

sycl/source/detail/device_binary_image.hpp

@@ -304,7 +304,7 @@ class DynRTDeviceBinaryImage : public RTDeviceBinaryImage {
   std::unique_ptr<char[], std::function<void(void *)>> Data;
 };
 
-#ifndef SYCL_RT_ZSTD_NOT_AVAIABLE
+#ifdef SYCL_RT_ZSTD_AVAILABLE
 // Compressed device binary image. Decompression happens when the image is
 // actually used to build a program.
 // Also, frees the decompressed data in destructor.
@@ -331,7 +331,7 @@ class CompressedRTDeviceBinaryImage : public RTDeviceBinaryImage {
   std::unique_ptr<char[]> m_DecompressedData;
   size_t m_ImageSize;
 };
-#endif // SYCL_RT_ZSTD_NOT_AVAIABLE
+#endif // SYCL_RT_ZSTD_AVAILABLE
 
 } // namespace detail
 } // namespace _V1

sycl/source/detail/program_manager/program_manager.cpp

@@ -689,7 +689,7 @@ ProgramManager::collectDeviceImageDeps(const RTDeviceBinaryImage &Img,
 
 static inline void
 CheckAndDecompressImage([[maybe_unused]] RTDeviceBinaryImage *Img) {
-#ifndef SYCL_RT_ZSTD_NOT_AVAIABLE
+#ifdef SYCL_RT_ZSTD_AVAILABLE
   if (auto CompImg = dynamic_cast<CompressedRTDeviceBinaryImage *>(Img))
     if (CompImg->IsCompressed())
       CompImg->Decompress();
@@ -1945,7 +1945,7 @@ void ProgramManager::addImage(sycl_device_binary RawImg,
 
   std::unique_ptr<RTDeviceBinaryImage> Img;
   if (IsDeviceImageCompressed) {
-#ifndef SYCL_RT_ZSTD_NOT_AVAIABLE
+#ifdef SYCL_RT_ZSTD_AVAILABLE
     Img = std::make_unique<CompressedRTDeviceBinaryImage>(RawImg);
 #else
     throw sycl::exception(sycl::make_error_code(sycl::errc::runtime),

sycl/unittests/compression/CMakeLists.txt

@@ -1,3 +1,4 @@
 add_sycl_unittest(CompressionTests OBJECT
   CompressionTests.cpp
 )
+target_compile_definitions(CompressionTests PRIVATE SYCL_RT_ZSTD_AVAILABLE)

sycl/unittests/compression/CompressionTests.cpp

@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <detail/compression.hpp>
+#include <sycl/sycl.hpp>
 
 #include <string>