[llvm] eb33e46 - [memprof] Clean up IndexedMemProfReader (NFC) (#94710)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 7 07:04:22 PDT 2024
Author: Kazu Hirata
Date: 2024-06-07T07:04:17-07:00
New Revision: eb33e462ba536735b3d8449a81009a253f0f43bc
URL: https://github.com/llvm/llvm-project/commit/eb33e462ba536735b3d8449a81009a253f0f43bc
DIFF: https://github.com/llvm/llvm-project/commit/eb33e462ba536735b3d8449a81009a253f0f43bc.diff
LOG: [memprof] Clean up IndexedMemProfReader (NFC) (#94710)
Parameter "Version" is confusing in deserializeV012 and deserializeV3
because we also have member variable "Version". Fortunately,
parameter "Version" and member variable "Version" always have the same
value because IndexedMemProfReader::deserialize initializes the member
variable and passes it to deserializeV012 and deserializeV3.
This patch removes the parameter.
Added:
Modified:
llvm/include/llvm/ProfileData/InstrProfReader.h
llvm/lib/ProfileData/InstrProfReader.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ProfileData/InstrProfReader.h b/llvm/include/llvm/ProfileData/InstrProfReader.h
index 1c3d4c795f631..34dba870d8da3 100644
--- a/llvm/include/llvm/ProfileData/InstrProfReader.h
+++ b/llvm/include/llvm/ProfileData/InstrProfReader.h
@@ -665,9 +665,8 @@ class IndexedMemProfReader {
const unsigned char *CallStackBase = nullptr;
Error deserializeV012(const unsigned char *Start, const unsigned char *Ptr,
- uint64_t FirstWord, memprof::IndexedVersion Version);
- Error deserializeV3(const unsigned char *Start, const unsigned char *Ptr,
- memprof::IndexedVersion Version);
+ uint64_t FirstWord);
+ Error deserializeV3(const unsigned char *Start, const unsigned char *Ptr);
public:
IndexedMemProfReader() = default;
diff --git a/llvm/lib/ProfileData/InstrProfReader.cpp b/llvm/lib/ProfileData/InstrProfReader.cpp
index 8298d3d372951..7758363d9c952 100644
--- a/llvm/lib/ProfileData/InstrProfReader.cpp
+++ b/llvm/lib/ProfileData/InstrProfReader.cpp
@@ -1204,8 +1204,7 @@ IndexedInstrProfReader::readSummary(IndexedInstrProf::ProfVersion Version,
Error IndexedMemProfReader::deserializeV012(const unsigned char *Start,
const unsigned char *Ptr,
- uint64_t FirstWord,
- memprof::IndexedVersion Version) {
+ uint64_t FirstWord) {
// The value returned from RecordTableGenerator.Emit.
const uint64_t RecordTableOffset =
Version == memprof::Version0
@@ -1259,8 +1258,7 @@ Error IndexedMemProfReader::deserializeV012(const unsigned char *Start,
}
Error IndexedMemProfReader::deserializeV3(const unsigned char *Start,
- const unsigned char *Ptr,
- memprof::IndexedVersion Version) {
+ const unsigned char *Ptr) {
// The offset in the stream right before invoking
// CallStackTableGenerator.Emit.
const uint64_t CallStackPayloadOffset =
@@ -1285,7 +1283,7 @@ Error IndexedMemProfReader::deserializeV3(const unsigned char *Start,
MemProfRecordTable.reset(MemProfRecordHashTable::Create(
/*Buckets=*/Start + RecordTableOffset,
/*Payload=*/Start + RecordPayloadOffset,
- /*Base=*/Start, memprof::RecordLookupTrait(Version, Schema)));
+ /*Base=*/Start, memprof::RecordLookupTrait(memprof::Version3, Schema)));
return Error::success();
}
@@ -1323,11 +1321,11 @@ Error IndexedMemProfReader::deserialize(const unsigned char *Start,
case memprof::Version0:
case memprof::Version1:
case memprof::Version2:
- if (Error E = deserializeV012(Start, Ptr, FirstWord, Version))
+ if (Error E = deserializeV012(Start, Ptr, FirstWord))
return E;
break;
case memprof::Version3:
- if (Error E = deserializeV3(Start, Ptr, Version))
+ if (Error E = deserializeV3(Start, Ptr))
return E;
break;
}
More information about the llvm-commits
mailing list