add flags and test for -g debuginfo compilations

Author: lamb-j

amd/comgr/src/comgr-compiler.cpp

@@ -1913,15 +1913,19 @@ static inline const std::unordered_set<std::string_view> ValidSpirvFlags{
     "-ffinite-math-only",
     "-ffp-contract=fast",
     "-ffp-contract=fast-honor-pragmas",
+    "-ffp-contract=on",
     "-fgpu-rdc",
     "-finline-functions",
-    "-fno-signed-zeros",
-    "-fno-rounding-math",
-    "-fno-experimental-relative-c++-abi-vtables",
     "-fno-autolink",
+    "-fno-experimental-relative-c++-abi-vtables",
+    "-fno-rounding-math",
+    "-fno-signed-zeros",
+    "-fno-threadsafe-statics",
     "-freciprocal-math",
+    "-fskip-odr-check-in-gmf",
     "-funsafe-math-optimizations",
     "-fvisibility=hidden",
+    "-gheterogeneous-dwarf=diexpression",
     "-O0",
     "-O1",
     "-O2",
@@ -1967,6 +1971,9 @@ amd_comgr_status_t AMDGPUCompiler::extractSpirvFlags(DataSet *BcSet) {
         if (Tmp == "--hipstdpar" || Tmp == "-amdgpu-enable-hipstdpar") {
           Bc->SpirvFlags.push_back("-mllvm");
           Bc->SpirvFlags.push_back("-amdgpu-enable-hipstdpar");
+        } else if (Tmp == "-amdgpu-spill-cfi-saved-regs") {
+          Bc->SpirvFlags.push_back("-mllvm");
+          Bc->SpirvFlags.push_back("-amdgpu-spill-cfi-saved-regs");
         } else if (ValidSpirvFlags.count(Tmp)) {
           Bc->SpirvFlags.push_back(Saver.save(Tmp.c_str()).data());
         }

amd/comgr/test-lit/spirv-to-reloc.hip

@@ -18,6 +18,20 @@
 // COM: Check that SPIR-V flags are correctly extracted
 // CHECK: Driver Job Args: {{.*}} "-fno-rounding-math" "-O3" "-fno-autolink" "-fvisibility=hidden" "-fexceptions" "-fcolor-diagnostics" "-mcode-object-version=5"
 
+// COM: ----
+// COM: Generate a debuginfo SPIR-V file from a HIP kernel
+// RUN: clang -x hip --offload-arch=amdgcnspirv -nogpulib -nogpuinc \
+// RUN:    --no-gpu-bundle-output --offload-device-only -O3 %s -o %t.dbg.spv -g
+
+// COM: Compile debuginfo SPIR-V source to a relocatable
+// RUN: AMD_COMGR_EMIT_VERBOSE_LOGS=1 AMD_COMGR_REDIRECT_LOGS=stdout \
+// RUN:   spirv-to-reloc %t.dbg.spv %t.dbg.o | FileCheck \
+// RUN:   -check-prefix=CHECK-DBG %s
+
+// COM: Check that debuginfo SPIR-V flags are correctly extracted
+// CHECK-DBG: Driver Job Args: {{.*}} "-gheterogeneous-dwarf=diexpression" "-mllvm -amdgpu-spill-cfi-saved-regs"
+
+
 #include <cstdlib>
 
 #define __constant__ __attribute__((constant))