diff options
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 43 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h | 6 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp | 9 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll | 46 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/accel-tables.ll | 36 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/string-offsets-table.ll | 6 |
6 files changed, 119 insertions, 27 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 2fe6a2dfb7e..40fe0e9cb49 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -94,6 +94,11 @@ static cl::opt<bool> GenerateARangeSection("generate-arange-section", cl::desc("Generate dwarf aranges"), cl::init(false)); +static cl::opt<bool> + GenerateDwarfTypeUnits("generate-type-units", cl::Hidden, + cl::desc("Generate DWARF4 type units."), + cl::init(false)); + static cl::opt<bool> SplitDwarfCrossCuReferences( "split-dwarf-cross-cu-references", cl::Hidden, cl::desc("Enable cross-cu references in DWO files"), cl::init(false)); @@ -284,6 +289,29 @@ void DbgVariable::addMMIEntry(const DbgVariable &V) { "conflicting locations for variable"); } +static AccelTableKind computeAccelTableKind(unsigned DwarfVersion, + bool GenerateTypeUnits, + DebuggerKind Tuning, + const Triple &TT) { + // Honor an explicit request. + if (AccelTables != AccelTableKind::Default) + return AccelTables; + + // Accelerator tables with type units are currently not supported. + if (GenerateTypeUnits) + return AccelTableKind::None; + + // Accelerator tables get emitted if targetting DWARF v5 or LLDB. DWARF v5 + // always implies debug_names. For lower standard versions we use apple + // accelerator tables on apple platforms and debug_names elsewhere. + if (DwarfVersion >= 5) + return AccelTableKind::Dwarf; + if (Tuning == DebuggerKind::LLDB) + return TT.isOSBinFormatMachO() ? AccelTableKind::Apple + : AccelTableKind::Dwarf; + return AccelTableKind::None; +} + DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M) : DebugHandlerBase(A), DebugLocs(A->OutStreamer->isVerboseAsm()), InfoHolder(A, "info_string", DIEValueAllocator), @@ -302,16 +330,6 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M) else DebuggerTuning = DebuggerKind::GDB; - // Turn on accelerator tables by default, if tuning for LLDB and the target is - // supported. - if (AccelTables == AccelTableKind::Default) { - if (tuneForLLDB() && A->TM.getTargetTriple().isOSBinFormatMachO()) - TheAccelTableKind = AccelTableKind::Apple; - else - TheAccelTableKind = AccelTableKind::None; - } else - TheAccelTableKind = AccelTables; - if (DwarfInlinedStrings == Default) UseInlineStrings = TT.isNVPTX(); else @@ -346,6 +364,11 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M) else UseSectionsAsReferences = DwarfSectionsAsReferences == Enable; + GenerateTypeUnits = GenerateDwarfTypeUnits; + + TheAccelTableKind = computeAccelTableKind( + DwarfVersion, GenerateTypeUnits, DebuggerTuning, A->TM.getTargetTriple()); + // Work around a GDB bug. GDB doesn't support the standard opcode; // SCE doesn't support GNU's; LLDB prefers the standard opcode, which // is defined as of DWARF 3. diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h index 42988d53b8b..6f4cefe6107 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h @@ -279,6 +279,9 @@ class DwarfDebug : public DebugHandlerBase { ///Allow emission of the .debug_loc section. bool UseLocSection = true; + /// Generate DWARF v4 type units. + bool GenerateTypeUnits; + /// DWARF5 Experimental Options /// @{ AccelTableKind TheAccelTableKind; @@ -546,6 +549,9 @@ public: /// Returns whether .debug_loc section should be emitted. bool useLocSection() const { return UseLocSection; } + /// Returns whether to generate DWARF v4 type units. + bool generateTypeUnits() const { return GenerateTypeUnits; } + // Experimental DWARF5 features. /// Returns what kind (if any) of accelerator tables to emit. diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp index 9af555464d4..43b835b2c4a 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -47,11 +47,6 @@ using namespace llvm; #define DEBUG_TYPE "dwarfdebug" -static cl::opt<bool> -GenerateDwarfTypeUnits("generate-type-units", cl::Hidden, - cl::desc("Generate DWARF4 type units."), - cl::init(false)); - DIEDwarfExpression::DIEDwarfExpression(const AsmPrinter &AP, DwarfUnit &DU, DIELoc &DIE) : DwarfExpression(AP.getDwarfVersion()), AP(AP), DU(DU), @@ -185,7 +180,7 @@ bool DwarfUnit::isShareableAcrossCUs(const DINode *D) const { return false; return (isa<DIType>(D) || (isa<DISubprogram>(D) && !cast<DISubprogram>(D)->isDefinition())) && - !GenerateDwarfTypeUnits; + !DD->generateTypeUnits(); } DIE *DwarfUnit::getDIE(const DINode *D) const { @@ -768,7 +763,7 @@ DIE *DwarfUnit::getOrCreateTypeDIE(const MDNode *TyNode) { else if (auto *STy = dyn_cast<DISubroutineType>(Ty)) constructTypeDIE(TyDIE, STy); else if (auto *CTy = dyn_cast<DICompositeType>(Ty)) { - if (GenerateDwarfTypeUnits && !Ty->isForwardDecl()) + if (DD->generateTypeUnits() && !Ty->isForwardDecl()) if (MDString *TypeId = CTy->getRawIdentifier()) { DD->addDwarfTypeUnitType(getCU(), TypeId->getString(), TyDIE, CTy); // Skip updating the accelerator tables since this is not the full type. diff --git a/llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll b/llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll new file mode 100644 index 00000000000..462a3bd5804 --- /dev/null +++ b/llvm/test/DebugInfo/X86/accel-tables-dwarf5.ll @@ -0,0 +1,46 @@ +; Verify the emission of accelerator tables for the DWARF v5 case. + +; debug_names should be emitted regardless of the target and debugger tuning +; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s +; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s + +; But not if also type units are enabled. +; TODO: This is the case because we currently don't generate DWARF v5-compatible +; type units. Change this once DWARF v5 type units are implemented. +; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -generate-type-units -debugger-tune=lldb < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s +; RUN: llc -mtriple=x86_64-apple-darwin12 -generate-type-units -filetype=obj < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s + +; NONE-NOT: apple_names +; NONE-NOT: debug_names + +; DEBUG_NAMES-NOT: apple_names +; DEBUG_NAMES: debug_names +; DEBUG_NAMES-NOT: apple_names + + +@x = common dso_local global i32 0, align 4, !dbg !0 + +!llvm.dbg.cu = !{!2} +!llvm.module.flags = !{!8, !9, !10} +!llvm.ident = !{!11} + +!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression()) +!1 = distinct !DIGlobalVariable(name: "x", scope: !2, file: !6, line: 1, type: !7, isLocal: false, isDefinition: true) +!2 = distinct !DICompileUnit(language: DW_LANG_C99, file: !3, producer: "clang version 7.0.0 (trunk 337260) (llvm/trunk 337262)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5) +!3 = !DIFile(filename: "-", directory: "/tmp", checksumkind: CSK_MD5, checksum: "06c25fe0c80b8959051a62f8f034710a") +!4 = !{} +!5 = !{!0} +!6 = !DIFile(filename: "<stdin>", directory: "/tmp", checksumkind: CSK_MD5, checksum: "06c25fe0c80b8959051a62f8f034710a") +!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!8 = !{i32 2, !"Dwarf Version", i32 5} +!9 = !{i32 2, !"Debug Info Version", i32 3} +!10 = !{i32 1, !"wchar_size", i32 4} +!11 = !{!"clang version 7.0.0 (trunk 337260) (llvm/trunk 337262)"} diff --git a/llvm/test/DebugInfo/X86/accel-tables.ll b/llvm/test/DebugInfo/X86/accel-tables.ll index c0b6a4c2fbf..e4f1508029e 100644 --- a/llvm/test/DebugInfo/X86/accel-tables.ll +++ b/llvm/test/DebugInfo/X86/accel-tables.ll @@ -1,16 +1,34 @@ -; Verify the emission of accelerator tables for various targets. +; Verify the emission of accelerator tables for various targets for the DWARF<=4 case -; Darwin has the tables unless we specifically tune for gdb -; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s | llvm-readobj -sections - | FileCheck --check-prefix=CHECK1 %s -; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s | llvm-readobj -sections - | FileCheck --check-prefix=CHECK2 %s +; Darwin has the apple tables unless we specifically tune for gdb +; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=APPLE %s +; RUN: llc -mtriple=x86_64-apple-darwin12 -filetype=obj -debugger-tune=gdb < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s -; Linux does not have the tables even if we explicitly tune for lldb -; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s | llvm-readobj -sections - | FileCheck --check-prefix=CHECK2 %s -; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s | llvm-readobj -sections - | FileCheck --check-prefix=CHECK2 %s +; Linux does has debug_names tables only if we explicitly tune for lldb +; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s +; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -debugger-tune=lldb < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=DEBUG_NAMES %s -; CHECK1: apple_names +; Neither target has accelerator tables if type units are enabled, as DWARF v4 +; type units are not compatible with accelerator tables. +; RUN: llc -mtriple=x86_64-pc-linux -filetype=obj -generate-type-units -debugger-tune=lldb < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s +; RUN: llc -mtriple=x86_64-apple-darwin12 -generate-type-units -filetype=obj < %s \ +; RUN: | llvm-readobj -sections - | FileCheck --check-prefix=NONE %s -; CHECK2-NOT: apple_names +; APPLE-NOT: debug_names +; APPLE: apple_names +; APPLE-NOT: debug_names + +; NONE-NOT: apple_names +; NONE-NOT: debug_names + +; DEBUG_NAMES-NOT: apple_names +; DEBUG_NAMES: debug_names +; DEBUG_NAMES-NOT: apple_names @var = thread_local global i32 0, align 4, !dbg !0 diff --git a/llvm/test/DebugInfo/X86/string-offsets-table.ll b/llvm/test/DebugInfo/X86/string-offsets-table.ll index 2234853566b..f400a89c872 100644 --- a/llvm/test/DebugInfo/X86/string-offsets-table.ll +++ b/llvm/test/DebugInfo/X86/string-offsets-table.ll @@ -81,6 +81,8 @@ ; SPLIT: .debug_str contents: ; SPLIT-NEXT: 0x00000000:{{.*}} ; SPLIT-NEXT: 0x[[STRING2SPLIT:[0-9a-f]*]]{{.*}} +; SPLIT-NEXT: 0x[[STRING3SPLIT:[0-9a-f]*]]{{.*}} +; SPLIT-NEXT: 0x[[STRING4SPLIT:[0-9a-f]*]]{{.*}} ; ; Extract the string offsets referenced in the .dwo file by the split unit. ; SPLIT: .debug_str.dwo contents: @@ -91,9 +93,11 @@ ; Check the string offsets sections in both the main and the .dwo files and ; verify that the extracted string offsets are referenced correctly. ; SPLIT: .debug_str_offsets contents: -; SPLIT-NEXT: 0x00000000: Contribution size = 12, Format = DWARF32, Version = 5 +; SPLIT-NEXT: 0x00000000: Contribution size = 20, Format = DWARF32, Version = 5 ; SPLIT-NEXT: 0x00000008: 00000000{{.*}} ; SPLIT-NEXT: 0x0000000c: [[STRING2SPLIT]] +; SPLIT-NEXT: 0x00000010: [[STRING3SPLIT]] +; SPLIT-NEXT: 0x00000014: [[STRING4SPLIT]] ; SPLIT: .debug_str_offsets.dwo contents: ; SPLIT-NEXT: 0x00000000: Contribution size = 36, Format = DWARF32, Version = 5 ; SPLIT-NEXT: 0x00000008: 00000000{{.*}} |
