[SYCL] Pass --spirv-preserve-auxdata to llvm-spirv for SPIR-V fat objects (#9089)

This option preserves function metadata and attributes we need in
sycl-post-link.

These were previously lost during forward translation to SPIR-V.

---------

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>

Author: sarnex

clang/lib/Driver/ToolChains/Clang.cpp

@@ -9529,6 +9529,13 @@ void SPIRVTranslator::ConstructJob(Compilation &C, const JobAction &JA,
     // operations which don't have mapping to OpenCL.DebugInfo.100 spec.
     TranslatorArgs.push_back("-spirv-allow-extra-diexpressions");
     TranslatorArgs.push_back("-spirv-allow-unknown-intrinsics=llvm.genx.");
+    bool CreatingSyclSPIRVFatObj =
+        C.getDriver().getFinalPhase(C.getArgs()) != phases::Link &&
+        TCArgs.getLastArgValue(options::OPT_fsycl_device_obj_EQ)
+            .equals_insensitive("spirv") &&
+        !TCArgs.hasArg(options::OPT_fsycl_device_only);
+    if (CreatingSyclSPIRVFatObj)
+      TranslatorArgs.push_back("--spirv-preserve-auxdata");
 
     // Disable all the extensions by default
     std::string ExtArg("-spirv-ext=-all");
@@ -9571,6 +9578,9 @@ void SPIRVTranslator::ConstructJob(Compilation &C, const JobAction &JA,
                 ",+SPV_KHR_uniform_group_instructions"
                 ",+SPV_INTEL_masked_gather_scatter"
                 ",+SPV_INTEL_tensor_float32_conversion";
+    if (CreatingSyclSPIRVFatObj)
+      ExtArg += ",+SPV_KHR_non_semantic_info";
+
     TranslatorArgs.push_back(TCArgs.MakeArgString(ExtArg));
   }
   for (auto I : Inputs) {
@@ -9947,6 +9957,10 @@ void SpirvToIrWrapper::ConstructJob(Compilation &C, const JobAction &JA,
   // Output File
   addArgs(CmdArgs, TCArgs, {"-o", Output.getFilename()});
 
+  // Make sure we preserve any auxiliary data which may be present in the
+  // SPIR-V object, which we need for SPIR-V-based fat objects.
+  addArgs(CmdArgs, TCArgs, {"-llvm-spirv-opts", "--spirv-preserve-auxdata"});
+
   auto Cmd = std::make_unique<Command>(
       JA, *this, ResponseFileSupport::None(),
       TCArgs.MakeArgString(getToolChain().GetProgramPath(getShortName())),

clang/test/Driver/sycl-spirv-obj.cpp

@@ -10,6 +10,8 @@
 // SPIRV_DEVICE_OBJ-SAME: "-fsycl-is-device"
 // SPIRV_DEVICE_OBJ-SAME: "-o" "[[DEVICE_BC:.+\.bc]]"
 // SPIRV_DEVICE_OBJ: llvm-spirv{{.*}} "-o" "[[DEVICE_SPV:.+\.spv]]"
+// SPIRV_DEVICE_OBJ-SAME: "--spirv-preserve-auxdata"
+// SPIRV_DEVICE_OBJ-SAME: "-spirv-ext=-all,{{.*}},+SPV_KHR_non_semantic_info"
 // SPIRV_DEVICE_OBJ-SAME: "[[DEVICE_BC]]"
 // SPIRV_DEVICE_OBJ: clang{{.*}} "-cc1" "-triple" "x86_64-unknown-linux-gnu"
 // SPIRV_DEVICE_OBJ-SAME: "-fsycl-is-host"
@@ -38,5 +40,5 @@
 // RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-obj=spirv -### %t.o 2>&1 | \
 // RUN:  FileCheck %s -check-prefixes=OPT_WARNING,LLVM_SPIRV_R
 // OPT_WARNING: warning: argument unused during compilation: '-fsycl-device-obj=spirv'
-// LLVM_SPIRV_R: spirv-to-ir-wrapper{{.*}}
+// LLVM_SPIRV_R: spirv-to-ir-wrapper{{.*}} "-llvm-spirv-opts" "--spirv-preserve-auxdata"
 // LLVM_SPIRV_R-NOT: llvm-spirv{{.*}} "-r"