Skip to content

Commit b393ca6

Browse files
authored
[NFC][LLVM][RISCV] Cleanup pass initialization for RISCV (#134279)
- Move calls to pass initialization functions to RISCV target initialization and remove them from pass constructors.
1 parent 158684a commit b393ca6

6 files changed

+8
-27
lines changed

llvm/lib/Target/RISCV/GISel/RISCVO0PreLegalizerCombiner.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ void RISCVO0PreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
110110

111111
RISCVO0PreLegalizerCombiner::RISCVO0PreLegalizerCombiner()
112112
: MachineFunctionPass(ID) {
113-
initializeRISCVO0PreLegalizerCombinerPass(*PassRegistry::getPassRegistry());
114-
115113
if (!RuleConfig.parseCommandLineOption())
116114
report_fatal_error("Invalid rule identifier");
117115
}
@@ -150,8 +148,6 @@ INITIALIZE_PASS_END(RISCVO0PreLegalizerCombiner, DEBUG_TYPE,
150148
"Combine RISC-V machine instrs before legalization", false,
151149
false)
152150

153-
namespace llvm {
154-
FunctionPass *createRISCVO0PreLegalizerCombiner() {
151+
FunctionPass *llvm::createRISCVO0PreLegalizerCombiner() {
155152
return new RISCVO0PreLegalizerCombiner();
156153
}
157-
} // end namespace llvm

llvm/lib/Target/RISCV/GISel/RISCVPostLegalizerCombiner.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ void RISCVPostLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
118118

119119
RISCVPostLegalizerCombiner::RISCVPostLegalizerCombiner()
120120
: MachineFunctionPass(ID) {
121-
initializeRISCVPostLegalizerCombinerPass(*PassRegistry::getPassRegistry());
122-
123121
if (!RuleConfig.parseCommandLineOption())
124122
report_fatal_error("Invalid rule identifier");
125123
}
@@ -164,8 +162,6 @@ INITIALIZE_PASS_END(RISCVPostLegalizerCombiner, DEBUG_TYPE,
164162
"Combine RISC-V MachineInstrs after legalization", false,
165163
false)
166164

167-
namespace llvm {
168-
FunctionPass *createRISCVPostLegalizerCombiner() {
165+
FunctionPass *llvm::createRISCVPostLegalizerCombiner() {
169166
return new RISCVPostLegalizerCombiner();
170167
}
171-
} // end namespace llvm

llvm/lib/Target/RISCV/GISel/RISCVPreLegalizerCombiner.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ void RISCVPreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
116116

117117
RISCVPreLegalizerCombiner::RISCVPreLegalizerCombiner()
118118
: MachineFunctionPass(ID) {
119-
initializeRISCVPreLegalizerCombinerPass(*PassRegistry::getPassRegistry());
120-
121119
if (!RuleConfig.parseCommandLineOption())
122120
report_fatal_error("Invalid rule identifier");
123121
}
@@ -167,8 +165,6 @@ INITIALIZE_PASS_END(RISCVPreLegalizerCombiner, DEBUG_TYPE,
167165
"Combine RISC-V machine instrs before legalization", false,
168166
false)
169167

170-
namespace llvm {
171-
FunctionPass *createRISCVPreLegalizerCombiner() {
168+
FunctionPass *llvm::createRISCVPreLegalizerCombiner() {
172169
return new RISCVPreLegalizerCombiner();
173170
}
174-
} // end namespace llvm

llvm/lib/Target/RISCV/RISCVExpandAtomicPseudoInsts.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ class RISCVExpandAtomicPseudo : public MachineFunctionPass {
3434
const RISCVInstrInfo *TII;
3535
static char ID;
3636

37-
RISCVExpandAtomicPseudo() : MachineFunctionPass(ID) {
38-
initializeRISCVExpandAtomicPseudoPass(*PassRegistry::getPassRegistry());
39-
}
37+
RISCVExpandAtomicPseudo() : MachineFunctionPass(ID) {}
4038

4139
bool runOnMachineFunction(MachineFunction &MF) override;
4240

@@ -733,10 +731,6 @@ bool RISCVExpandAtomicPseudo::expandAtomicCmpXchg(
733731
INITIALIZE_PASS(RISCVExpandAtomicPseudo, "riscv-expand-atomic-pseudo",
734732
RISCV_EXPAND_ATOMIC_PSEUDO_NAME, false, false)
735733

736-
namespace llvm {
737-
738-
FunctionPass *createRISCVExpandAtomicPseudoPass() {
734+
FunctionPass *llvm::createRISCVExpandAtomicPseudoPass() {
739735
return new RISCVExpandAtomicPseudo();
740736
}
741-
742-
} // end of namespace llvm

llvm/lib/Target/RISCV/RISCVRedundantCopyElimination.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ class RISCVRedundantCopyElimination : public MachineFunctionPass {
4444

4545
public:
4646
static char ID;
47-
RISCVRedundantCopyElimination() : MachineFunctionPass(ID) {
48-
initializeRISCVRedundantCopyEliminationPass(
49-
*PassRegistry::getPassRegistry());
50-
}
47+
RISCVRedundantCopyElimination() : MachineFunctionPass(ID) {}
5148

5249
bool runOnMachineFunction(MachineFunction &MF) override;
5350
MachineFunctionProperties getRequiredProperties() const override {

llvm/lib/Target/RISCV/RISCVTargetMachine.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeRISCVTarget() {
147147
initializeRISCVMoveMergePass(*PR);
148148
initializeRISCVPushPopOptPass(*PR);
149149
initializeRISCVLoadStoreOptPass(*PR);
150+
initializeRISCVExpandAtomicPseudoPass(*PR);
151+
initializeRISCVRedundantCopyEliminationPass(*PR);
150152
}
151153

152154
static StringRef computeDataLayout(const Triple &TT,

0 commit comments

Comments
 (0)