[PATCH 53/79] [DebugInfo] Fix CU translation when GV goes before CU (#2010)

Translation of DebugInfo compilation units and entry points
moved before translation of GVs.

In other case we might end up in a situation when while
quering for CUs we find none of them.

Signed-off-by: Sidorov, Dmitry <dmitry.sidorov@intel.com>
Gbp-Pq: Name 0053-DebugInfo-Fix-CU-translation-when-GV-goes-before-CU-.patch

diff --git a/lib/SPIRV/SPIRVReader.cpp b/lib/SPIRV/SPIRVReader.cpp
index 6dd1bfdf39710d54762ae93e61dfe192b70f66e9..a3e7c946df29b6ff2ed679a7610ba8fd1b56ab21 100644 (file)
--- a/lib/SPIRV/SPIRVReader.cpp
+++ b/lib/SPIRV/SPIRVReader.cpp
@@ -3323,14 +3323,6 @@ bool SPIRVToLLVM::translate() {
   if (!transAddressingModel())
     return false;
 
-  for (unsigned I = 0, E = BM->getNumVariables(); I != E; ++I) {
-    auto BV = BM->getVariable(I);
-    if (BV->getStorageClass() != StorageClassFunction)
-      transValue(BV, nullptr, nullptr);
-    else
-      transGlobalCtorDtors(BV);
-  }
-
   // Entry Points should be translated before all debug intrinsics.
   for (SPIRVExtInst *EI : BM->getDebugInstVec()) {
     if (EI->getExtOp() == SPIRVDebug::EntryPoint)
@@ -3344,6 +3336,14 @@ bool SPIRVToLLVM::translate() {
       DbgTran->transDebugInst(EI);
   }
 
+  for (unsigned I = 0, E = BM->getNumVariables(); I != E; ++I) {
+    auto BV = BM->getVariable(I);
+    if (BV->getStorageClass() != StorageClassFunction)
+      transValue(BV, nullptr, nullptr);
+    else
+      transGlobalCtorDtors(BV);
+  }
+
   // Then translate all debug instructions.
   for (SPIRVExtInst *EI : BM->getDebugInstVec()) {
     DbgTran->transDebugInst(EI);

diff --git a/test/DebugInfo/gv-before-cu.ll b/test/DebugInfo/gv-before-cu.ll
new file mode 100644 (file)
index 0000000..81db2fe
--- /dev/null
+++ b/test/DebugInfo/gv-before-cu.ll
@@ -0,0 +1,47 @@
+; RUN: llvm-as < %s -o %t.bc
+; RUN: llvm-spirv %t.bc -o %t.spv
+; RUN: llvm-spirv -r %t.spv -o - | llvm-dis -o %t.ll
+; RUN: FileCheck < %t.ll %s
+
+; CHECK: [[#GVExpr:]] = !DIGlobalVariableExpression(var: ![[#GV:]], expr: !DIExpression())
+; CHECK: ![[#GV]] = distinct !DIGlobalVariable(name: "bar", scope: ![[#CU:]], file: ![[#File:]], line: 1, type: ![[#]], isLocal: true, isDefinition: true)
+; CHECK: ![[#CU]] = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: ![[#File]], producer: "C++ compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: ![[#GVs:]])
+; CHECK: ![[#File]] = !DIFile(filename: "test.cpp", directory: "/dev/null")
+; CHECK: ![[#GVs]] = !{![[#GVExpr]]}
+
+target datalayout = "e-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 = "spir64-unknown-unknown"
+
+@.str = internal unnamed_addr addrspace(2) constant [3 x i8] c"bar", align 1, !dbg !0
+
+define spir_func void @_Z3barBase() !dbg !12 {
+entry:
+  %0 = getelementptr inbounds [3 x i8], [3 x i8] addrspace(2)* @.str, i64 0, i64 0
+  ret void
+}
+
+define spir_kernel void @_Z3fooBase() !dbg !13 {
+entry:
+  call spir_func void @_Z3barBase(), !dbg !15
+  ret void
+}
+
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!10, !11}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "bar", scope: !2, file: !3, line: 1, type: !5, isLocal: true, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "C++ compiler", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !4)
+!3 = !DIFile(filename: "test.cpp", directory: "/dev/null")
+!4 = !{!0}
+!5 = !DICompositeType(tag: DW_TAG_array_type, baseType: !6, size: 104, elements: !8)
+!6 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !7)
+!7 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!8 = !{!9}
+!9 = !DISubrange(count: 3, lowerBound: 0)
+!10 = !{i32 7, !"Dwarf Version", i32 4}
+!11 = !{i32 2, !"Debug Info Version", i32 3}
+!12 = distinct !DISubprogram(name: "bar", linkageName: "_Z3barBase", scope: null, file: !3, line: 1, type: null, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2)
+!13 = distinct !DISubprogram(name: "foo", linkageName: "_Z3fooBase", scope: null, file: !3, line: 3, type: null, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2)
+!14 = distinct !DILexicalBlock(scope: !13, file: !3, line: 3, column: 1)
+!15 = !DILocation(line: 3, column: 1, scope: !14)