From: Viktoria Maximova Date: Fri, 21 Apr 2023 15:18:00 +0000 (-0700) Subject: [PATCH 36/79] [Backport to 15][DebugInfo] Add module producer info for NonSemantic... X-Git-Tag: archive/raspbian/15.0.0-6+rpi1^2~45 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31f5ad90430ce2cfd83a8a536d028b14e2fccd42;p=spirv-llvm-translator-15.git [PATCH 36/79] [Backport to 15][DebugInfo] Add module producer info for NonSemantic.Shader.DebugInfo.200 (#1968) Keep existing W/A for other debug info specs, except NonSemantic.Shader.DebugInfo.100 Gbp-Pq: Name 0036-Backport-to-15-DebugInfo-Add-module-producer-info-fo.patch --- diff --git a/lib/SPIRV/LLVMToSPIRVDbgTran.cpp b/lib/SPIRV/LLVMToSPIRVDbgTran.cpp index 3a71723..7ff8b9a 100644 --- a/lib/SPIRV/LLVMToSPIRVDbgTran.cpp +++ b/lib/SPIRV/LLVMToSPIRVDbgTran.cpp @@ -540,7 +540,7 @@ SPIRVId LLVMToSPIRVDbgTran::getDebugInfoNoneId() { SPIRVEntry *LLVMToSPIRVDbgTran::transDbgCompileUnit(const DICompileUnit *CU) { using namespace SPIRVDebug::Operand::CompilationUnit; - SPIRVWordVec Ops(OperandCount); + SPIRVWordVec Ops(MinOperandCount); Ops[SPIRVDebugInfoVersionIdx] = SPIRVDebug::DebugInfoVersion; Ops[DWARFVersionIdx] = M->getDwarfVersion(); Ops[SourceIdx] = getSource(CU)->getId(); @@ -553,7 +553,17 @@ SPIRVEntry *LLVMToSPIRVDbgTran::transDbgCompileUnit(const DICompileUnit *CU) { if (isNonSemanticDebugInfo()) transformToConstant( Ops, {SPIRVDebugInfoVersionIdx, DWARFVersionIdx, LanguageIdx}); - BM->addModuleProcessed(SPIRVDebug::ProducerPrefix + CU->getProducer().str()); + + if (isNonSemanticDebugInfo()) { + if (BM->getDebugInfoEIS() == SPIRVEIS_NonSemantic_Shader_DebugInfo_200) { + Ops.push_back(BM->getString(CU->getProducer().str())->getId()); + } + } else { + // TODO: Remove this workaround once we switch to NonSemantic.Shader.* debug + // info by default + BM->addModuleProcessed(SPIRVDebug::ProducerPrefix + + CU->getProducer().str()); + } // Cache CU in a member. SPIRVCUMap[CU] = static_cast( BM->addDebugInfo(SPIRVDebug::CompilationUnit, getVoidTy(), Ops)); diff --git a/lib/SPIRV/SPIRVToLLVMDbgTran.cpp b/lib/SPIRV/SPIRVToLLVMDbgTran.cpp index 42e637c..0e00f7b 100644 --- a/lib/SPIRV/SPIRVToLLVMDbgTran.cpp +++ b/lib/SPIRV/SPIRVToLLVMDbgTran.cpp @@ -156,7 +156,7 @@ SPIRVToLLVMDbgTran::transCompilationUnit(const SPIRVExtInst *DebugInst) { const SPIRVWordVec &Ops = DebugInst->getArguments(); using namespace SPIRVDebug::Operand::CompilationUnit; - assert(Ops.size() == OperandCount && "Invalid number of operands"); + assert(Ops.size() >= MinOperandCount && "Invalid number of operands"); // We must preserve only one Dwarf version module level metadata // UpgradeDebugInfo from llvm/lib/IR/AutoUpgrade.cpp has already done all // work for us during linking stage leaving a single Dwarf version in the @@ -180,8 +180,20 @@ SPIRVToLLVMDbgTran::transCompilationUnit(const SPIRVExtInst *DebugInst) { SourceLang = dwarf::DW_LANG_OpenCL; } - auto Producer = findModuleProducer(); BuilderMap[DebugInst->getId()] = std::make_unique(*M); + + if (DebugInst->getExtSetKind() == SPIRVEIS_NonSemantic_Shader_DebugInfo_100) { + return BuilderMap[DebugInst->getId()]->createCompileUnit( + SourceLang, getFile(Ops[SourceIdx]), "spirv", false, "", 0); + } + if (DebugInst->getExtSetKind() == SPIRVEIS_NonSemantic_Shader_DebugInfo_200) { + StringRef Producer = getString(Ops[ProducerIdx]); + return BuilderMap[DebugInst->getId()]->createCompileUnit( + SourceLang, getFile(Ops[SourceIdx]), Producer, false, "", 0); + } + // TODO: Remove this workaround once we switch to NonSemantic.Shader.* debug + // info by default + auto Producer = findModuleProducer(); return BuilderMap[DebugInst->getId()]->createCompileUnit( SourceLang, getFile(Ops[SourceIdx]), Producer, false, "", 0); } diff --git a/lib/SPIRV/libSPIRV/SPIRV.debug.h b/lib/SPIRV/libSPIRV/SPIRV.debug.h index 677f1cb..06c5af0 100644 --- a/lib/SPIRV/libSPIRV/SPIRV.debug.h +++ b/lib/SPIRV/libSPIRV/SPIRV.debug.h @@ -290,7 +290,9 @@ enum { DWARFVersionIdx = 1, SourceIdx = 2, LanguageIdx = 3, - OperandCount = 4 + // For NonSemantic.Shader.DebugInfo.200 + ProducerIdx = 4, + MinOperandCount = 4 }; } diff --git a/test/DebugInfo/NonSemantic/DebugInfoProducer.ll b/test/DebugInfo/NonSemantic/DebugInfoProducer.ll new file mode 100644 index 0000000..4bc59dc --- /dev/null +++ b/test/DebugInfo/NonSemantic/DebugInfoProducer.ll @@ -0,0 +1,76 @@ +; Test checks debug info of producer is preserved from LLVM IR to spirv +; and spirv to LLVM IR translation. + +; Original .cpp source: +; +; int main() { +; return 0; +; } + +; Command line: +; ./clang -cc1 -debug-info-kind=standalone -v s.cpp -S -emit-llvm -triple spir + +; RUN: llvm-as %s -o %t.bc +; RUN: llvm-spirv %t.bc --spirv-debug-info-version=nonsemantic-shader-200 -spirv-text -o - | FileCheck %s --check-prefix CHECK-SPIRV-200 +; RUN: llvm-spirv %t.bc --spirv-debug-info-version=nonsemantic-shader-200 -o %t.spv +; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc +; RUN: llvm-dis %t.rev.bc -o %t.rev.ll +; RUN: FileCheck %s --input-file %t.rev.ll --check-prefix CHECK-LLVM-200 + +; Check that we don't produce "producer" info for NonSemantic.Shader.DebugInfo.100 as it's not specification conformant +; RUN: llvm-spirv %t.bc --spirv-debug-info-version=nonsemantic-shader-100 -spirv-text -o %t.spt +; RUN: FileCheck %s --input-file %t.spt --check-prefix CHECK-SPIRV-100 +; RUN: llvm-spirv -spirv-text -r -emit-opaque-pointers %t.spt -o %t.rev.bc +; RUN: llvm-dis %t.rev.bc -o - | FileCheck %s --check-prefix CHECK-LLVM-100 + +; ModuleID = 's.bc' +source_filename = "s.cpp" +target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64" +target triple = "spir" + +; Function Attrs: noinline norecurse nounwind optnone +define i32 @main() #0 !dbg !8 { +entry: + %retval = alloca i32, align 4 + store i32 0, i32* %retval, align 4 + ret i32 0, !dbg !13 +} + +attributes #0 = { noinline norecurse nounwind optnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="none" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!3, !4, !5, !6} +!opencl.used.extensions = !{!2} +!opencl.used.optional.core.features = !{!2} +!opencl.compiler.options = !{!2} +!llvm.ident = !{!7} + +; CHECK-LLVM-200: !DICompileUnit +; CHECK-LLVM-200-SAME: producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 16a50c9e642fd085e5ceb68c403b71b5b2e0607c)" +; CHECK-LLVM-200-NOT: producer: "spirv" + +; CHECK-LLVM-100: !DICompileUnit +; CHECK-LLVM-100-SAME: producer: "spirv" +; CHECK-LLVM-100-NOT: producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 16a50c9e642fd085e5ceb68c403b71b5b2e0607c)" + +; CHECK-SPIRV-200: String [[#ProducerId:]] "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 16a50c9e642fd085e5ceb68c403b71b5b2e0607c)" +; CHECK-SPIRV-200: DebugCompilationUnit [[#]] [[#]] [[#]] [[#]] [[#ProducerId]] + +; CHECK-SPIRV-100-NOT: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 16a50c9e642fd085e5ceb68c403b71b5b2e0607c)" +; CHECK-SPIRV-100-NOT: DebugCompilationUnit [[#]] [[#]] [[#]] [[#]] [[#]] {{$}} + + +!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 13.0.0 (https://github.com/llvm/llvm-project.git 16a50c9e642fd085e5ceb68c403b71b5b2e0607c)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None) +!1 = !DIFile(filename: "", directory: "oneAPI") +!2 = !{} +!3 = !{i32 2, !"Debug Info Version", i32 3} +!4 = !{i32 1, !"wchar_size", i32 4} +!5 = !{i32 1, !"ThinLTO", i32 0} +!6 = !{i32 1, !"EnableSplitLTOUnit", i32 1} +!7 = !{!"clang version 13.0.0 (https://github.com/llvm/llvm-project.git 16a50c9e642fd085e5ceb68c403b71b5b2e0607c)"} +!8 = distinct !DISubprogram(name: "main", scope: !9, file: !9, line: 1, type: !10, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2) +!9 = !DIFile(filename: "s.cpp", directory: "C:\\") +!10 = !DISubroutineType(types: !11) +!11 = !{!12} +!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!13 = !DILocation(line: 2, column: 2, scope: !8)