Skip to content

[memprof] Omit the key length for the record table #89527

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 1 commit into from
Apr 23, 2024
Merged

[memprof] Omit the key length for the record table #89527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions llvm/include/llvm/ProfileData/MemProf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,16 @@ class RecordLookupTrait {

hash_value_type ComputeHash(uint64_t K) { return K; }

static std::pair<offset_type, offset_type>
std::pair<offset_type, offset_type>
ReadKeyDataLength(const unsigned char *&D) {
using namespace support;

// Starting with Version2, we don't read the key length because it is a
// constant.
offset_type KeyLen =
endian::readNext<offset_type, llvm::endianness::little>(D);
Version < Version2
? endian::readNext<offset_type, llvm::endianness::little>(D)
: sizeof(uint64_t);
offset_type DataLen =
endian::readNext<offset_type, llvm::endianness::little>(D);
return std::make_pair(KeyLen, DataLen);
Expand Down Expand Up @@ -534,7 +538,9 @@ class RecordWriterTrait {

endian::Writer LE(Out, llvm::endianness::little);
offset_type N = sizeof(K);
LE.write<offset_type>(N);
// Starting with Version2, we omit the key length because it is a constant.
if (Version < Version2)
LE.write<offset_type>(N);
offset_type M = V.serializedSize(Version);
LE.write<offset_type>(M);
return std::make_pair(N, M);
Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/Support/OnDiskHashTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ template <typename Info> class OnDiskChainedHashTable {

// Determine the length of the key and the data.
const std::pair<offset_type, offset_type> &L =
Info::ReadKeyDataLength(Items);
InfoPtr->ReadKeyDataLength(Items);
offset_type ItemLen = L.first + L.second;

// Compare the hashes. If they are not the same, skip the entry entirely.
Expand Down