Skip to content

A few cleanups for flatv1 #3555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 18, 2021
Merged

A few cleanups for flatv1 #3555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a7cd9a
CAS.o/FlatV1: Drop EdgeListRef to simplify
dexonsmith Nov 17, 2021
2ae8bb7
CAS.o/FlatV1: Avoid storing number of edges twice
dexonsmith Nov 17, 2021
d076e96
CAS.o/FlatV1: Remove dead code for ForceDirectIndex
dexonsmith Nov 18, 2021
f8c0acb
CAS.o/FlatV1: Remove --direct-index-encode, which is not profitable …
dexonsmith Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions llvm/include/llvm/CASObjectFormats/FlatV1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,28 +196,6 @@ class SectionRef : public SpecificRef<SectionRef> {
explicit SectionRef(SpecificRefT Ref) : SpecificRefT(Ref) {}
};

class EdgeListRef : public SpecificRef<EdgeListRef> {
using SpecificRefT = SpecificRef<EdgeListRef>;
friend class SpecificRef<EdgeListRef>;

public:
static constexpr StringLiteral KindString = "cas.o:edgelist";

static Expected<EdgeListRef> create(CompileUnitBuilder &CUB,
ArrayRef<const jitlink::Edge *> Edges);
static Expected<EdgeListRef> get(Expected<ObjectFormatNodeRef> Ref);
static Expected<EdgeListRef> get(const ObjectFileSchema &Schema,
cas::CASID ID) {
return get(Schema.getNode(ID));
}

Error materialize(LinkGraphBuilder &LGB, jitlink::Block &Parent,
unsigned BlockIdx) const;

private:
explicit EdgeListRef(SpecificRefT Ref) : SpecificRefT(Ref) {}
};

class BlockRef : public SpecificRef<BlockRef> {
using SpecificRefT = SpecificRef<BlockRef>;
friend class SpecificRef<BlockRef>;
Expand Down Expand Up @@ -336,7 +314,6 @@ class CompileUnitBuilder {
: CAS(Schema.CAS), Schema(Schema), TT(Target), DebugOS(DebugOS) {}

Error createAndReferenceName(StringRef S);
Error createAndReferenceEdges(ArrayRef<const jitlink::Edge *> Edges);
Error createAndReferenceContent(StringRef Content);

Error createSection(const jitlink::Section &S);
Expand Down Expand Up @@ -446,7 +423,6 @@ class LinkGraphBuilder {
jitlink::Block *Block;
Optional<BlockRef> Ref;
Optional<data::BlockData> Data;
Optional<data::FixupList::iterator> CurrentFixup;
unsigned BlockIdx = 0;
unsigned Remaining = 0;
};
Expand Down
138 changes: 13 additions & 125 deletions llvm/lib/CASObjectFormats/FlatV1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,10 @@ const StringLiteral NameRef::KindString;
const StringLiteral SectionRef::KindString;
const StringLiteral BlockRef::KindString;
const StringLiteral SymbolRef::KindString;
const StringLiteral EdgeListRef::KindString;
const StringLiteral BlockContentRef::KindString;

void ObjectFileSchema::anchor() {}

cl::opt<bool> UseEdgeList("use-edge-list",
cl::desc("Put edges in a separate cas node"),
cl::init(false));
cl::opt<bool> DirectIndexEncode("direct-index-encode",
cl::desc("Encode all indexes directly"),
cl::init(false));
cl::opt<bool>
UseIndirectSymbolName("indirect-symbol-name",
cl::desc("Encode symbol name into its own node"),
Expand Down Expand Up @@ -89,8 +82,7 @@ Error ObjectFileSchema::fillCache() {
StringRef AllKindStrings[] = {
BlockRef::KindString, CompileUnitRef::KindString,
NameRef::KindString, SectionRef::KindString,
SymbolRef::KindString, EdgeListRef::KindString,
BlockContentRef::KindString,
SymbolRef::KindString, BlockContentRef::KindString,
};
cas::CASID Refs[] = {*RootKindID};
SmallVector<cas::CASID> IDs = {*RootKindID};
Expand Down Expand Up @@ -301,26 +293,15 @@ Expected<SectionRef> SectionRef::get(Expected<ObjectFormatNodeRef> Ref) {
return SectionRef(*Specific);
}

Expected<EdgeListRef> EdgeListRef::get(Expected<ObjectFormatNodeRef> Ref) {
auto Specific = SpecificRefT::getSpecific(std::move(Ref));
if (!Specific)
return Specific.takeError();

return EdgeListRef(*Specific);
}

static Error encodeEdge(CompileUnitBuilder &CUB, SmallVectorImpl<char> &Data,
const jitlink::Edge *E, bool ForceDirectIndex = false) {
const jitlink::Edge *E) {

auto SymbolIndex = CUB.getSymbolIndex(E->getTarget());
if (!SymbolIndex)
return SymbolIndex.takeError();

unsigned IdxAndHasAddend = *SymbolIndex << 1 | (E->getAddend() != 0);
if (!DirectIndexEncode && !ForceDirectIndex)
CUB.encodeIndex(IdxAndHasAddend);
else
encoding::writeVBR8(IdxAndHasAddend, Data);
CUB.encodeIndex(IdxAndHasAddend);

if (E->getAddend() != 0)
encoding::writeVBR8(E->getAddend(), Data);
Expand All @@ -329,12 +310,8 @@ static Error encodeEdge(CompileUnitBuilder &CUB, SmallVectorImpl<char> &Data,

static Error decodeEdge(LinkGraphBuilder &LGB, StringRef &Data,
jitlink::Block &Parent, unsigned BlockIdx,
bool ForceDirectIndex = false) {
unsigned SymbolIdx;
if (!DirectIndexEncode && !ForceDirectIndex)
SymbolIdx = LGB.nextIdxForBlock(BlockIdx);
else if (auto E = encoding::consumeVBR8(Data, SymbolIdx))
return E;
const data::Fixup &Fixup) {
unsigned SymbolIdx = LGB.nextIdxForBlock(BlockIdx);

bool HasAddend = SymbolIdx & 1U;
auto Symbol = LGB.getSymbol(SymbolIdx >> 1);
Expand All @@ -350,49 +327,11 @@ static Error decodeEdge(LinkGraphBuilder &LGB, StringRef &Data,
if (!BlockInfo)
return BlockInfo.takeError();

auto Fixup = **BlockInfo->CurrentFixup;
if (*BlockInfo->CurrentFixup != BlockInfo->Data->getFixups().end())
++*BlockInfo->CurrentFixup;

Parent.addEdge(Fixup.Kind, Fixup.Offset, **Symbol, Addend);

return Error::success();
}

Expected<EdgeListRef>
EdgeListRef::create(CompileUnitBuilder &CUB,
ArrayRef<const jitlink::Edge *> Edges) {
auto B = Builder::startNode(CUB.Schema, KindString);
if (!B)
return B.takeError();

encoding::writeVBR8(Edges.size(), B->Data);
for (const auto *E : Edges) {
// EdgeList is too "nested" to encode index in CU.
if (auto Err = encodeEdge(CUB, B->Data, E, true))
return std::move(Err);
}

return get(B->build());
}

Error EdgeListRef::materialize(LinkGraphBuilder &LGB, jitlink::Block &Parent,
unsigned BlockIdx) const {
auto Remaining = getData();

unsigned EdgeSize;
auto E = encoding::consumeVBR8(Remaining, EdgeSize);
if (E)
return E;

for (unsigned I = 0; I < EdgeSize; ++I) {
// EdgeList is too "nested" to encode index in CU.
if (auto Err = decodeEdge(LGB, Remaining, Parent, BlockIdx, true))
return Err;
}
return Error::success();
}

Expected<BlockRef> BlockRef::create(CompileUnitBuilder &CUB,
const jitlink::Block &Block) {
Expected<Builder> B = Builder::startNode(CUB.Schema, KindString);
Expand All @@ -403,10 +342,7 @@ Expected<BlockRef> BlockRef::create(CompileUnitBuilder &CUB,
auto SectionIndex = CUB.getSectionIndex(Block.getSection());
if (!SectionIndex)
return SectionIndex.takeError();
if (!DirectIndexEncode)
CUB.encodeIndex(*SectionIndex);
else
encoding::writeVBR8(*SectionIndex, B->Data);
CUB.encodeIndex(*SectionIndex);

// Do a simple sorting based on offset so it has stable ordering for the same
// block.
Expand Down Expand Up @@ -458,14 +394,6 @@ Expected<BlockRef> BlockRef::create(CompileUnitBuilder &CUB,
B->Data.append(BlockData);
}

// Encode edges.
if (UseEdgeList) {
if (auto E = CUB.createAndReferenceEdges(Edges))
return std::move(E);
return get(B->build());
}

encoding::writeVBR8(Block.edges_size(), B->Data);
for (const auto *E : Edges) {
// Nest the Edge in block.
if (auto Err = encodeEdge(CUB, B->Data, E))
Expand All @@ -479,10 +407,7 @@ Error BlockRef::materializeBlock(LinkGraphBuilder &LGB,
unsigned BlockIdx) const {
uint64_t SectionIdx;
auto Remaining = getData();
if (!DirectIndexEncode)
SectionIdx = LGB.nextIdxForBlock(BlockIdx);
else if (auto E = encoding::consumeVBR8(Remaining, SectionIdx))
return E;
SectionIdx = LGB.nextIdxForBlock(BlockIdx);

auto SectionInfo = LGB.getSectionInfo(SectionIdx);
if (!SectionInfo)
Expand Down Expand Up @@ -510,8 +435,6 @@ Error BlockRef::materializeBlock(LinkGraphBuilder &LGB,

BlockInfo->Data.emplace(ContentData);
auto &Block = *BlockInfo->Data;
BlockInfo->CurrentFixup.emplace(BlockInfo->Data->getFixups().begin());

auto Address =
getAlignedAddress(*SectionInfo, Block.getSize(), Block.getAlignment(),
Block.getAlignmentOffset());
Expand All @@ -524,9 +447,7 @@ Error BlockRef::materializeBlock(LinkGraphBuilder &LGB,
Block.getAlignment(), Block.getAlignmentOffset());

BlockInfo->Block = &B;
// When not embedding, use Remaining to indicate if there is an EdgeList to
// decode.
BlockInfo->Remaining = !UseEdgeList ? Remaining.size() : 1;
BlockInfo->Remaining = Remaining.size();
return Error::success();
}

Expand All @@ -540,25 +461,10 @@ Error BlockRef::materializeEdges(LinkGraphBuilder &LGB,
if (!BlockInfo->Remaining)
return Error::success();

if (UseEdgeList) {
auto Edge = LGB.getNode<EdgeListRef>(BlockIdx);
if (!Edge)
return Edge.takeError();

if (auto Err = Edge->materialize(LGB, *BlockInfo->Block, BlockIdx))
return Err;

return Error::success();
}

auto Remaining = getData().take_back(BlockInfo->Remaining);
unsigned EdgeSize;
auto E = encoding::consumeVBR8(Remaining, EdgeSize);
if (E)
return E;

for (unsigned I = 0; I < EdgeSize; ++I) {
if (auto Err = decodeEdge(LGB, Remaining, *BlockInfo->Block, BlockIdx))
for (const data::Fixup &Fixup : BlockInfo->Data->getFixups()) {
if (Error Err =
decodeEdge(LGB, Remaining, *BlockInfo->Block, BlockIdx, Fixup))
return Err;
}

Expand Down Expand Up @@ -616,10 +522,7 @@ static Error encodeSymbol(CompileUnitBuilder &CUB, SmallVectorImpl<char> &Data,
auto BlockIndex = CUB.getBlockIndex(S.getBlock());
if (!BlockIndex)
return BlockIndex.takeError();
if (!DirectIndexEncode)
CUB.encodeIndex(*BlockIndex);
else
encoding::writeVBR8(*BlockIndex, Data);
CUB.encodeIndex(*BlockIndex);
}
return Error::success();
}
Expand Down Expand Up @@ -667,12 +570,7 @@ static Error decodeSymbol(LinkGraphBuilder &LGB, StringRef &Data,
bool IsCallable = Bits & (1U << 5);

unsigned BlockIdx;
if (!DirectIndexEncode) {
auto Idx = LGB.nextIdx();
if (!Idx)
return Idx.takeError();
BlockIdx = *Idx;
} else if (auto E = encoding::consumeVBR8(Data, BlockIdx))
if (Error E = LGB.nextIdx().moveInto(BlockIdx))
return E;

auto BlockInfo = LGB.getBlockInfo(BlockIdx);
Expand Down Expand Up @@ -792,16 +690,6 @@ Error CompileUnitBuilder::createAndReferenceName(StringRef Name) {
return Error::success();
}

Error CompileUnitBuilder::createAndReferenceEdges(
ArrayRef<const jitlink::Edge *> Edges) {
auto Ref = EdgeListRef::create(*this, Edges);
if (!Ref)
return Ref.takeError();
// EdgeListRef is not top level record, always record here.
recordNode(*Ref);
return Error::success();
}

Error CompileUnitBuilder::createAndReferenceContent(StringRef Content) {
auto Ref = BlockContentRef::create(*this, Content);
if (!Ref)
Expand Down