Skip to content

Commit 19dbde0

Browse files
authored
[NFC][LLVM] Cleanup pass initialization for ARM/ARV/Lanai/X86/XCore (#134400)
- Remove pass initialization from pass constructors. - #111767
1 parent 3479c57 commit 19dbde0

File tree

8 files changed

+12
-28
lines changed

8 files changed

+12
-28
lines changed

llvm/lib/Target/ARM/ARMFixCortexA57AES1742098Pass.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ namespace {
7070
class ARMFixCortexA57AES1742098 : public MachineFunctionPass {
7171
public:
7272
static char ID;
73-
explicit ARMFixCortexA57AES1742098() : MachineFunctionPass(ID) {
74-
initializeARMFixCortexA57AES1742098Pass(*PassRegistry::getPassRegistry());
75-
}
73+
explicit ARMFixCortexA57AES1742098() : MachineFunctionPass(ID) {}
7674

7775
bool runOnMachineFunction(MachineFunction &F) override;
7876

llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ class AVRExpandPseudo : public MachineFunctionPass {
3434
public:
3535
static char ID;
3636

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

4139
bool runOnMachineFunction(MachineFunction &MF) override;
4240

@@ -2643,8 +2641,7 @@ bool AVRExpandPseudo::expandMI(Block &MBB, BlockIt MBBI) {
26432641

26442642
INITIALIZE_PASS(AVRExpandPseudo, "avr-expand-pseudo", AVR_EXPAND_PSEUDO_NAME,
26452643
false, false)
2646-
namespace llvm {
2647-
2648-
FunctionPass *createAVRExpandPseudoPass() { return new AVRExpandPseudo(); }
26492644

2650-
} // end of namespace llvm
2645+
FunctionPass *llvm::createAVRExpandPseudoPass() {
2646+
return new AVRExpandPseudo();
2647+
}

llvm/lib/Target/Lanai/Lanai.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ FunctionPass *createLanaiMemAluCombinerPass();
3838
FunctionPass *createLanaiSetflagAluCombinerPass();
3939

4040
void initializeLanaiDAGToDAGISelLegacyPass(PassRegistry &);
41+
void initializeLanaiMemAluCombinerPass(PassRegistry &);
4142

4243
} // namespace llvm
4344

llvm/lib/Target/Lanai/LanaiMemAluCombiner.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
// in the same machine basic block into one machine instruction.
2323
//===----------------------------------------------------------------------===//
2424

25+
#include "Lanai.h"
2526
#include "LanaiAluCode.h"
2627
#include "LanaiTargetMachine.h"
2728
#include "llvm/ADT/Statistic.h"
@@ -44,20 +45,14 @@ static llvm::cl::opt<bool> DisableMemAluCombiner(
4445
llvm::cl::desc("Do not combine ALU and memory operators"),
4546
llvm::cl::Hidden);
4647

47-
namespace llvm {
48-
void initializeLanaiMemAluCombinerPass(PassRegistry &);
49-
} // namespace llvm
50-
5148
namespace {
5249
typedef MachineBasicBlock::iterator MbbIterator;
5350
typedef MachineFunction::iterator MfIterator;
5451

5552
class LanaiMemAluCombiner : public MachineFunctionPass {
5653
public:
5754
static char ID;
58-
explicit LanaiMemAluCombiner() : MachineFunctionPass(ID) {
59-
initializeLanaiMemAluCombinerPass(*PassRegistry::getPassRegistry());
60-
}
55+
explicit LanaiMemAluCombiner() : MachineFunctionPass(ID) {}
6156

6257
StringRef getPassName() const override {
6358
return "Lanai load / store optimization pass";

llvm/lib/Target/Lanai/LanaiTargetMachine.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,13 @@
2626

2727
using namespace llvm;
2828

29-
namespace llvm {
30-
void initializeLanaiMemAluCombinerPass(PassRegistry &);
31-
} // namespace llvm
32-
3329
extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeLanaiTarget() {
3430
// Register the target.
3531
RegisterTargetMachine<LanaiTargetMachine> registered_target(
3632
getTheLanaiTarget());
3733
PassRegistry &PR = *PassRegistry::getPassRegistry();
3834
initializeLanaiDAGToDAGISelLegacyPass(PR);
35+
initializeLanaiMemAluCombinerPass(PR);
3936
}
4037

4138
static std::string computeDataLayout() {

llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,10 +631,7 @@ class X86LowerAMXIntrinsicsLegacyPass : public FunctionPass {
631631
public:
632632
static char ID;
633633

634-
X86LowerAMXIntrinsicsLegacyPass() : FunctionPass(ID) {
635-
initializeX86LowerAMXIntrinsicsLegacyPassPass(
636-
*PassRegistry::getPassRegistry());
637-
}
634+
X86LowerAMXIntrinsicsLegacyPass() : FunctionPass(ID) {}
638635

639636
bool runOnFunction(Function &F) override {
640637
if (!X86ScalarizeAMX)

llvm/lib/Target/XCore/XCoreLowerThreadLocal.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ namespace {
4141
struct XCoreLowerThreadLocal : public ModulePass {
4242
static char ID;
4343

44-
XCoreLowerThreadLocal() : ModulePass(ID) {
45-
initializeXCoreLowerThreadLocalPass(*PassRegistry::getPassRegistry());
46-
}
44+
XCoreLowerThreadLocal() : ModulePass(ID) {}
4745

4846
bool lowerGlobal(GlobalVariable *GV);
4947

llvm/lib/Target/XCore/XCoreTargetMachine.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeXCoreTarget() {
106106
RegisterTargetMachine<XCoreTargetMachine> X(getTheXCoreTarget());
107107
PassRegistry &PR = *PassRegistry::getPassRegistry();
108108
initializeXCoreDAGToDAGISelLegacyPass(PR);
109+
initializeXCoreLowerThreadLocalPass(PR);
109110
}
110111

111112
TargetTransformInfo

0 commit comments

Comments
 (0)