diff options
Diffstat (limited to 'llvm/lib/Target/NVPTX')
4 files changed, 12 insertions, 18 deletions
diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp index 556745825a1..52110b9ddfd 100644 --- a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp +++ b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp @@ -37,11 +37,12 @@ NVPTXMCAsmInfo::NVPTXMCAsmInfo(const Triple &TheTriple) { HiddenDeclarationVisibilityAttr = HiddenVisibilityAttr = MCSA_Invalid; ProtectedVisibilityAttr = MCSA_Invalid; - Data8bitsDirective = ".b8 "; + // FIXME: remove comment once debug info is properly supported. + Data8bitsDirective = "// .b8 "; Data16bitsDirective = nullptr; // not supported - Data32bitsDirective = ".b32 "; - Data64bitsDirective = ".b64 "; - ZeroDirective = ".b8"; + Data32bitsDirective = "// .b32 "; + Data64bitsDirective = "// .b64 "; + ZeroDirective = "// .b8"; AsciiDirective = nullptr; // not supported AscizDirective = nullptr; // not supported SupportsQuotedNames = false; diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.cpp b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.cpp index 6ac8fb425ab..7e978869133 100644 --- a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.cpp +++ b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.cpp @@ -30,11 +30,6 @@ void NVPTXTargetStreamer::outputDwarfFileDirectives() { DwarfFiles.clear(); } -void NVPTXTargetStreamer::closeLastSection() { - if (HasSections) - getStreamer().EmitRawText("\t}"); -} - void NVPTXTargetStreamer::emitDwarfFileDirective(StringRef Directive) { DwarfFiles.emplace_back(Directive); } @@ -86,9 +81,10 @@ void NVPTXTargetStreamer::changeSection(const MCSection *CurSection, raw_ostream &OS) { assert(!SubSection && "SubSection is not null!"); const MCObjectFileInfo *FI = getStreamer().getContext().getObjectFileInfo(); + // FIXME: remove comment once debug info is properly supported. // Emit closing brace for DWARF sections only. if (isDwarfSection(FI, CurSection)) - OS << "\t}\n"; + OS << "//\t}\n"; if (isDwarfSection(FI, Section)) { // Emit DWARF .file directives in the outermost scope. outputDwarfFileDirectives(); @@ -96,8 +92,7 @@ void NVPTXTargetStreamer::changeSection(const MCSection *CurSection, Section->PrintSwitchToSection(*getStreamer().getContext().getAsmInfo(), FI->getTargetTriple(), OS, SubSection); // DWARF sections are enclosed into braces - emit the open one. - OS << "\t{\n"; - HasSections = true; + OS << "//\t{\n"; } } diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.h b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.h index 8185efadefd..cfe856718b1 100644 --- a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.h +++ b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXTargetStreamer.h @@ -18,7 +18,6 @@ class MCSection; class NVPTXTargetStreamer : public MCTargetStreamer { private: SmallVector<std::string, 4> DwarfFiles; - bool HasSections = false; public: NVPTXTargetStreamer(MCStreamer &S); @@ -26,8 +25,6 @@ public: /// Outputs the list of the DWARF '.file' directives to the streamer. void outputDwarfFileDirectives(); - /// Close last section. - void closeLastSection(); /// Record DWARF file directives for later output. /// According to PTX ISA, CUDA Toolkit documentation, 11.5.3. Debugging diff --git a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp index 274f1c59b6c..f07266d1fae 100644 --- a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp +++ b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp @@ -901,8 +901,9 @@ void NVPTXAsmPrinter::emitHeader(Module &M, raw_ostream &O, if (HasFullDebugInfo) break; } + // FIXME: remove comment once debug info is properly supported. if (MMI && MMI->hasDebugInfo() && HasFullDebugInfo) - O << ", debug"; + O << "//, debug"; O << "\n"; @@ -953,10 +954,10 @@ bool NVPTXAsmPrinter::doFinalization(Module &M) { clearAnnotationCache(&M); delete[] gv_array; + // FIXME: remove comment once debug info is properly supported. // Close the last emitted section if (HasDebugInfo) - static_cast<NVPTXTargetStreamer *>(OutStreamer->getTargetStreamer()) - ->closeLastSection(); + OutStreamer->EmitRawText("//\t}"); // Output last DWARF .file directives, if any. static_cast<NVPTXTargetStreamer *>(OutStreamer->getTargetStreamer()) |
