Skip to content

Commit f32e5bd

Browse files
mtrofinmtrofin
authored
[NFC] Rename the Nr abbreviation to Num (#107151)
It's more clear. (This isn't exhaustive).
1 parent 362da64 commit f32e5bd

File tree

11 files changed

+106
-103
lines changed

11 files changed

+106
-103
lines changed

‎compiler-rt/lib/ctx_profile/CtxInstrContextNode.h

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,19 @@ using GUID = uint64_t;
6868
class ContextNode final {
6969
const GUID Guid;
7070
ContextNode *const Next;
71-
const uint32_t NrCounters;
72-
const uint32_t NrCallsites;
71+
const uint32_t NumCounters;
72+
const uint32_t NumCallsites;
7373

7474
public:
75-
ContextNode(GUID Guid, uint32_t NrCounters, uint32_t NrCallsites,
75+
ContextNode(GUID Guid, uint32_t NumCounters, uint32_t NumCallsites,
7676
ContextNode *Next = nullptr)
77-
: Guid(Guid), Next(Next), NrCounters(NrCounters),
78-
NrCallsites(NrCallsites) {}
77+
: Guid(Guid), Next(Next), NumCounters(NumCounters),
78+
NumCallsites(NumCallsites) {}
7979

80-
static inline size_t getAllocSize(uint32_t NrCounters, uint32_t NrCallsites) {
81-
return sizeof(ContextNode) + sizeof(uint64_t) * NrCounters +
82-
sizeof(ContextNode *) * NrCallsites;
80+
static inline size_t getAllocSize(uint32_t NumCounters,
81+
uint32_t NumCallsites) {
82+
return sizeof(ContextNode) + sizeof(uint64_t) * NumCounters +
83+
sizeof(ContextNode *) * NumCallsites;
8384
}
8485

8586
// The counters vector starts right after the static header.
@@ -88,16 +89,16 @@ class ContextNode final {
8889
return reinterpret_cast<uint64_t *>(addr_after);
8990
}
9091

91-
uint32_t counters_size() const { return NrCounters; }
92-
uint32_t callsites_size() const { return NrCallsites; }
92+
uint32_t counters_size() const { return NumCounters; }
93+
uint32_t callsites_size() const { return NumCallsites; }
9394

9495
const uint64_t *counters() const {
9596
return const_cast<ContextNode *>(this)->counters();
9697
}
9798

9899
// The subcontexts vector starts right after the end of the counters vector.
99100
ContextNode **subContexts() {
100-
return reinterpret_cast<ContextNode **>(&(counters()[NrCounters]));
101+
return reinterpret_cast<ContextNode **>(&(counters()[NumCounters]));
101102
}
102103

103104
ContextNode *const *subContexts() const {
@@ -107,7 +108,7 @@ class ContextNode final {
107108
GUID guid() const { return Guid; }
108109
ContextNode *next() const { return Next; }
109110

110-
size_t size() const { return getAllocSize(NrCounters, NrCallsites); }
111+
size_t size() const { return getAllocSize(NumCounters, NumCallsites); }
111112

112113
uint64_t entrycount() const { return counters()[0]; }
113114
};

‎compiler-rt/lib/ctx_profile/CtxInstrProfiling.cpp

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,11 @@ bool validate(const ContextRoot *Root) {
9292
}
9393

9494
inline ContextNode *allocContextNode(char *Place, GUID Guid,
95-
uint32_t NrCounters, uint32_t NrCallsites,
95+
uint32_t NumCounters,
96+
uint32_t NumCallsites,
9697
ContextNode *Next = nullptr) {
9798
assert(reinterpret_cast<uint64_t>(Place) % ExpectedAlignment == 0);
98-
return new (Place) ContextNode(Guid, NrCounters, NrCallsites, Next);
99+
return new (Place) ContextNode(Guid, NumCounters, NumCallsites, Next);
99100
}
100101

101102
void resetContextNode(ContextNode &Node) {
@@ -161,8 +162,8 @@ void Arena::freeArenaList(Arena *&A) {
161162
// If this is the first time we hit a callsite with this (Guid) particular
162163
// callee, we need to allocate.
163164
ContextNode *getCallsiteSlow(GUID Guid, ContextNode **InsertionPoint,
164-
uint32_t NrCounters, uint32_t NrCallsites) {
165-
auto AllocSize = ContextNode::getAllocSize(NrCounters, NrCallsites);
165+
uint32_t NumCounters, uint32_t NumCallsites) {
166+
auto AllocSize = ContextNode::getAllocSize(NumCounters, NumCallsites);
166167
auto *Mem = __llvm_ctx_profile_current_context_root->CurrentMem;
167168
char *AllocPlace = Mem->tryBumpAllocate(AllocSize);
168169
if (!AllocPlace) {
@@ -175,15 +176,15 @@ ContextNode *getCallsiteSlow(GUID Guid, ContextNode **InsertionPoint,
175176
Mem->allocateNewArena(getArenaAllocSize(AllocSize), Mem);
176177
AllocPlace = Mem->tryBumpAllocate(AllocSize);
177178
}
178-
auto *Ret = allocContextNode(AllocPlace, Guid, NrCounters, NrCallsites,
179+
auto *Ret = allocContextNode(AllocPlace, Guid, NumCounters, NumCallsites,
179180
*InsertionPoint);
180181
*InsertionPoint = Ret;
181182
return Ret;
182183
}
183184

184185
ContextNode *__llvm_ctx_profile_get_context(void *Callee, GUID Guid,
185-
uint32_t NrCounters,
186-
uint32_t NrCallsites) {
186+
uint32_t NumCounters,
187+
uint32_t NumCallsites) {
187188
// fast "out" if we're not even doing contextual collection.
188189
if (!__llvm_ctx_profile_current_context_root)
189190
return TheScratchContext;
@@ -222,34 +223,34 @@ ContextNode *__llvm_ctx_profile_get_context(void *Callee, GUID Guid,
222223
Callsite = Callsite->next();
223224
}
224225
auto *Ret = Callsite ? Callsite
225-
: getCallsiteSlow(Guid, CallsiteContext, NrCounters,
226-
NrCallsites);
227-
if (Ret->callsites_size() != NrCallsites ||
228-
Ret->counters_size() != NrCounters)
226+
: getCallsiteSlow(Guid, CallsiteContext, NumCounters,
227+
NumCallsites);
228+
if (Ret->callsites_size() != NumCallsites ||
229+
Ret->counters_size() != NumCounters)
229230
__sanitizer::Printf("[ctxprof] Returned ctx differs from what's asked: "
230231
"Context: %p, Asked: %lu %u %u, Got: %lu %u %u \n",
231-
reinterpret_cast<void *>(Ret), Guid, NrCallsites,
232-
NrCounters, Ret->guid(), Ret->callsites_size(),
232+
reinterpret_cast<void *>(Ret), Guid, NumCallsites,
233+
NumCounters, Ret->guid(), Ret->callsites_size(),
233234
Ret->counters_size());
234235
onContextEnter(*Ret);
235236
return Ret;
236237
}
237238

238239
// This should be called once for a Root. Allocate the first arena, set up the
239240
// first context.
240-
void setupContext(ContextRoot *Root, GUID Guid, uint32_t NrCounters,
241-
uint32_t NrCallsites) {
241+
void setupContext(ContextRoot *Root, GUID Guid, uint32_t NumCounters,
242+
uint32_t NumCallsites) {
242243
__sanitizer::GenericScopedLock<__sanitizer::SpinMutex> Lock(
243244
&AllContextsMutex);
244245
// Re-check - we got here without having had taken a lock.
245246
if (Root->FirstMemBlock)
246247
return;
247-
const auto Needed = ContextNode::getAllocSize(NrCounters, NrCallsites);
248+
const auto Needed = ContextNode::getAllocSize(NumCounters, NumCallsites);
248249
auto *M = Arena::allocateNewArena(getArenaAllocSize(Needed));
249250
Root->FirstMemBlock = M;
250251
Root->CurrentMem = M;
251252
Root->FirstNode = allocContextNode(M->tryBumpAllocate(Needed), Guid,
252-
NrCounters, NrCallsites);
253+
NumCounters, NumCallsites);
253254
AllContextRoots.PushBack(Root);
254255
}
255256

@@ -278,19 +279,19 @@ void __llvm_ctx_profile_release_context(ContextRoot *Root)
278279
}
279280

280281
void __llvm_ctx_profile_start_collection() {
281-
size_t NrMemUnits = 0;
282+
size_t NumMemUnits = 0;
282283
__sanitizer::GenericScopedLock<__sanitizer::SpinMutex> Lock(
283284
&AllContextsMutex);
284285
for (uint32_t I = 0; I < AllContextRoots.Size(); ++I) {
285286
auto *Root = AllContextRoots[I];
286287
__sanitizer::GenericScopedLock<__sanitizer::StaticSpinMutex> Lock(
287288
&Root->Taken);
288289
for (auto *Mem = Root->FirstMemBlock; Mem; Mem = Mem->next())
289-
++NrMemUnits;
290+
++NumMemUnits;
290291

291292
resetContextNode(*Root->FirstNode);
292293
}
293-
__sanitizer::Printf("[ctxprof] Initial NrMemUnits: %zu \n", NrMemUnits);
294+
__sanitizer::Printf("[ctxprof] Initial NumMemUnits: %zu \n", NumMemUnits);
294295
}
295296

296297
bool __llvm_ctx_profile_fetch(void *Data,

‎compiler-rt/lib/ctx_profile/CtxInstrProfiling.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ void __llvm_ctx_profile_release_context(__ctx_profile::ContextRoot *Root);
153153
/// called for any other function than entry points, in the entry BB of such
154154
/// function. Same consideration about LSB of returned value as .._start_context
155155
ContextNode *__llvm_ctx_profile_get_context(void *Callee, GUID Guid,
156-
uint32_t NrCounters,
157-
uint32_t NrCallsites);
156+
uint32_t NumCounters,
157+
uint32_t NumCallsites);
158158

159159
/// Prepares for collection. Currently this resets counter values but preserves
160160
/// internal context tree structure.

‎llvm/include/llvm/Analysis/MLModelRunner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ class MLModelRunner {
5454
virtual void switchContext(StringRef Name) {}
5555

5656
protected:
57-
MLModelRunner(LLVMContext &Ctx, Kind Type, size_t NrInputs)
58-
: Ctx(Ctx), Type(Type), InputBuffers(NrInputs) {
57+
MLModelRunner(LLVMContext &Ctx, Kind Type, size_t NumInputs)
58+
: Ctx(Ctx), Type(Type), InputBuffers(NumInputs) {
5959
assert(Type != Kind::Unknown);
6060
}
6161
virtual void *evaluateUntyped() = 0;

‎llvm/include/llvm/ProfileData/CtxInstrContextNode.h

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,19 @@ using GUID = uint64_t;
6868
class ContextNode final {
6969
const GUID Guid;
7070
ContextNode *const Next;
71-
const uint32_t NrCounters;
72-
const uint32_t NrCallsites;
71+
const uint32_t NumCounters;
72+
const uint32_t NumCallsites;
7373

7474
public:
75-
ContextNode(GUID Guid, uint32_t NrCounters, uint32_t NrCallsites,
75+
ContextNode(GUID Guid, uint32_t NumCounters, uint32_t NumCallsites,
7676
ContextNode *Next = nullptr)
77-
: Guid(Guid), Next(Next), NrCounters(NrCounters),
78-
NrCallsites(NrCallsites) {}
77+
: Guid(Guid), Next(Next), NumCounters(NumCounters),
78+
NumCallsites(NumCallsites) {}
7979

80-
static inline size_t getAllocSize(uint32_t NrCounters, uint32_t NrCallsites) {
81-
return sizeof(ContextNode) + sizeof(uint64_t) * NrCounters +
82-
sizeof(ContextNode *) * NrCallsites;
80+
static inline size_t getAllocSize(uint32_t NumCounters,
81+
uint32_t NumCallsites) {
82+
return sizeof(ContextNode) + sizeof(uint64_t) * NumCounters +
83+
sizeof(ContextNode *) * NumCallsites;
8384
}
8485

8586
// The counters vector starts right after the static header.
@@ -88,16 +89,16 @@ class ContextNode final {
8889
return reinterpret_cast<uint64_t *>(addr_after);
8990
}
9091

91-
uint32_t counters_size() const { return NrCounters; }
92-
uint32_t callsites_size() const { return NrCallsites; }
92+
uint32_t counters_size() const { return NumCounters; }
93+
uint32_t callsites_size() const { return NumCallsites; }
9394

9495
const uint64_t *counters() const {
9596
return const_cast<ContextNode *>(this)->counters();
9697
}
9798

9899
// The subcontexts vector starts right after the end of the counters vector.
99100
ContextNode **subContexts() {
100-
return reinterpret_cast<ContextNode **>(&(counters()[NrCounters]));
101+
return reinterpret_cast<ContextNode **>(&(counters()[NumCounters]));
101102
}
102103

103104
ContextNode *const *subContexts() const {
@@ -107,7 +108,7 @@ class ContextNode final {
107108
GUID guid() const { return Guid; }
108109
ContextNode *next() const { return Next; }
109110

110-
size_t size() const { return getAllocSize(NrCounters, NrCallsites); }
111+
size_t size() const { return getAllocSize(NumCounters, NumCallsites); }
111112

112113
uint64_t entrycount() const { return counters()[0]; }
113114
};

‎llvm/lib/Analysis/FunctionPropertiesAnalysis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static cl::opt<unsigned> CallWithManyArgumentsThreshold(
4747
"it is considered having many arguments."));
4848

4949
namespace {
50-
int64_t getNrBlocksFromCond(const BasicBlock &BB) {
50+
int64_t getNumBlocksFromCond(const BasicBlock &BB) {
5151
int64_t Ret = 0;
5252
if (const auto *BI = dyn_cast<BranchInst>(BB.getTerminator())) {
5353
if (BI->isConditional())
@@ -72,7 +72,7 @@ void FunctionPropertiesInfo::updateForBB(const BasicBlock &BB,
7272
assert(Direction == 1 || Direction == -1);
7373
BasicBlockCount += Direction;
7474
BlocksReachedFromConditionalInstruction +=
75-
(Direction * getNrBlocksFromCond(BB));
75+
(Direction * getNumBlocksFromCond(BB));
7676
for (const auto &I : BB) {
7777
if (auto *CS = dyn_cast<CallBase>(&I)) {
7878
const auto *Callee = CS->getCalledFunction();

‎llvm/lib/Analysis/MLInlineAdvisor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,9 @@ std::unique_ptr<InlineAdvice> MLInlineAdvisor::getAdviceImpl(CallBase &CB) {
400400
if (Mandatory)
401401
return getMandatoryAdvice(CB, true);
402402

403-
auto NrCtantParams = 0;
403+
auto NumCtantParams = 0;
404404
for (auto I = CB.arg_begin(), E = CB.arg_end(); I != E; ++I) {
405-
NrCtantParams += (isa<Constant>(*I));
405+
NumCtantParams += (isa<Constant>(*I));
406406
}
407407

408408
auto &CallerBefore = getCachedFPI(Caller);
@@ -414,7 +414,7 @@ std::unique_ptr<InlineAdvice> MLInlineAdvisor::getAdviceImpl(CallBase &CB) {
414414
getInitialFunctionLevel(Caller);
415415
*ModelRunner->getTensor<int64_t>(FeatureIndex::node_count) = NodeCount;
416416
*ModelRunner->getTensor<int64_t>(FeatureIndex::nr_ctant_params) =
417-
NrCtantParams;
417+
NumCtantParams;
418418
*ModelRunner->getTensor<int64_t>(FeatureIndex::edge_count) = EdgeCount;
419419
*ModelRunner->getTensor<int64_t>(FeatureIndex::caller_users) =
420420
CallerBefore.Uses;

0 commit comments

Comments
 (0)