<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 30, 2015 at 4:48 PM, David Blaikie via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dblaikie<br>
Date: Mon Nov 30 18:48:39 2015<br>
New Revision: 254355<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=254355&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=254355&view=rev</a><br>
Log:<br>
[llvm-dwp] Initial partial prototype<br>
<br>
This just concatenates the common DWP sections without doing any of the<br>
fancy DWP things like:<br>
<br>
1) update str_offsets<br>
2) deduplicating strings<br>
3) merging/creating cu/tu_index<br>
<br>
Patches for these will follow shortly.<br>
<br>
(also not sure about target triple/object file type for this tool - do I<br>
really need a whole triple just to write an object file that contains<br>
purely static/hardcoded bytes in each section? & I guess I should just<br>
pick it based on the first input, maybe, rather than hardcoding for now<br>
- but we only produce .dwo on ELF platforms with objcopy for now anyway)<br>
<br>
Added:<br>
llvm/trunk/test/tools/llvm-dwp/<br>
llvm/trunk/test/tools/llvm-dwp/Inputs/<br>
llvm/trunk/test/tools/llvm-dwp/Inputs/simple/<br>
llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.cpp<br>
llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo<br>
llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.cpp<br>
llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo<br>
llvm/trunk/test/tools/llvm-dwp/X86/<br>
llvm/trunk/test/tools/llvm-dwp/X86/lit.local.cfg<br>
llvm/trunk/test/tools/llvm-dwp/X86/simple.test<br>
Modified:<br>
llvm/trunk/include/llvm/ADT/StringMap.h<br>
llvm/trunk/include/llvm/ADT/StringSet.h<br>
llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/StringMap.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringMap.h?rev=254355&r1=254354&r2=254355&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringMap.h?rev=254355&r1=254354&r2=254355&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ADT/StringMap.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/StringMap.h Mon Nov 30 18:48:39 2015<br>
@@ -232,6 +232,13 @@ public:<br>
: StringMapImpl(InitialSize, static_cast<unsigned>(sizeof(MapEntryTy))),<br>
Allocator(A) {}<br>
<br>
+ StringMap(std::initializer_list<std::pair<StringRef, ValueTy>> List)<br>
+ : StringMapImpl(static_cast<unsigned>(sizeof(MapEntryTy))) {<br>
+ for (const auto &P : List) {<br>
+ insert(P);<br>
+ }<br>
+ }<br>
+<br>
StringMap(StringMap &&RHS)<br>
: StringMapImpl(std::move(RHS)), Allocator(std::move(RHS.Allocator)) {}<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/StringSet.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringSet.h?rev=254355&r1=254354&r2=254355&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/StringSet.h?rev=254355&r1=254354&r2=254355&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ADT/StringSet.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/StringSet.h Mon Nov 30 18:48:39 2015<br>
@@ -23,6 +23,11 @@ namespace llvm {<br>
class StringSet : public llvm::StringMap<char, AllocatorTy> {<br>
typedef llvm::StringMap<char, AllocatorTy> base;<br>
public:<br>
+ StringSet() = default;<br>
+ StringSet(std::initializer_list<StringRef> S) {<br>
+ for (StringRef X : S)<br>
+ insert(X);<br>
+ }<br>
<br>
std::pair<typename base::iterator, bool> insert(StringRef Key) {<br>
assert(!Key.empty());<br>
<br>
Added: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.cpp?rev=254355&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.cpp?rev=254355&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.cpp (added)<br>
+++ llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.cpp Mon Nov 30 18:48:39 2015<br>
@@ -0,0 +1,2 @@<br>
+struct foo { };<br>
+foo a;<br>
<br>
Added: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo?rev=254355&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo?rev=254355&view=auto</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo (added) and llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo Mon Nov 30 18:48:39 2015 differ<br>
<br>
Added: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.cpp?rev=254355&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.cpp?rev=254355&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.cpp (added)<br>
+++ llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.cpp Mon Nov 30 18:48:39 2015<br>
@@ -0,0 +1,3 @@<br>
+struct bar { };<br>
+void b(bar) {<br>
+}<br>
<br>
Added: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo?rev=254355&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo?rev=254355&view=auto</a><br>
==============================================================================<br>
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo (added) and llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo Mon Nov 30 18:48:39 2015 differ<br>
<br>
Added: llvm/trunk/test/tools/llvm-dwp/X86/lit.local.cfg<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/X86/lit.local.cfg?rev=254355&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/X86/lit.local.cfg?rev=254355&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-dwp/X86/lit.local.cfg (added)<br>
+++ llvm/trunk/test/tools/llvm-dwp/X86/lit.local.cfg Mon Nov 30 18:48:39 2015<br>
@@ -0,0 +1,4 @@<br>
+if not 'X86' in config.root.targets:<br>
+ config.unsupported = True<br>
+<br>
+config.suffixes = ['.test', '.cpp', '.m', '.s']<br>
<br>
Added: llvm/trunk/test/tools/llvm-dwp/X86/simple.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/X86/simple.test?rev=254355&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/X86/simple.test?rev=254355&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/tools/llvm-dwp/X86/simple.test (added)<br>
+++ llvm/trunk/test/tools/llvm-dwp/X86/simple.test Mon Nov 30 18:48:39 2015<br>
@@ -0,0 +1,58 @@<br>
+RUN: llvm-dwp %p/../Inputs/simple/a.dwo %p/../Inputs/simple/b.dwo -o %t<br>
+RUN: llvm-dwarfdump %t | FileCheck %s<br>
+<br>
+FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.<br>
+<br>
+DWP from non-type-unit debug info for these two translation units:<br>
+a.cpp:<br>
+ struct foo { };<br>
+ foo a;<br>
+<br>
+b.cpp:<br>
+ struct bar { };<br>
+ void b(bar) {<br>
+ }<br>
+<br>
+CHECK: .debug_abbrev.dwo contents:<br>
+CHECK: Abbrev table for offset: 0x00000000<br>
+CHECK: DW_TAG_compile_unit<br>
+CHECK: DW_TAG_variable<br>
+CHECK: DW_TAG_structure_type<br>
+CHECK: Abbrev table for offset: 0x00000031<br>
+CHECK: DW_TAG_compile_unit<br>
+CHECK: DW_TAG_structure_type<br>
+CHECK: DW_TAG_subprogram<br>
+CHECK: DW_TAG_formal_parameter<br>
+<br>
+CHECK: .debug_info.dwo contents:<br>
+CHECK: 0x00000000: Compile Unit: length = 0x00000025 version = 0x0004 abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x00000029)<br>
+CHECK: DW_TAG_compile_unit<br>
+CHECK: DW_AT_name {{.*}} "a.cpp"<br>
+CHECK: DW_TAG_variable<br>
+CHECK: DW_AT_name {{.*}} "a"<br>
+CHECK: DW_TAG_structure_type<br>
+CHECK: DW_AT_name {{.*}} "foo"<br>
+<br>
+FIXME: Using cu_index, identify that abbr_offset is 0x0031, not 0x0000<br>
+CHECK: 0x00000029: Compile Unit: length = 0x00000031 version = 0x0004 abbr_offset = 0x0000 addr_size = 0x08 (next unit at 0x0000005e)<br>
+FIXME: Using cu_index, use strings based on the right str index offset<br>
+CHECK: DW_AT_name {{.*}} "a.cpp"<br>
+FIXME: Using cu_index to find the right abbrevs at abbr_offset, this abbrevation should actually be structure_type<br>
+CHECK: DW_TAG_variable<br>
+<br>
+CHECK: .debug_cu_index contents:<br>
+FIXME: Emit and verify the cu_index contents<br>
+<br>
+CHECK: .debug_str.dwo contents:<br>
+CHECK: "clang version<br>
+CHECK: 0x[[ACPP:.*]]: "a.cpp"<br>
+FIXME: Remove duplicates<br>
+CHECK: "clang version<br>
+CHECK: 0x[[BCPP:.*]]: "b.cpp"<br>
+<br>
+CHECK: .debug_str_offsets.dwo contents:<br>
+CHECK: : 00000000<br>
+CHECK: : [[ACPP]]<br>
+CHECK: : 00000000<br>
+FIXME: Update str offset indexes, this should be BCPP \/<br>
+CHECK: : [[ACPP]]<br>
<br>
Modified: llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp?rev=254355&r1=254354&r2=254355&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp?rev=254355&r1=254354&r2=254355&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp (original)<br>
+++ llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp Mon Nov 30 18:48:39 2015<br>
@@ -1,2 +1,144 @@<br>
-int main() {<br>
+#include "llvm/ADT/STLExtras.h"<br>
+#include "llvm/ADT/StringSet.h"<br>
+#include "llvm/CodeGen/AsmPrinter.h"<br>
+#include "llvm/MC/MCAsmInfo.h"<br>
+#include "llvm/MC/MCContext.h"<br>
+#include "llvm/MC/MCInstrInfo.h"<br>
+#include "llvm/MC/MCObjectFileInfo.h"<br>
+#include "llvm/MC/MCRegisterInfo.h"<br>
+#include "llvm/MC/MCSectionELF.h"<br>
+#include "llvm/MC/MCStreamer.h"<br>
+#include "llvm/Object/ObjectFile.h"<br>
+#include "llvm/Support/Options.h"<br>
+#include "llvm/Support/FileSystem.h"<br>
+#include "llvm/Support/MemoryBuffer.h"<br>
+#include "llvm/Support/TargetRegistry.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+#include "llvm/Target/TargetMachine.h"<br>
+#include "llvm/Support/TargetSelect.h"<br>
+#include <memory><br>
+#include <list><br>
+#include <unordered_set><br>
+<br>
+using namespace llvm;<br>
+using namespace cl;<br>
+<br>
+OptionCategory DwpCategory("Specific Options");<br>
+static list<std::string> InputFiles(Positional, OneOrMore,<br>
+ desc("<input files>"), cat(DwpCategory));<br>
+<br>
+static opt<std::string> OutputFilename(Required, "o", desc("Specify the output file."),<br>
+ value_desc("filename"), cat(DwpCategory));<br>
+<br>
+static int error(const Twine &Error, const Twine &Context) {<br>
+ errs() << Twine("while processing ") + Context + ":\n";<br>
+ errs() << Twine("error: ") + Error + "\n";<br>
+ return 1;<br>
+}<br>
+<br>
+static std::error_code writeSection(MCStreamer &Out, MCSection *OutSection,<br>
+ const object::SectionRef &Sym) {<br>
+ StringRef Contents;<br>
+ if (auto Err = Sym.getContents(Contents))<br>
+ return Err;<br>
+ Out.SwitchSection(OutSection);<br>
+ Out.EmitBytes(Contents);<br>
+ return std::error_code();<br>
+}<br>
+<br>
+static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {<br>
+ for (const auto &Input : Inputs) {<br>
+ auto ErrOrObj = object::ObjectFile::createObjectFile(Input);<br>
+ if (!ErrOrObj)<br>
+ return ErrOrObj.getError();<br>
+ const auto *Obj = ErrOrObj->getBinary();<br>
+ for (const auto &Section : Obj->sections()) {<br>
+ const auto &MCOFI = *Out.getContext().getObjectFileInfo();<br>
+ static const StringMap<MCSection *> KnownSections = {<br>
+ {"debug_info.dwo", MCOFI.getDwarfInfoDWOSection()},<br>
+ {"debug_types.dwo", MCOFI.getDwarfTypesDWOSection()},<br>
+ {"debug_str_offsets.dwo", MCOFI.getDwarfStrOffDWOSection()},<br>
+ {"debug_str.dwo", MCOFI.getDwarfStrDWOSection()},<br>
+ {"debug_loc.dwo", MCOFI.getDwarfLocDWOSection()},<br>
+ {"debug_abbrev.dwo", MCOFI.getDwarfAbbrevDWOSection()}};<br></blockquote><div><br></div><div>How can this be `static` when it depends on a local variable? I'm actually somewhat surprised it compiles.</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ StringRef Name;<br>
+ if (std::error_code Err = Section.getName(Name))<br>
+ return Err;<br>
+ if (MCSection *OutSection =<br>
+ KnownSections.lookup(Name.substr(Name.find_first_not_of("._"))))<br>
+ if (auto Err = writeSection(Out, OutSection, Section))<br>
+ return Err;<br>
+ }<br>
+ }<br>
+ return std::error_code();<br>
+}<br>
+<br>
+int main(int argc, char** argv) {<br>
+<br>
+ ParseCommandLineOptions(argc, argv, "merge split dwarf (.dwo) files");<br>
+<br>
+ llvm::InitializeAllTargetInfos();<br>
+ llvm::InitializeAllTargetMCs();<br>
+ llvm::InitializeAllTargets();<br>
+ llvm::InitializeAllAsmPrinters();<br>
+<br>
+ std::string ErrorStr;<br>
+ StringRef Context = "dwarf streamer init";<br>
+<br>
+ Triple TheTriple("x86_64-linux-gnu");<br>
+<br>
+ // Get the target.<br>
+ const Target *TheTarget =<br>
+ TargetRegistry::lookupTarget("", TheTriple, ErrorStr);<br>
+ if (!TheTarget)<br>
+ return error(ErrorStr, Context);<br>
+ std::string TripleName = TheTriple.getTriple();<br>
+<br>
+ // Create all the MC Objects.<br>
+ std::unique_ptr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TripleName));<br>
+ if (!MRI)<br>
+ return error(Twine("no register info for target ") + TripleName, Context);<br>
+<br>
+ std::unique_ptr<MCAsmInfo> MAI(TheTarget->createMCAsmInfo(*MRI, TripleName));<br>
+ if (!MAI)<br>
+ return error("no asm info for target " + TripleName, Context);<br>
+<br>
+ MCObjectFileInfo MOFI;<br>
+ MCContext MC(MAI.get(), MRI.get(), &MOFI);<br>
+ MOFI.InitMCObjectFileInfo(TheTriple, Reloc::Default, CodeModel::Default,<br>
+ MC);<br>
+<br>
+ auto MAB = TheTarget->createMCAsmBackend(*MRI, TripleName, "");<br>
+ if (!MAB)<br>
+ return error("no asm backend for target " + TripleName, Context);<br>
+<br>
+ std::unique_ptr<MCInstrInfo> MII(TheTarget->createMCInstrInfo());<br>
+ if (!MII)<br>
+ return error("no instr info info for target " + TripleName, Context);<br>
+<br>
+ std::unique_ptr<MCSubtargetInfo> MSTI(<br>
+ TheTarget->createMCSubtargetInfo(TripleName, "", ""));<br>
+ if (!MSTI)<br>
+ return error("no subtarget info for target " + TripleName, Context);<br>
+<br>
+ MCCodeEmitter *MCE = TheTarget->createMCCodeEmitter(*MII, *MRI, MC);<br>
+ if (!MCE)<br>
+ return error("no code emitter for target " + TripleName, Context);<br>
+<br>
+ // Create the output file.<br>
+ std::error_code EC;<br>
+ raw_fd_ostream OutFile(OutputFilename, EC, sys::fs::F_None);<br>
+ if (EC)<br>
+ return error(Twine(OutputFilename) + ": " + EC.message(), Context);<br>
+<br>
+ std::unique_ptr<MCStreamer> MS(TheTarget->createMCObjectStreamer(<br>
+ TheTriple, MC, *MAB, OutFile, MCE, *MSTI, false,<br>
+ /*DWARFMustBeAtTheEnd*/ false));<br>
+ if (!MS)<br>
+ return error("no object streamer for target " + TripleName, Context);<br>
+<br>
+ if (auto Err = write(*MS, InputFiles))<br>
+ return error(Err.message(), "Writing DWP file");<br>
+<br>
+ MS->Finish();<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>