Pass offload options only to non-Ffpga targets

Author: uditagarwal97

clang/lib/Driver/ToolChains/Clang.cpp

@@ -10354,20 +10354,25 @@ void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
       C.getArgs().hasArg(options::OPT_fsycl_link_EQ)) {
 
     // When compiling and linking separately, we need to propagate the
-    // compression related CLI options to offload-wrapper.
-    if (C.getInputArgs().getLastArg(options::OPT_offload_compress)) {
-      CmdArgs.push_back(C.getArgs().MakeArgString(Twine("-offload-compress")));
-      // -offload-compression-level=<>
-      if (Arg *A = C.getInputArgs().getLastArg(
-              options::OPT_offload_compression_level_EQ))
-        CmdArgs.push_back(C.getArgs().MakeArgString(
-            Twine("-offload-compression-level=") + A->getValue()));
+    // compression related CLI options to offload-wrapper. Don't propagate
+    // these options when wrapping objects for FPGA.
+    if (!C.getArgs().hasArg(options::OPT_fintelfpga)) {
+
+      if (C.getInputArgs().getLastArg(options::OPT_offload_compress)) {
+        CmdArgs.push_back(
+            C.getArgs().MakeArgString(Twine("-offload-compress")));
+        // -offload-compression-level=<>
+        if (Arg *A = C.getInputArgs().getLastArg(
+                options::OPT_offload_compression_level_EQ))
+          CmdArgs.push_back(C.getArgs().MakeArgString(
+              Twine("-offload-compression-level=") + A->getValue()));
+      }
     }
 
     // For FPGA, we wrap the host objects before archiving them when using
     // -fsycl-link.  This allows for better extraction control from the
     // archive when we need the host objects for subsequent compilations.
-    if (C.getArgs().hasArg(options::OPT_fintelfpga)) {
+    else {
       // Add offload targets and inputs.
       CmdArgs.push_back(C.getArgs().MakeArgString(
           Twine("-kind=") + Action::GetOffloadKindName(OffloadingKind)));

sycl/test-e2e/Compression/compression_separate_compile.cpp

@@ -8,7 +8,7 @@
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fsycl-host-compiler=clang++ -fsycl-host-compiler-options='-std=c++17 -Wno-attributes -Wno-deprecated-declarations -fPIC -DENABLE_KERNEL2' -DENABLE_KERNEL2 -c %s -o %t_kernel2_aot.o
 
 //////////////////////   Link device images
-// RUN: %clangxx --offload-compress -fsycl -fsycl-link -fsycl-targets=spir64_x86_64 -fPIC %t_kernel1_aot.o %t_kernel2_aot.o -o %t_compressed_image.o
+// RUN: %clangxx --offload-compress -fsycl -fsycl-link -fsycl-targets=spir64_x86_64 -fPIC %t_kernel1_aot.o %t_kernel2_aot.o -o %t_compressed_image.o -v
 
 // Make sure the clang-offload-wrapper is called with the --offload-compress
 // option.