Address reviews

Author: uditagarwal97

clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp

@@ -1134,12 +1134,21 @@ class BinaryWrapper {
 
           // Compress the image using zstd.
           SmallVector<uint8_t, 512> CompressedBuffer;
-          llvm::compression::zstd::compress(
-              ArrayRef<unsigned char>(
-                  (const unsigned char *)(Bin->getBufferStart()),
-                  Bin->getBufferSize()),
-              CompressedBuffer, OffloadCompressLevel);
-
+#if LLVM_ENABLE_EXCEPTIONS
+          try {
+#endif
+            llvm::compression::zstd::compress(
+                ArrayRef<unsigned char>(
+                    (const unsigned char *)(Bin->getBufferStart()),
+                    Bin->getBufferSize()),
+                CompressedBuffer, OffloadCompressLevel);
+#if LLVM_ENABLE_EXCEPTIONS
+          } catch (const std::exception &ex) {
+            return createStringError(inconvertibleErrorCode(),
+                                     std::string("Failed to compress the device image: \n") +
+                                     std::string(ex.what()));
+          }
+#endif
           if (Verbose)
             errs() << "[Compression] Original image size: "
                    << Bin->getBufferSize() << "\n"

sycl/source/detail/program_manager/program_manager.cpp

@@ -734,9 +734,11 @@ setSpecializationConstants(const std::shared_ptr<device_image_impl> &InputImpl,
 }
 
 static inline void CheckAndDecompressImage(RTDeviceBinaryImage *Img) {
+#ifndef SYCL_RT_ZSTD_NOT_AVAIABLE
   if (auto CompImg = dynamic_cast<CompressedRTDeviceBinaryImage *>(Img))
     if (CompImg->IsCompressed())
       CompImg->Decompress();
+#endif
 }
 
 // When caching is enabled, the returned UrProgram will already have

sycl/test-e2e/Compression/compression_multiple_tu.cpp

@@ -1,10 +1,9 @@
 // End-to-End test for testing device image compression when we have two
 // translation units, one compressed and one not compressed.
-// REQUIRES: zstd
+// REQUIRES: zstd, linux
 
-// DEFINE: %{fPIC_flag} =  %if windows %{%} %else %{-fPIC%}
-// RUN: %{build} --offload-compress -DENABLE_KERNEL1 -shared %{fPIC_flag} -o %T/kernel1.so
-// RUN: %{build} -DENABLE_KERNEL2 -shared %{fPIC_flag} -o %T/kernel2.so
+// RUN: %{build} --offload-compress -DENABLE_KERNEL1 -shared -fPIC -o %T/kernel1.so
+// RUN: %{build} -DENABLE_KERNEL2 -shared -fPIC -o %T/kernel2.so
 
 // RUN: %{build} %T/kernel1.so %T/kernel2.so -o %t_compress.out
 // RUN: %{run} %t_compress.out