Skip to content

[NFC][ADT] add NumDigitsBase10 to MathExtra and update some current users #165479

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[NFC][ADT] add NumDigitsBase10 to MathExtra and update some current users #165479

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
43 changes: 0 additions & 43 deletions llvm/include/llvm/DebugInfo/PDB/Native/FormatUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,49 +62,6 @@ LLVM_ABI std::string formatChunkKind(codeview::DebugSubsectionKind Kind,
LLVM_ABI std::string formatSymbolKind(codeview::SymbolKind K);
LLVM_ABI std::string formatTypeLeafKind(codeview::TypeLeafKind K);

/// Returns the number of digits in the given integer.
inline int NumDigits(uint64_t N) {
if (N < 10ULL)
return 1;
if (N < 100ULL)
return 2;
if (N < 1000ULL)
return 3;
if (N < 10000ULL)
return 4;
if (N < 100000ULL)
return 5;
if (N < 1000000ULL)
return 6;
if (N < 10000000ULL)
return 7;
if (N < 100000000ULL)
return 8;
if (N < 1000000000ULL)
return 9;
if (N < 10000000000ULL)
return 10;
if (N < 100000000000ULL)
return 11;
if (N < 1000000000000ULL)
return 12;
if (N < 10000000000000ULL)
return 13;
if (N < 100000000000000ULL)
return 14;
if (N < 1000000000000000ULL)
return 15;
if (N < 10000000000000000ULL)
return 16;
if (N < 100000000000000000ULL)
return 17;
if (N < 1000000000000000000ULL)
return 18;
if (N < 10000000000000000000ULL)
return 19;
return 20;
}

namespace detail {
template <typename T>
struct EndianAdapter final
Expand Down
9 changes: 5 additions & 4 deletions llvm/include/llvm/DebugInfo/PDB/Native/InputFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,17 +183,18 @@ Error iterateSymbolGroups(InputFile &Input, const PrintScope &HeaderScope,
if (Filters.DumpModi) {
uint32_t Modi = *Filters.DumpModi;
SymbolGroup SG(&Input, Modi);
return iterateOneModule(Input, withLabelWidth(HeaderScope, NumDigits(Modi)),
return iterateOneModule(Input,
withLabelWidth(HeaderScope, NumDigitsBase10(Modi)),
SG, Modi, Callback);
}

uint32_t I = 0;

for (const auto &SG : Input.symbol_groups()) {
if (shouldDumpSymbolGroup(I, SG, Filters))
if (auto Err =
iterateOneModule(Input, withLabelWidth(HeaderScope, NumDigits(I)),
SG, I, Callback))
if (auto Err = iterateOneModule(
Input, withLabelWidth(HeaderScope, NumDigitsBase10(I)), SG, I,
Callback))
return Err;

++I;
Expand Down
3 changes: 3 additions & 0 deletions llvm/include/llvm/Support/MathExtras.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,9 @@ using stack_float_t = volatile float;
using stack_float_t = float;
#endif

/// Returns the number of digits in the given integer.
int NumDigitsBase10(uint64_t X);

} // namespace llvm

#endif
2 changes: 1 addition & 1 deletion llvm/lib/DebugInfo/Symbolize/DIPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class SourceCode {
void format(raw_ostream &OS) {
if (!PrunedSource)
return;
size_t MaxLineNumberWidth = std::ceil(std::log10(LastLine));
size_t MaxLineNumberWidth = NumDigitsBase10(LastLine);
int64_t L = FirstLine;
for (size_t Pos = 0; Pos < PrunedSource->size(); ++L) {
size_t PosEnd = PrunedSource->find('\n', Pos);
Expand Down
35 changes: 35 additions & 0 deletions llvm/lib/Support/MathExtras.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,39 @@ namespace llvm {
const float huge_valf = HUGE_VALF;
#endif

/// Returns the number of digits in the given integer.
int NumDigitsBase10(uint64_t X) {
static constexpr struct ConstexprData {
uint8_t AtLeast[65] = {};
uint64_t Boundaries[20] = {};
static constexpr int NumDigitsConstexpr(uint64_t N) {
int res = 1;
while (N >= 10) {
res++;
N /= 10;
}
return res;
}
constexpr ConstexprData() {
uint64_t Val = ~0ull;
for (uint64_t i = 0; i <= 64; i++) {
uint64_t Digits = NumDigitsConstexpr(Val) - 1;
AtLeast[i] = Digits;
Val >>= 1;
}
// Special case because X=0 should return 1 and not 0
Boundaries[0] = 0;
Val = 10;
for (uint64_t i = 1; i < 20; i++) {
Boundaries[i] = Val;
Val *= 10;
}
}
} Data;

uint64_t Base2 = X ? countl_zero(X) : 64;
uint64_t Digits = Data.AtLeast[Base2];
return Digits + (X >= Data.Boundaries[Digits]);
}

} // namespace llvm
2 changes: 1 addition & 1 deletion llvm/tools/llvm-pdbutil/BytesOutputStyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ static void iterateModules(PDBFile &File, LinePrinter &P, uint32_t IndentLevel,
Callback);
} else {
uint32_t Count = Modules.getModuleCount();
uint32_t Digits = NumDigits(Count);
uint32_t Digits = NumDigitsBase10(Count);
for (uint32_t I = 0; I < Count; ++I) {
iterateOneModule(File, P, Modules, I, Digits, IndentLevel, Callback);
}
Expand Down
21 changes: 11 additions & 10 deletions llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,16 +363,16 @@ Error DumpOutputStyle::dumpStreamSummary() {
for (uint32_t StreamIdx = 0; StreamIdx < StreamCount; ++StreamIdx) {
P.formatLine(
"Stream {0} ({1} bytes): [{2}]",
fmt_align(StreamIdx, AlignStyle::Right, NumDigits(StreamCount)),
fmt_align(StreamIdx, AlignStyle::Right, NumDigitsBase10(StreamCount)),
fmt_align(getPdb().getStreamByteSize(StreamIdx), AlignStyle::Right,
NumDigits(MaxStreamSize)),
NumDigitsBase10(MaxStreamSize)),
StreamPurposes[StreamIdx].getLongName());

if (opts::dump::DumpStreamBlocks) {
auto Blocks = getPdb().getStreamBlockList(StreamIdx);
std::vector<uint32_t> BV(Blocks.begin(), Blocks.end());
P.formatLine(" {0} Blocks: [{1}]",
fmt_repeat(' ', NumDigits(StreamCount)),
fmt_repeat(' ', NumDigitsBase10(StreamCount)),
make_range(BV.begin(), BV.end()));
}
}
Expand Down Expand Up @@ -572,7 +572,7 @@ Error DumpOutputStyle::dumpSymbolStats() {
if (StreamIdx == kInvalidStreamIndex) {
P.formatLine(
"Mod {0} (debug info not present): [{1}]",
fmt_align(Modi, AlignStyle::Right, NumDigits(ModCount)),
fmt_align(Modi, AlignStyle::Right, NumDigitsBase10(ModCount)),
Desc.getModuleName());
return Error::success();
}
Expand Down Expand Up @@ -749,11 +749,11 @@ Error DumpOutputStyle::dumpUdtStats() {
// separators.
StringRef CountHeader("Count");
StringRef SizeHeader("Size");
size_t CD = NumDigits(UdtStats.Totals.Count);
size_t CD = NumDigitsBase10(UdtStats.Totals.Count);
CD += (CD - 1) / 3;
CD = std::max(CD, CountHeader.size());

size_t SD = NumDigits(UdtStats.Totals.Size);
size_t SD = NumDigitsBase10(UdtStats.Totals.Size);
SD += (SD - 1) / 3;
SD = std::max(SD, SizeHeader.size());

Expand Down Expand Up @@ -1071,7 +1071,7 @@ Error DumpOutputStyle::dumpStringTableFromPdb() {
P.formatLine("Empty");
else {
auto MaxID = llvm::max_element(IS->name_ids());
uint32_t Digits = NumDigits(*MaxID);
uint32_t Digits = NumDigitsBase10(*MaxID);

P.formatLine("{0} | {1}", fmt_align("ID", AlignStyle::Right, Digits),
"String");
Expand Down Expand Up @@ -1205,7 +1205,8 @@ dumpFullTypeStream(LinePrinter &Printer, LazyRandomTypeCollection &Types,
TpiStream *Stream, bool Bytes, bool Extras) {

Printer.formatLine("Showing {0:N} records", NumTypeRecords);
uint32_t Width = NumDigits(TypeIndex::FirstNonSimpleIndex + NumTypeRecords);
uint32_t Width =
NumDigitsBase10(TypeIndex::FirstNonSimpleIndex + NumTypeRecords);

MinimalTypeDumpVisitor V(Printer, Width + 2, Bytes, Extras, Types, RefTracker,
NumHashBuckets, HashValues, Stream);
Expand All @@ -1221,8 +1222,8 @@ static void dumpPartialTypeStream(LinePrinter &Printer,
TypeReferenceTracker *RefTracker,
TpiStream &Stream, ArrayRef<TypeIndex> TiList,
bool Bytes, bool Extras, bool Deps) {
uint32_t Width =
NumDigits(TypeIndex::FirstNonSimpleIndex + Stream.getNumTypeRecords());
uint32_t Width = NumDigitsBase10(TypeIndex::FirstNonSimpleIndex +
Stream.getNumTypeRecords());

MinimalTypeDumpVisitor V(Printer, Width + 2, Bytes, Extras, Types, RefTracker,
Stream.getNumHashBuckets(), Stream.getHashValues(),
Expand Down
6 changes: 3 additions & 3 deletions llvm/tools/llvm-pdbutil/MinimalTypeDumper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ Error MinimalTypeDumpVisitor::visitKnownRecord(CVType &CVR,
return Error::success();

auto Max = llvm::max_element(Indices);
uint32_t W = NumDigits(Max->getIndex()) + 2;
uint32_t W = NumDigitsBase10(Max->getIndex()) + 2;

for (auto I : Indices)
P.formatLine("{0}: `{1}`", fmt_align(I, AlignStyle::Right, W),
Expand All @@ -324,7 +324,7 @@ Error MinimalTypeDumpVisitor::visitKnownRecord(CVType &CVR,
return Error::success();

auto Max = llvm::max_element(Indices);
uint32_t W = NumDigits(Max->getIndex()) + 2;
uint32_t W = NumDigitsBase10(Max->getIndex()) + 2;

for (auto I : Indices)
P.formatLine("{0}: `{1}`", fmt_align(I, AlignStyle::Right, W),
Expand Down Expand Up @@ -494,7 +494,7 @@ Error MinimalTypeDumpVisitor::visitKnownRecord(CVType &CVR,
return Error::success();

auto Max = llvm::max_element(Indices);
uint32_t W = NumDigits(Max->getIndex()) + 2;
uint32_t W = NumDigitsBase10(Max->getIndex()) + 2;

for (auto I : Indices)
P.formatLine("{0}: `{1}`", fmt_align(I, AlignStyle::Right, W),
Expand Down
2 changes: 1 addition & 1 deletion llvm/tools/llvm-remarkutil/RemarkInstructionMix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static Error tryInstructionMix() {
Mix.begin(), Mix.end(), 1, [](unsigned MaxValue, const MixEntry &Elt) {
return std::max(MaxValue, Elt.second);
});
unsigned ValueWidth = std::log10(MaxValue) + 1;
unsigned ValueWidth = NumDigitsBase10(MaxValue);
FOS << "Instruction";
FOS.PadToColumn(MaxMnemonic + 1) << "Count\n";
FOS << "-----------";
Expand Down
15 changes: 15 additions & 0 deletions llvm/unittests/Support/MathExtrasTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,4 +692,19 @@ TYPED_TEST(OverflowTest, MulResultZero) {
EXPECT_FALSE(MulOverflow<TypeParam>(0, -5, Result));
EXPECT_EQ(Result, TypeParam(0));
}

TEST(MathExtras, NumDigitsBase10) {
EXPECT_EQ(NumDigitsBase10(0), 1);
EXPECT_EQ(NumDigitsBase10(1), 1);

uint64_t Val = 10;
for (int i = 2; i <= 20; i++) {
EXPECT_EQ(NumDigitsBase10(Val - 1), i - 1);
EXPECT_EQ(NumDigitsBase10(Val), i);
Val *= 10;
}

EXPECT_EQ(NumDigitsBase10(std::numeric_limits<uint64_t>::max()), 20);
}

} // namespace
2 changes: 1 addition & 1 deletion llvm/utils/FileCheck/FileCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ static void DumpAnnotatedInput(raw_ostream &OS, const FileCheckRequest &Req,
unsigned LineCount = InputFileText.count('\n');
if (InputFileEnd[-1] != '\n')
++LineCount;
unsigned LineNoWidth = std::log10(LineCount) + 1;
unsigned LineNoWidth = NumDigitsBase10(LineCount);
// +3 below adds spaces (1) to the left of the (right-aligned) line numbers
// on input lines and (2) to the right of the (left-aligned) labels on
// annotation lines so that input lines and annotation lines are more
Expand Down