This is an archive of the discontinued LLVM Phabricator instance.

Differential D32657

Change the format of the map file.
ClosedPublic

Authored by ruiu on Apr 28 2017, 1:03 PM.

Details

Reviewers
• rafael
Commits
rG3012b371fd11: Change the format of the map file.
rLLD301683: Change the format of the map file.
rL301683: Change the format of the map file.
Summary

Previously, we printed out input sections and input files in
separate columns as shown below.

Address          Size             Align Out     In      File    Symbol
0000000000201000 0000000000000015     4 .text
0000000000201000 000000000000000e     4         .text
0000000000201000 000000000000000e     4                 foo.o
0000000000201000 0000000000000000     0                         _start
0000000000201005 0000000000000000     0                         f(int)
000000000020100e 0000000000000000     0                         local
0000000000201010 0000000000000002     4                 bar.o
0000000000201010 0000000000000000     0                         foo
0000000000201011 0000000000000000     0                         bar

This format doesn't make much sense because for each input section,
there's always exactly one input file. This patch changes the format
to this.

Address          Size             Align Out     In      Symbol
0000000000201000 0000000000000015     4 .text
0000000000201000 000000000000000e     4         foo.o:(.text)
0000000000201000 0000000000000000     0                 _start
0000000000201005 0000000000000000     0                 f(int)
000000000020100e 0000000000000000     0                 local
0000000000201010 0000000000000002     4         bar.o:(.text)
0000000000201010 0000000000000000     0                 foo
0000000000201011 0000000000000000     0                 bar

Diff Detail

Repository
rL LLVM

Event Timeline

ruiu created this revision.Apr 28 2017, 1:03 PM
Harbormaster completed remote builds in B5994: Diff 97147.Apr 28 2017, 1:03 PM
ruiu updated this revision to Diff 97148.Apr 28 2017, 1:16 PM
  • Updated the test to include archive file name.
Harbormaster completed remote builds in B5995: Diff 97148.Apr 28 2017, 1:16 PM
• rafael accepted this revision.Apr 28 2017, 1:44 PM

LGTM

This revision is now accepted and ready to land.Apr 28 2017, 1:44 PM
Closed by commit rL301683: Change the format of the map file. (authored by ruiu). · Explain WhyApr 28 2017, 1:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
49 lines
test/
ELF/
43 lines

Diff 97157

lld/trunk/ELF/MapFile.cpp

//===- MapFile.cpp --------------------------------------------------------===// //===- MapFile.cpp --------------------------------------------------------===//
// //
// The LLVM Linker // The LLVM Linker
// //
// This file is distributed under the University of Illinois Open Source // This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details. // License. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file implements the -Map option. It shows lists in order and // This file implements the -Map option. It shows lists in order and
// hierarchically the output sections, input sections, input files and // hierarchically the output sections, input sections, input files and
// symbol: // symbol:
// //
// Address Size Align Out In File Symbol // Address Size Align Out In Symbol
// =================================================================
// 00201000 00000015 4 .text // 00201000 00000015 4 .text
// 00201000 0000000e 4 .text // 00201000 0000000e 4 test.o:.text
// 00201000 0000000e 4 test.o
// 0020100e 00000000 0 local // 0020100e 00000000 0 local
// 00201005 00000000 0 f(int) // 00201005 00000000 0 f(int)
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "MapFile.h" #include "MapFile.h"
#include "InputFiles.h" #include "InputFiles.h"
#include "Strings.h" #include "Strings.h"
#include "SymbolTable.h" #include "SymbolTable.h"
#include "Threads.h" #include "Threads.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
using namespace llvm; using namespace llvm;
using namespace llvm::object; using namespace llvm::object;
using namespace lld; using namespace lld;
using namespace lld::elf; using namespace lld::elf;
namespace { namespace {
template <class ELFT> class PrettyPrinter { template <class ELFT> class PrettyPrinter {
public: public:
PrettyPrinter(); PrettyPrinter();
void print(raw_ostream &OS, ArrayRef<OutputSection *> OutputSections); void print(raw_ostream &OS, ArrayRef<OutputSection *> OutputSections);
private: private:
void writeInputSection(raw_ostream &OS, const InputSection *IS, void writeInputSection(raw_ostream &OS, const InputSection *IS);
StringRef &CurSection);
// Maps sections to their symbols. // Maps sections to their symbols.
DenseMap<const SectionBase *, SmallVector<DefinedRegular *, 4>> Symbols; DenseMap<const SectionBase *, SmallVector<DefinedRegular *, 4>> Symbols;
// Contains a string like this // Contains a string like this
// //
// 0020100e 00000000 0 f(int) // 0020100e 00000000 0 f(int)
// //
Show All 38 Linestemplate <class ELFT> PrettyPrinter<ELFT>::PrettyPrinter() {
// Construct a map from symbols to their stringified representations. // Construct a map from symbols to their stringified representations.
// Demangling symbols is slow, so we use the parallel-for. // Demangling symbols is slow, so we use the parallel-for.
std::vector<std::string> Str(Syms.size()); std::vector<std::string> Str(Syms.size());
parallelFor(0, Syms.size(), [&](size_t I) { parallelFor(0, Syms.size(), [&](size_t I) {
raw_string_ostream OS(Str[I]); raw_string_ostream OS(Str[I]);
writeHeader<ELFT>(OS, Syms[I]->getVA(), Syms[I]->template getSize<ELFT>(), writeHeader<ELFT>(OS, Syms[I]->getVA(), Syms[I]->template getSize<ELFT>(),
0); 0);
OS << indent(3) << toString(*Syms[I]) << '\n'; OS << indent(2) << toString(*Syms[I]) << '\n';
}); });
for (size_t I = 0, E = Syms.size(); I < E; ++I) for (size_t I = 0, E = Syms.size(); I < E; ++I)
SymStr[Syms[I]] = std::move(Str[I]); SymStr[Syms[I]] = std::move(Str[I]);
} }
template <class ELFT> template <class ELFT>
void PrettyPrinter<ELFT>::writeInputSection(raw_ostream &OS, void PrettyPrinter<ELFT>::writeInputSection(raw_ostream &OS,
const InputSection *IS, const InputSection *IS) {
StringRef &CurSection) {
// We want to print out a line like
//
// Address Size Align Out In File Symbol
// =================================================================
// 00201000 00000015 4 .text
// 00201000 0000000e 4 .text <----- THIS
// 00201000 0000000e 4 test.o
//
// once for each new input section.
if (IS->Name != CurSection) {
writeHeader<ELFT>(OS, IS->OutSec->Addr + IS->OutSecOff, IS->getSize(),
IS->Alignment);
OS << indent(1) << IS->Name << '\n';
CurSection = IS->Name;
}
// Write a line for each symbol defined in the given section. // Write a line for each symbol defined in the given section.
elf::ObjectFile<ELFT> *File = IS->template getFile<ELFT>();
if (!File)
return;
writeHeader<ELFT>(OS, IS->OutSec->Addr + IS->OutSecOff, IS->getSize(), writeHeader<ELFT>(OS, IS->OutSec->Addr + IS->OutSecOff, IS->getSize(),
IS->Alignment); IS->Alignment);
OS << indent(2) << toString(File) << '\n'; OS << indent(1) << toString(IS) << '\n';
for (DefinedRegular *Sym : Symbols[IS]) for (DefinedRegular *Sym : Symbols[IS])
OS << SymStr[Sym]; OS << SymStr[Sym];
} }
template <class ELFT> template <class ELFT>
void PrettyPrinter<ELFT>::print(raw_ostream &OS, void PrettyPrinter<ELFT>::print(raw_ostream &OS,
ArrayRef<OutputSection *> OutputSections) { ArrayRef<OutputSection *> OutputSections) {
// Print out the header line. // Print out the header line.
int W = ELFT::Is64Bits ? 16 : 8; int W = ELFT::Is64Bits ? 16 : 8;
OS << left_justify("Address", W) << ' ' << left_justify("Size", W) OS << left_justify("Address", W) << ' ' << left_justify("Size", W)
<< " Align Out In File Symbol\n"; << " Align Out In Symbol\n";
// Print out a mapfile. // Print out a mapfile.
for (OutputSection *Sec : OutputSections) { for (OutputSection *Sec : OutputSections) {
writeHeader<ELFT>(OS, Sec->Addr, Sec->Size, Sec->Alignment); writeHeader<ELFT>(OS, Sec->Addr, Sec->Size, Sec->Alignment);
OS << Sec->Name << '\n'; OS << Sec->Name << '\n';
StringRef CurSection;
for (InputSection *IS : Sec->Sections) for (InputSection *IS : Sec->Sections)
writeInputSection(OS, IS, CurSection); writeInputSection(OS, IS);
} }
} }
template <class ELFT> template <class ELFT>
void elf::writeMapFile(ArrayRef<OutputSection *> OutputSections) { void elf::writeMapFile(ArrayRef<OutputSection *> OutputSections) {
if (Config->MapFile.empty()) if (Config->MapFile.empty())
return; return;
Show All 12 Lines

lld/trunk/test/ELF/map-file.s

Show All 20 Lines
nop nop
.weak bar .weak bar
bar: bar:
.long bar - . .long bar - .
.long zed - . .long zed - .
local: local:
.comm common,4,16 .comm common,4,16
// CHECK: Address Size Align Out In File Symbol // CHECK: Address Size Align Out In Symbol
// CHECK-NEXT: 0000000000200158 0000000000000030 8 .eh_frame
// CHECK-NEXT: 0000000000200158 0000000000000030 8 .eh_frame // CHECK-NEXT: 0000000000200158 0000000000000030 8 .eh_frame
// CHECK-NEXT: 0000000000200158 0000000000000030 8 <internal>:(.eh_frame)
// CHECK-NEXT: 0000000000201000 0000000000000015 4 .text // CHECK-NEXT: 0000000000201000 0000000000000015 4 .text
// CHECK-NEXT: 0000000000201000 000000000000000e 4 .text // CHECK-NEXT: 0000000000201000 000000000000000e 4 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.text)
// CHECK-NEXT: 0000000000201000 000000000000000e 4 {{.*}}{{/|\\}}map-file.s.tmp1.o
// CHECK-NEXT: 0000000000201000 0000000000000000 0 _start // CHECK-NEXT: 0000000000201000 0000000000000000 0 _start
// CHECK-NEXT: 0000000000201005 0000000000000000 0 f(int) // CHECK-NEXT: 0000000000201005 0000000000000000 0 f(int)
// CHECK-NEXT: 000000000020100e 0000000000000000 0 local // CHECK-NEXT: 000000000020100e 0000000000000000 0 local
// CHECK-NEXT: 0000000000201010 0000000000000002 4 {{.*}}{{/|\\}}map-file.s.tmp2.o // CHECK-NEXT: 0000000000201010 0000000000000002 4 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text)
// CHECK-NEXT: 0000000000201010 0000000000000000 0 foo // CHECK-NEXT: 0000000000201010 0000000000000000 0 foo
// CHECK-NEXT: 0000000000201011 0000000000000000 0 bar // CHECK-NEXT: 0000000000201011 0000000000000000 0 bar
// CHECK-NEXT: 0000000000201012 0000000000000000 1 .text.zed // CHECK-NEXT: 0000000000201012 0000000000000000 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.text.zed)
// CHECK-NEXT: 0000000000201012 0000000000000000 1 {{.*}}{{/|\\}}map-file.s.tmp2.o
// CHECK-NEXT: 0000000000201012 0000000000000000 0 zed // CHECK-NEXT: 0000000000201012 0000000000000000 0 zed
// CHECK-NEXT: 0000000000201014 0000000000000000 4 .text // CHECK-NEXT: 0000000000201014 0000000000000000 4 {{.*}}{{/|\\}}map-file.s.tmp3.o:(.text)
// CHECK-NEXT: 0000000000201014 0000000000000000 4 {{.*}}{{/|\\}}map-file.s.tmp3.o
// CHECK-NEXT: 0000000000201014 0000000000000000 0 bah // CHECK-NEXT: 0000000000201014 0000000000000000 0 bah
// CHECK-NEXT: 0000000000201014 0000000000000001 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o) // CHECK-NEXT: 0000000000201014 0000000000000001 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o):(.text)
// CHECK-NEXT: 0000000000201014 0000000000000000 0 baz // CHECK-NEXT: 0000000000201014 0000000000000000 0 baz
// CHECK-NEXT: 0000000000202000 0000000000000004 16 .bss // CHECK-NEXT: 0000000000202000 0000000000000004 16 .bss
// CHECK-NEXT: 0000000000202000 0000000000000004 16 COMMON // CHECK-NEXT: 0000000000202000 0000000000000004 16 <internal>:(COMMON)
// CHECK-NEXT: 0000000000000000 0000000000000008 1 .comment
// CHECK-NEXT: 0000000000000000 0000000000000008 1 .comment // CHECK-NEXT: 0000000000000000 0000000000000008 1 .comment
// CHECK-NEXT: 0000000000000000 0000000000000008 1 <internal>:(.comment)
// CHECK-NEXT: 0000000000000000 00000000000000f0 8 .symtab // CHECK-NEXT: 0000000000000000 00000000000000f0 8 .symtab
// CHECK-NEXT: 0000000000000000 00000000000000f0 8 .symtab // CHECK-NEXT: 0000000000000000 00000000000000f0 8 <internal>:(.symtab)
// CHECK-NEXT: 0000000000000000 0000000000000039 1 .shstrtab // CHECK-NEXT: 0000000000000000 0000000000000039 1 .shstrtab
// CHECK-NEXT: 0000000000000000 0000000000000039 1 .shstrtab // CHECK-NEXT: 0000000000000000 0000000000000039 1 <internal>:(.shstrtab)
// CHECK-NEXT: 0000000000000000 000000000000002f 1 .strtab
// CHECK-NEXT: 0000000000000000 000000000000002f 1 .strtab // CHECK-NEXT: 0000000000000000 000000000000002f 1 .strtab
// CHECK-NEXT: 0000000000000000 000000000000002f 1 <internal>:(.strtab)
// RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o %t -Map=/ 2>&1 \ // RUN: not ld.lld %t1.o %t2.o %t3.o %t4.a -o %t -Map=/ 2>&1 \
// RUN: | FileCheck -check-prefix=FAIL %s // RUN: | FileCheck -check-prefix=FAIL %s
// FAIL: cannot open map file / // FAIL: cannot open map file /