Skip to content

Commit 8d943a9

Browse files
committed
[NFC] Rename BBSectionsPrepare -> BasicBlockSections.
Rename the BBSectionsPrepare pass as suggested by the review comment in https://reviews.llvm.org/D85368. Differential Revision: https://reviews.llvm.org/D85380
1 parent f406a90 commit 8d943a9

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

llvm/include/llvm/CodeGen/Passes.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ namespace llvm {
4444
/// the entry block.
4545
FunctionPass *createUnreachableBlockEliminationPass();
4646

47-
/// createBBSectionsPrepare Pass - This pass assigns sections to machine basic
48-
/// blocks and is enabled with -fbasic-block-sections.
49-
/// Buf is a memory buffer that contains the list of functions and basic
50-
/// block ids to selectively enable basic block sections.
51-
MachineFunctionPass *createBBSectionsPreparePass(const MemoryBuffer *Buf);
47+
/// createBasicBlockSections Pass - This pass assigns sections to machine
48+
/// basic blocks and is enabled with -fbasic-block-sections. Buf is a memory
49+
/// buffer that contains the list of functions and basic block ids to
50+
/// selectively enable basic block sections.
51+
MachineFunctionPass *createBasicBlockSectionsPass(const MemoryBuffer *Buf);
5252

5353
/// MachineFunctionPrinter pass - This pass prints out the machine function to
5454
/// the given stream as a debugging tool.

llvm/include/llvm/InitializePasses.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void initializeAssumptionCacheTrackerPass(PassRegistry&);
7979
void initializeAtomicExpandPass(PassRegistry&);
8080
void initializeAttributorLegacyPassPass(PassRegistry&);
8181
void initializeAttributorCGSCCLegacyPassPass(PassRegistry &);
82-
void initializeBBSectionsPreparePass(PassRegistry &);
82+
void initializeBasicBlockSectionsPass(PassRegistry &);
8383
void initializeBDCELegacyPassPass(PassRegistry&);
8484
void initializeBarrierNoopPass(PassRegistry&);
8585
void initializeBasicAAWrapperPassPass(PassRegistry&);

llvm/lib/CodeGen/BBSectionsPrepare.cpp renamed to llvm/lib/CodeGen/BasicBlockSections.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
//===-- BBSectionsPrepare.cpp ---=========---------------------------------===//
1+
//===-- BasicBlockSections.cpp ---=========--------------------------------===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
88
//
9-
// BBSectionsPrepare implementation.
9+
// BasicBlockSections implementation.
1010
//
1111
// The purpose of this pass is to assign sections to basic blocks when
1212
// -fbasic-block-sections= option is used. Further, with profile information
@@ -100,7 +100,7 @@ struct BBClusterInfo {
100100

101101
using ProgramBBClusterInfoMapTy = StringMap<SmallVector<BBClusterInfo, 4>>;
102102

103-
class BBSectionsPrepare : public MachineFunctionPass {
103+
class BasicBlockSections : public MachineFunctionPass {
104104
public:
105105
static char ID;
106106

@@ -119,13 +119,13 @@ class BBSectionsPrepare : public MachineFunctionPass {
119119
// name for which we have mapping in ProgramBBClusterInfo.
120120
StringMap<StringRef> FuncAliasMap;
121121

122-
BBSectionsPrepare(const MemoryBuffer *Buf)
122+
BasicBlockSections(const MemoryBuffer *Buf)
123123
: MachineFunctionPass(ID), MBuf(Buf) {
124-
initializeBBSectionsPreparePass(*PassRegistry::getPassRegistry());
124+
initializeBasicBlockSectionsPass(*PassRegistry::getPassRegistry());
125125
};
126126

127-
BBSectionsPrepare() : MachineFunctionPass(ID) {
128-
initializeBBSectionsPreparePass(*PassRegistry::getPassRegistry());
127+
BasicBlockSections() : MachineFunctionPass(ID) {
128+
initializeBasicBlockSectionsPass(*PassRegistry::getPassRegistry());
129129
}
130130

131131
StringRef getPassName() const override {
@@ -144,8 +144,8 @@ class BBSectionsPrepare : public MachineFunctionPass {
144144

145145
} // end anonymous namespace
146146

147-
char BBSectionsPrepare::ID = 0;
148-
INITIALIZE_PASS(BBSectionsPrepare, "bbsections-prepare",
147+
char BasicBlockSections::ID = 0;
148+
INITIALIZE_PASS(BasicBlockSections, "bbsections-prepare",
149149
"Prepares for basic block sections, by splitting functions "
150150
"into clusters of basic blocks.",
151151
false, false)
@@ -324,7 +324,7 @@ static bool assignSectionsAndSortBasicBlocks(
324324
return true;
325325
}
326326

327-
bool BBSectionsPrepare::runOnMachineFunction(MachineFunction &MF) {
327+
bool BasicBlockSections::runOnMachineFunction(MachineFunction &MF) {
328328
auto BBSectionsType = MF.getTarget().getBBSectionsType();
329329
assert(BBSectionsType != BasicBlockSection::None &&
330330
"BB Sections not enabled!");
@@ -438,20 +438,20 @@ static Error getBBClusterInfo(const MemoryBuffer *MBuf,
438438
return Error::success();
439439
}
440440

441-
bool BBSectionsPrepare::doInitialization(Module &M) {
441+
bool BasicBlockSections::doInitialization(Module &M) {
442442
if (!MBuf)
443443
return false;
444444
if (auto Err = getBBClusterInfo(MBuf, ProgramBBClusterInfo, FuncAliasMap))
445445
report_fatal_error(std::move(Err));
446446
return false;
447447
}
448448

449-
void BBSectionsPrepare::getAnalysisUsage(AnalysisUsage &AU) const {
449+
void BasicBlockSections::getAnalysisUsage(AnalysisUsage &AU) const {
450450
AU.setPreservesAll();
451451
MachineFunctionPass::getAnalysisUsage(AU);
452452
}
453453

454454
MachineFunctionPass *
455-
llvm::createBBSectionsPreparePass(const MemoryBuffer *Buf) {
456-
return new BBSectionsPrepare(Buf);
455+
llvm::createBasicBlockSectionsPass(const MemoryBuffer *Buf) {
456+
return new BasicBlockSections(Buf);
457457
}

llvm/lib/CodeGen/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ add_llvm_component_library(LLVMCodeGen
88
BranchRelaxation.cpp
99
BreakFalseDeps.cpp
1010
BuiltinGCs.cpp
11-
BBSectionsPrepare.cpp
11+
BasicBlockSections.cpp
1212
CalcSpillWeights.cpp
1313
CallingConvLower.cpp
1414
CFGuardLongjmp.cpp

llvm/lib/CodeGen/CodeGen.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ using namespace llvm;
2020
/// initializeCodeGen - Initialize all passes linked into the CodeGen library.
2121
void llvm::initializeCodeGen(PassRegistry &Registry) {
2222
initializeAtomicExpandPass(Registry);
23-
initializeBBSectionsPreparePass(Registry);
23+
initializeBasicBlockSectionsPass(Registry);
2424
initializeBranchFolderPassPass(Registry);
2525
initializeBranchRelaxationPass(Registry);
2626
initializeCFGuardLongjmpPass(Registry);

llvm/lib/CodeGen/TargetPassConfig.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ void TargetPassConfig::addMachinePasses() {
10151015
}
10161016

10171017
if (TM->getBBSectionsType() != llvm::BasicBlockSection::None)
1018-
addPass(llvm::createBBSectionsPreparePass(TM->getBBSectionsFuncListBuf()));
1018+
addPass(llvm::createBasicBlockSectionsPass(TM->getBBSectionsFuncListBuf()));
10191019

10201020
// Add passes that directly emit MI after all other MI passes.
10211021
addPreEmitPass2();

llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static_library("CodeGen") {
2121
"AllocationOrder.cpp",
2222
"Analysis.cpp",
2323
"AtomicExpandPass.cpp",
24-
"BBSectionsPrepare.cpp",
24+
"BasicBlockSections.cpp",
2525
"BasicTargetTransformInfo.cpp",
2626
"BranchFolding.cpp",
2727
"BranchRelaxation.cpp",

0 commit comments

Comments
 (0)