Skip to content

Commit efc9dd4

Browse files
[llvm-cov][WebAssembly] Read __llvm_prf_names from data segments
On WebAssembly, most coverage metadata contents read by llvm-cov (like `__llvm_covmap` and `__llvm_covfun`) are stored in custom sections because they are not referenced at runtime. However, `__llvm_prf_names` is referenced at runtime by the profile runtime library and is read by llvm-cov post-processing tools, so it needs to be stored in a data segment, which is allocatable at runtime and accessible by tools as long as "name" section is present in the binary. This patch changes the way llvm-cov reads `__llvm_prf_names` on WebAssembly. Instead of looking for a section, it looks for a data segment with the same name.
1 parent f2ad45c commit efc9dd4

File tree

4 files changed

+66
-9
lines changed

4 files changed

+66
-9
lines changed

llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
#include "llvm/ADT/SmallVector.h"
1919
#include "llvm/ADT/Statistic.h"
2020
#include "llvm/ADT/StringRef.h"
21+
#include "llvm/BinaryFormat/Wasm.h"
2122
#include "llvm/Object/Archive.h"
2223
#include "llvm/Object/Binary.h"
2324
#include "llvm/Object/COFF.h"
2425
#include "llvm/Object/Error.h"
2526
#include "llvm/Object/MachOUniversal.h"
2627
#include "llvm/Object/ObjectFile.h"
28+
#include "llvm/Object/Wasm.h"
2729
#include "llvm/ProfileData/InstrProf.h"
2830
#include "llvm/Support/Casting.h"
2931
#include "llvm/Support/Compression.h"
@@ -1077,6 +1079,53 @@ lookupSections(ObjectFile &OF, InstrProfSectKind IPSK) {
10771079
return Sections;
10781080
}
10791081

1082+
/// Find a section that matches \p Name and is allocatable at runtime.
1083+
///
1084+
/// Returns the contents of the section and its start offset in the object file.
1085+
static Expected<std::pair<StringRef, uint64_t>>
1086+
lookupAllocatableSection(ObjectFile &OF, InstrProfSectKind IPSK) {
1087+
// On Wasm, allocatable sections can live only in data segments.
1088+
if (auto *WOF = dyn_cast<WasmObjectFile>(&OF)) {
1089+
std::vector<const WasmSegment *> Segments;
1090+
auto ObjFormat = OF.getTripleObjectFormat();
1091+
auto Name =
1092+
getInstrProfSectionName(IPSK, ObjFormat, /*AddSegmentInfo=*/false);
1093+
for (const auto &DebugName : WOF->debugNames()) {
1094+
if (DebugName.Type != wasm::NameType::DATA_SEGMENT ||
1095+
DebugName.Name != Name)
1096+
continue;
1097+
if (DebugName.Index >= WOF->dataSegments().size())
1098+
return make_error<CoverageMapError>(coveragemap_error::malformed);
1099+
auto &Segment = WOF->dataSegments()[DebugName.Index];
1100+
Segments.push_back(&Segment);
1101+
}
1102+
if (Segments.empty())
1103+
return make_error<CoverageMapError>(coveragemap_error::no_data_found);
1104+
if (Segments.size() != 1)
1105+
return make_error<CoverageMapError>(coveragemap_error::malformed);
1106+
1107+
const auto &Segment = *Segments.front();
1108+
auto &Data = Segment.Data;
1109+
StringRef Content(reinterpret_cast<const char *>(Data.Content.data()),
1110+
Data.Content.size());
1111+
return std::make_pair(Content, Segment.SectionOffset);
1112+
}
1113+
1114+
// On other object file types, delegate to lookupSections to find the section.
1115+
auto Sections = lookupSections(OF, IPSK);
1116+
if (!Sections)
1117+
return Sections.takeError();
1118+
if (Sections->size() != 1)
1119+
return make_error<CoverageMapError>(
1120+
coveragemap_error::malformed,
1121+
"the size of coverage mapping section is not one");
1122+
auto &Section = Sections->front();
1123+
auto ContentsOrErr = Section.getContents();
1124+
if (!ContentsOrErr)
1125+
return ContentsOrErr.takeError();
1126+
return std::make_pair(*ContentsOrErr, Section.getAddress());
1127+
}
1128+
10801129
static Expected<std::unique_ptr<BinaryCoverageReader>>
10811130
loadBinaryFormat(std::unique_ptr<Binary> Bin, StringRef Arch,
10821131
StringRef CompilationDir = "",
@@ -1107,23 +1156,20 @@ loadBinaryFormat(std::unique_ptr<Binary> Bin, StringRef Arch,
11071156

11081157
// Look for the sections that we are interested in.
11091158
auto ProfileNames = std::make_unique<InstrProfSymtab>();
1110-
std::vector<SectionRef> NamesSectionRefs;
11111159
// If IPSK_name is not found, fallback to search for IPK_covname, which is
11121160
// used when binary correlation is enabled.
1113-
auto NamesSection = lookupSections(*OF, IPSK_name);
1161+
auto NamesSection = lookupAllocatableSection(*OF, IPSK_name);
11141162
if (auto E = NamesSection.takeError()) {
11151163
consumeError(std::move(E));
1116-
NamesSection = lookupSections(*OF, IPSK_covname);
1164+
NamesSection = lookupAllocatableSection(*OF, IPSK_covname);
11171165
if (auto E = NamesSection.takeError())
11181166
return std::move(E);
11191167
}
1120-
NamesSectionRefs = *NamesSection;
11211168

1122-
if (NamesSectionRefs.size() != 1)
1123-
return make_error<CoverageMapError>(
1124-
coveragemap_error::malformed,
1125-
"the size of coverage mapping section is not one");
1126-
if (Error E = ProfileNames->create(NamesSectionRefs.back()))
1169+
uint64_t NamesAddress;
1170+
StringRef NamesContent;
1171+
std::tie(NamesContent, NamesAddress) = *NamesSection;
1172+
if (Error E = ProfileNames->create(NamesContent, NamesAddress))
11271173
return std::move(E);
11281174

11291175
auto CoverageSection = lookupSections(*OF, IPSK_covmap);
Binary file not shown.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
__main_argc_argv
2+
0x0
3+
1
4+
100

llvm/test/tools/llvm-cov/binary-formats.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@ int main(int argc, const char *argv[]) {}
1010
// RUN: llvm-cov show %S/Inputs/binary-formats.v3.macho64l -instr-profile %t.profdata -path-equivalence=/tmp,%S %s | FileCheck %s
1111
// RUN: llvm-cov show %S/Inputs/binary-formats.v6.linux64l -instr-profile %t.profdata -path-equivalence=/tmp,%S %s | FileCheck %s
1212

13+
// RUN: llvm-profdata merge %S/Inputs/binary-formats.wasm.proftext -o %t.wasm.profdata
14+
// NOTE: The wasm binary is built with the following command:
15+
// clang -target wasm32-unknown-wasi %s -o %S/Inputs/binary-formats.v6.wasm32 \
16+
// -mllvm -enable-name-compression=false \
17+
// -fprofile-instr-generate -fcoverage-mapping -lwasi-emulated-getpid -lwasi-emulated-mman
18+
// RUN: llvm-cov show %S/Inputs/binary-formats.v6.wasm32 -instr-profile %t.wasm.profdata -path-equivalence=/tmp,%S %s | FileCheck %s
19+
1320
// RUN: llvm-cov export %S/Inputs/binary-formats.macho64l -instr-profile %t.profdata | FileCheck %S/Inputs/binary-formats.canonical.json

0 commit comments

Comments
 (0)