Skip to content

[MachineScheduler] Move the constructor definitions inside the class (NFC). #126276

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

Closed
wants to merge 1 commit into from
Closed

[MachineScheduler] Move the constructor definitions inside the class (NFC). #126276

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
110 changes: 49 additions & 61 deletions llvm/lib/CodeGen/MachineScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,30 @@ class MachineSchedulerImpl : public MachineSchedulerBase {
MachineFunctionAnalysisManager *MFAM = nullptr;

public:
MachineSchedulerImpl(MachineFunction &Func, MachineFunctionPass *P);
MachineSchedulerImpl(MachineFunction &Func, MachineFunctionPass *P) : P(P) {
MF = &Func;
MLI = &P->getAnalysis<MachineLoopInfoWrapperPass>().getLI();
MDT = &P->getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
TM = &P->getAnalysis<TargetPassConfig>().getTM<TargetMachine>();
AA = &P->getAnalysis<AAResultsWrapperPass>().getAAResults();
LIS = &P->getAnalysis<LiveIntervalsWrapperPass>().getLIS();
}

MachineSchedulerImpl(MachineFunction &Func,
MachineFunctionAnalysisManager &MFAM,
const TargetMachine *TargetM);
const TargetMachine *TargetM)
: MFAM(&MFAM) {
MF = &Func;
TM = TargetM;
MLI = &MFAM.getResult<MachineLoopAnalysis>(Func);
MDT = &MFAM.getResult<MachineDominatorTreeAnalysis>(Func);
auto &FAM =
MFAM.getResult<FunctionAnalysisManagerMachineFunctionProxy>(Func)
.getManager();
AA = &FAM.getResult<AAManager>(Func.getFunction());
LIS = &MFAM.getResult<LiveIntervalsAnalysis>(Func);
}

bool run();

protected:
Expand All @@ -244,10 +264,27 @@ class PostMachineSchedulerImpl : public MachineSchedulerBase {
MachineFunctionAnalysisManager *MFAM = nullptr;

public:
PostMachineSchedulerImpl(MachineFunction &Func, MachineFunctionPass *P);
PostMachineSchedulerImpl(MachineFunction &Func, MachineFunctionPass *P)
: P(P) {
MF = &Func;
MLI = &P->getAnalysis<MachineLoopInfoWrapperPass>().getLI();
TM = &P->getAnalysis<TargetPassConfig>().getTM<TargetMachine>();
AA = &P->getAnalysis<AAResultsWrapperPass>().getAAResults();
}

PostMachineSchedulerImpl(MachineFunction &Func,
MachineFunctionAnalysisManager &MFAM,
const TargetMachine *TargetM);
const TargetMachine *TargetM)
: MFAM(&MFAM) {
MF = &Func;
TM = TargetM;
MLI = &MFAM.getResult<MachineLoopAnalysis>(Func);
auto &FAM =
MFAM.getResult<FunctionAnalysisManagerMachineFunctionProxy>(Func)
.getManager();
AA = &FAM.getResult<AAManager>(Func.getFunction());
}

bool run();

protected:
Expand All @@ -257,7 +294,10 @@ class PostMachineSchedulerImpl : public MachineSchedulerBase {
/// MachineScheduler runs after coalescing and before register allocation.
class MachineSchedulerLegacy : public MachineFunctionPass {
public:
MachineSchedulerLegacy();
MachineSchedulerLegacy() : MachineFunctionPass(ID) {
initializeMachineSchedulerLegacyPass(*PassRegistry::getPassRegistry());
}

void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnMachineFunction(MachineFunction&) override;

Expand All @@ -267,7 +307,10 @@ class MachineSchedulerLegacy : public MachineFunctionPass {
/// PostMachineScheduler runs after shortly before code emission.
class PostMachineSchedulerLegacy : public MachineFunctionPass {
public:
PostMachineSchedulerLegacy();
PostMachineSchedulerLegacy() : MachineFunctionPass(ID) {
initializePostMachineSchedulerLegacyPass(*PassRegistry::getPassRegistry());
}

void getAnalysisUsage(AnalysisUsage &AU) const override;
bool runOnMachineFunction(MachineFunction&) override;

Expand All @@ -290,10 +333,6 @@ INITIALIZE_PASS_DEPENDENCY(LiveIntervalsWrapperPass)
INITIALIZE_PASS_END(MachineSchedulerLegacy, DEBUG_TYPE,
"Machine Instruction Scheduler", false, false)

MachineSchedulerLegacy::MachineSchedulerLegacy() : MachineFunctionPass(ID) {
initializeMachineSchedulerLegacyPass(*PassRegistry::getPassRegistry());
}

void MachineSchedulerLegacy::getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesCFG();
AU.addRequired<MachineDominatorTreeWrapperPass>();
Expand All @@ -319,11 +358,6 @@ INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
INITIALIZE_PASS_END(PostMachineSchedulerLegacy, "postmisched",
"PostRA Machine Instruction Scheduler", false, false)

PostMachineSchedulerLegacy::PostMachineSchedulerLegacy()
: MachineFunctionPass(ID) {
initializePostMachineSchedulerLegacyPass(*PassRegistry::getPassRegistry());
}

void PostMachineSchedulerLegacy::getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesCFG();
AU.addRequired<MachineDominatorTreeWrapperPass>();
Expand Down Expand Up @@ -403,31 +437,6 @@ nextIfDebug(MachineBasicBlock::iterator I,
.getNonConstIterator();
}

MachineSchedulerImpl::MachineSchedulerImpl(MachineFunction &Func,
MachineFunctionPass *P)
: P(P) {
MF = &Func;
MLI = &P->getAnalysis<MachineLoopInfoWrapperPass>().getLI();
MDT = &P->getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
TM = &P->getAnalysis<TargetPassConfig>().getTM<TargetMachine>();
AA = &P->getAnalysis<AAResultsWrapperPass>().getAAResults();
LIS = &P->getAnalysis<LiveIntervalsWrapperPass>().getLIS();
}

MachineSchedulerImpl::MachineSchedulerImpl(MachineFunction &Func,
MachineFunctionAnalysisManager &MFAM,
const TargetMachine *TargetM)
: MFAM(&MFAM) {
MF = &Func;
TM = TargetM;
MLI = &MFAM.getResult<MachineLoopAnalysis>(Func);
MDT = &MFAM.getResult<MachineDominatorTreeAnalysis>(Func);
auto &FAM = MFAM.getResult<FunctionAnalysisManagerMachineFunctionProxy>(Func)
.getManager();
AA = &FAM.getResult<AAManager>(Func.getFunction());
LIS = &MFAM.getResult<LiveIntervalsAnalysis>(Func);
}

/// Instantiate a ScheduleDAGInstrs that will be owned by the caller.
ScheduleDAGInstrs *MachineSchedulerImpl::createMachineScheduler() {
// Select the scheduler, or set the default.
Expand Down Expand Up @@ -471,27 +480,6 @@ bool MachineSchedulerImpl::run() {
return true;
}

PostMachineSchedulerImpl::PostMachineSchedulerImpl(MachineFunction &Func,
MachineFunctionPass *P)
: P(P) {
MF = &Func;
MLI = &P->getAnalysis<MachineLoopInfoWrapperPass>().getLI();
TM = &P->getAnalysis<TargetPassConfig>().getTM<TargetMachine>();
AA = &P->getAnalysis<AAResultsWrapperPass>().getAAResults();
}

PostMachineSchedulerImpl::PostMachineSchedulerImpl(
MachineFunction &Func, MachineFunctionAnalysisManager &MFAM,
const TargetMachine *TargetM)
: MFAM(&MFAM) {
MF = &Func;
TM = TargetM;
MLI = &MFAM.getResult<MachineLoopAnalysis>(Func);
auto &FAM = MFAM.getResult<FunctionAnalysisManagerMachineFunctionProxy>(Func)
.getManager();
AA = &FAM.getResult<AAManager>(Func.getFunction());
}

/// Instantiate a ScheduleDAGInstrs for PostRA scheduling that will be owned by
/// the caller. We don't have a command line option to override the postRA
/// scheduler. The Target must configure it.
Expand Down