Skip to content

Commit 1d7d146

Browse files
optimisanoptimisan
committed
[CodeGen][NewPM] Port RegisterCoalescer to NPM
1 parent 889be85 commit 1d7d146

14 files changed

+100
-23
lines changed

‎llvm/include/llvm/CodeGen/RegisterCoalescerPass.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//===- llvm/CodeGen/RegisterCoalescerPass.h ---------------------*- C++ -*-===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLVM_CODEGEN_REGISTER_COALESCERPASS_H
10+
#define LLVM_CODEGEN_REGISTER_COALESCERPASS_H
11+
12+
#include "llvm/CodeGen/MachinePassManager.h"
13+
14+
namespace llvm {
15+
class RegisterCoalescerPass : public PassInfoMixin<RegisterCoalescerPass> {
16+
public:
17+
PreservedAnalyses run(MachineFunction &MF,
18+
MachineFunctionAnalysisManager &MFAM);
19+
20+
MachineFunctionProperties getClearedProperties() const {
21+
return MachineFunctionProperties().set(
22+
MachineFunctionProperties::Property::IsSSA);
23+
}
24+
};
25+
26+
} // namespace llvm
27+
28+
#endif // LLVM_CODEGEN_REGISTER_COALESCERPASS_H

‎llvm/include/llvm/InitializePasses.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void initializeRegionOnlyPrinterPass(PassRegistry &);
266266
void initializeRegionOnlyViewerPass(PassRegistry &);
267267
void initializeRegionPrinterPass(PassRegistry &);
268268
void initializeRegionViewerPass(PassRegistry &);
269-
void initializeRegisterCoalescerPass(PassRegistry &);
269+
void initializeRegisterCoalescerLegacyPass(PassRegistry &);
270270
void initializeRemoveLoadsIntoFakeUsesPass(PassRegistry &);
271271
void initializeRemoveRedundantDebugValuesPass(PassRegistry &);
272272
void initializeRenameIndependentSubregsPass(PassRegistry &);

‎llvm/include/llvm/Passes/CodeGenPassBuilder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
#include "llvm/CodeGen/RegAllocFast.h"
5858
#include "llvm/CodeGen/RegUsageInfoCollector.h"
5959
#include "llvm/CodeGen/RegUsageInfoPropagate.h"
60+
#include "llvm/CodeGen/RegisterCoalescerPass.h"
6061
#include "llvm/CodeGen/RegisterUsageInfo.h"
6162
#include "llvm/CodeGen/ReplaceWithVeclib.h"
6263
#include "llvm/CodeGen/SafeStack.h"

‎llvm/include/llvm/Passes/MachinePassRegistry.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ MACHINE_FUNCTION_PASS("print<slot-indexes>", SlotIndexesPrinterPass(errs()))
164164
MACHINE_FUNCTION_PASS("print<virtregmap>", VirtRegMapPrinterPass(errs()))
165165
MACHINE_FUNCTION_PASS("reg-usage-collector", RegUsageInfoCollectorPass())
166166
MACHINE_FUNCTION_PASS("reg-usage-propagation", RegUsageInfoPropagationPass())
167+
MACHINE_FUNCTION_PASS("register-coalescer", RegisterCoalescerPass())
167168
MACHINE_FUNCTION_PASS("require-all-machine-function-properties",
168169
RequireAllMachineFunctionPropertiesPass())
169170
MACHINE_FUNCTION_PASS("stack-coloring", StackColoringPass())
@@ -265,7 +266,6 @@ DUMMY_MACHINE_FUNCTION_PASS("removeredundantdebugvalues", RemoveRedundantDebugVa
265266
DUMMY_MACHINE_FUNCTION_PASS("rename-independent-subregs", RenameIndependentSubregsPass)
266267
DUMMY_MACHINE_FUNCTION_PASS("reset-machine-function", ResetMachineFunctionPass)
267268
DUMMY_MACHINE_FUNCTION_PASS("shrink-wrap", ShrinkWrapPass)
268-
DUMMY_MACHINE_FUNCTION_PASS("simple-register-coalescing", RegisterCoalescerPass)
269269
DUMMY_MACHINE_FUNCTION_PASS("stack-frame-layout", StackFrameLayoutAnalysisPass)
270270
DUMMY_MACHINE_FUNCTION_PASS("stack-slot-coloring", StackSlotColoringPass)
271271
DUMMY_MACHINE_FUNCTION_PASS("stackmap-liveness", StackMapLivenessPass)

‎llvm/lib/CodeGen/CodeGen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void llvm::initializeCodeGen(PassRegistry &Registry) {
116116
initializeRegAllocFastPass(Registry);
117117
initializeRegUsageInfoCollectorLegacyPass(Registry);
118118
initializeRegUsageInfoPropagationLegacyPass(Registry);
119-
initializeRegisterCoalescerPass(Registry);
119+
initializeRegisterCoalescerLegacyPass(Registry);
120120
initializeRemoveLoadsIntoFakeUsesPass(Registry);
121121
initializeRemoveRedundantDebugValuesPass(Registry);
122122
initializeRenameIndependentSubregsPass(Registry);

‎llvm/lib/CodeGen/RegAllocBasic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ INITIALIZE_PASS_BEGIN(RABasic, "regallocbasic", "Basic Register Allocator",
134134
INITIALIZE_PASS_DEPENDENCY(LiveDebugVariablesWrapperLegacy)
135135
INITIALIZE_PASS_DEPENDENCY(SlotIndexesWrapperPass)
136136
INITIALIZE_PASS_DEPENDENCY(LiveIntervalsWrapperPass)
137-
INITIALIZE_PASS_DEPENDENCY(RegisterCoalescer)
137+
INITIALIZE_PASS_DEPENDENCY(RegisterCoalescerLegacy)
138138
INITIALIZE_PASS_DEPENDENCY(MachineScheduler)
139139
INITIALIZE_PASS_DEPENDENCY(LiveStacksWrapperLegacy)
140140
INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)

‎llvm/lib/CodeGen/RegAllocGreedy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ INITIALIZE_PASS_BEGIN(RAGreedy, "greedy",
154154
INITIALIZE_PASS_DEPENDENCY(LiveDebugVariablesWrapperLegacy)
155155
INITIALIZE_PASS_DEPENDENCY(SlotIndexesWrapperPass)
156156
INITIALIZE_PASS_DEPENDENCY(LiveIntervalsWrapperPass)
157-
INITIALIZE_PASS_DEPENDENCY(RegisterCoalescer)
157+
INITIALIZE_PASS_DEPENDENCY(RegisterCoalescerLegacy)
158158
INITIALIZE_PASS_DEPENDENCY(MachineScheduler)
159159
INITIALIZE_PASS_DEPENDENCY(LiveStacksWrapperLegacy)
160160
INITIALIZE_PASS_DEPENDENCY(MachineDominatorTreeWrapperPass)

‎llvm/lib/CodeGen/RegisterCoalescer.cpp

Lines changed: 60 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,18 @@
2424
#include "llvm/CodeGen/LiveIntervals.h"
2525
#include "llvm/CodeGen/LiveRangeEdit.h"
2626
#include "llvm/CodeGen/MachineBasicBlock.h"
27+
#include "llvm/CodeGen/MachineDominators.h"
2728
#include "llvm/CodeGen/MachineFunction.h"
2829
#include "llvm/CodeGen/MachineFunctionPass.h"
2930
#include "llvm/CodeGen/MachineInstr.h"
3031
#include "llvm/CodeGen/MachineInstrBuilder.h"
3132
#include "llvm/CodeGen/MachineLoopInfo.h"
3233
#include "llvm/CodeGen/MachineOperand.h"
34+
#include "llvm/CodeGen/MachinePassManager.h"
3335
#include "llvm/CodeGen/MachineRegisterInfo.h"
3436
#include "llvm/CodeGen/Passes.h"
3537
#include "llvm/CodeGen/RegisterClassInfo.h"
38+
#include "llvm/CodeGen/RegisterCoalescerPass.h"
3639
#include "llvm/CodeGen/SlotIndexes.h"
3740
#include "llvm/CodeGen/TargetInstrInfo.h"
3841
#include "llvm/CodeGen/TargetOpcodes.h"
@@ -121,13 +124,13 @@ namespace {
121124

122125
class JoinVals;
123126

124-
class RegisterCoalescer : public MachineFunctionPass,
125-
private LiveRangeEdit::Delegate {
127+
class RegisterCoalescer : private LiveRangeEdit::Delegate {
126128
MachineFunction *MF = nullptr;
127129
MachineRegisterInfo *MRI = nullptr;
128130
const TargetRegisterInfo *TRI = nullptr;
129131
const TargetInstrInfo *TII = nullptr;
130132
LiveIntervals *LIS = nullptr;
133+
SlotIndexes *SI = nullptr;
131134
const MachineLoopInfo *Loops = nullptr;
132135
RegisterClassInfo RegClassInfo;
133136

@@ -372,11 +375,24 @@ class RegisterCoalescer : public MachineFunctionPass,
372375
void checkMergingChangesDbgValuesImpl(Register Reg, LiveRange &OtherRange,
373376
LiveRange &RegRange, JoinVals &Vals2);
374377

378+
public:
379+
RegisterCoalescer(LiveIntervals *LIS, SlotIndexes *SI,
380+
const MachineLoopInfo *Loops)
381+
: LIS(LIS), SI(SI), Loops(Loops) {}
382+
383+
void releaseMemory();
384+
void print(raw_ostream &O, const Module * = nullptr) const;
385+
bool run(MachineFunction &MF);
386+
};
387+
388+
class RegisterCoalescerLegacy : public MachineFunctionPass {
389+
std::unique_ptr<RegisterCoalescer> Impl;
390+
375391
public:
376392
static char ID; ///< Class identification, replacement for typeinfo
377393

378-
RegisterCoalescer() : MachineFunctionPass(ID) {
379-
initializeRegisterCoalescerPass(*PassRegistry::getPassRegistry());
394+
RegisterCoalescerLegacy() : MachineFunctionPass(ID) {
395+
initializeRegisterCoalescerLegacyPass(*PassRegistry::getPassRegistry());
380396
}
381397

382398
void getAnalysisUsage(AnalysisUsage &AU) const override;
@@ -386,27 +402,29 @@ class RegisterCoalescer : public MachineFunctionPass,
386402
MachineFunctionProperties::Property::IsSSA);
387403
}
388404

389-
void releaseMemory() override;
405+
void releaseMemory() override { Impl->releaseMemory(); }
390406

391407
/// This is the pass entry point.
392408
bool runOnMachineFunction(MachineFunction &) override;
393409

394410
/// Implement the dump method.
395-
void print(raw_ostream &O, const Module * = nullptr) const override;
411+
void print(raw_ostream &O, const Module * = nullptr) const override {
412+
Impl->print(O, nullptr);
413+
}
396414
};
397415

398416
} // end anonymous namespace
399417

400-
char RegisterCoalescer::ID = 0;
418+
char RegisterCoalescerLegacy::ID = 0;
401419

402-
char &llvm::RegisterCoalescerID = RegisterCoalescer::ID;
420+
char &llvm::RegisterCoalescerID = RegisterCoalescerLegacy::ID;
403421

404-
INITIALIZE_PASS_BEGIN(RegisterCoalescer, "register-coalescer",
422+
INITIALIZE_PASS_BEGIN(RegisterCoalescerLegacy, "register-coalescer",
405423
"Register Coalescer", false, false)
406424
INITIALIZE_PASS_DEPENDENCY(LiveIntervalsWrapperPass)
407425
INITIALIZE_PASS_DEPENDENCY(SlotIndexesWrapperPass)
408426
INITIALIZE_PASS_DEPENDENCY(MachineLoopInfoWrapperPass)
409-
INITIALIZE_PASS_END(RegisterCoalescer, "register-coalescer",
427+
INITIALIZE_PASS_END(RegisterCoalescerLegacy, "register-coalescer",
410428
"Register Coalescer", false, false)
411429

412430
[[nodiscard]] static bool isMoveInstr(const TargetRegisterInfo &tri,
@@ -583,8 +601,9 @@ bool CoalescerPair::isCoalescable(const MachineInstr *MI) const {
583601
}
584602
}
585603

586-
void RegisterCoalescer::getAnalysisUsage(AnalysisUsage &AU) const {
604+
void RegisterCoalescerLegacy::getAnalysisUsage(AnalysisUsage &AU) const {
587605
AU.setPreservesCFG();
606+
AU.addUsedIfAvailable<SlotIndexesWrapperPass>();
588607
AU.addRequired<LiveIntervalsWrapperPass>();
589608
AU.addPreserved<LiveIntervalsWrapperPass>();
590609
AU.addPreserved<SlotIndexesWrapperPass>();
@@ -4237,7 +4256,33 @@ void RegisterCoalescer::releaseMemory() {
42374256
LargeLIVisitCounter.clear();
42384257
}
42394258

4240-
bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
4259+
PreservedAnalyses
4260+
RegisterCoalescerPass::run(MachineFunction &MF,
4261+
MachineFunctionAnalysisManager &MFAM) {
4262+
auto &LIS = MFAM.getResult<LiveIntervalsAnalysis>(MF);
4263+
auto &Loops = MFAM.getResult<MachineLoopAnalysis>(MF);
4264+
auto *SI = MFAM.getCachedResult<SlotIndexesAnalysis>(MF);
4265+
RegisterCoalescer Impl(&LIS, SI, &Loops);
4266+
if (!Impl.run(MF))
4267+
return PreservedAnalyses::all();
4268+
auto PA = getMachineFunctionPassPreservedAnalyses();
4269+
PA.preserve<LiveIntervalsAnalysis>();
4270+
PA.preserve<SlotIndexesAnalysis>();
4271+
PA.preserve<MachineLoopAnalysis>();
4272+
PA.preserve<MachineDominatorTreeAnalysis>();
4273+
return PA;
4274+
}
4275+
4276+
bool RegisterCoalescerLegacy::runOnMachineFunction(MachineFunction &MF) {
4277+
auto *LIS = &getAnalysis<LiveIntervalsWrapperPass>().getLIS();
4278+
auto *Loops = &getAnalysis<MachineLoopInfoWrapperPass>().getLI();
4279+
auto *SIWrapper = getAnalysisIfAvailable<SlotIndexesWrapperPass>();
4280+
SlotIndexes *SI = SIWrapper ? &SIWrapper->getSI() : nullptr;
4281+
Impl.reset(new RegisterCoalescer(LIS, SI, Loops));
4282+
return Impl->run(MF);
4283+
}
4284+
4285+
bool RegisterCoalescer::run(MachineFunction &fn) {
42414286
LLVM_DEBUG(dbgs() << "********** REGISTER COALESCER **********\n"
42424287
<< "********** Function: " << fn.getName() << '\n');
42434288

@@ -4260,8 +4305,6 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
42604305
const TargetSubtargetInfo &STI = fn.getSubtarget();
42614306
TRI = STI.getRegisterInfo();
42624307
TII = STI.getInstrInfo();
4263-
LIS = &getAnalysis<LiveIntervalsWrapperPass>().getLIS();
4264-
Loops = &getAnalysis<MachineLoopInfoWrapperPass>().getLI();
42654308
if (EnableGlobalCopies == cl::BOU_UNSET)
42664309
JoinGlobalCopies = STI.enableJoinGlobalCopies();
42674310
else
@@ -4286,7 +4329,7 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
42864329
JoinSplitEdges = EnableJoinSplits;
42874330

42884331
if (VerifyCoalescing)
4289-
MF->verify(this, "Before register coalescing", &errs());
4332+
MF->verify(LIS, SI, "Before register coalescing", &errs());
42904333

42914334
DbgVRegToValues.clear();
42924335
buildVRegToDbgValueMap(fn);
@@ -4344,9 +4387,9 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
43444387
PHIValToPos.clear();
43454388
RegToPHIIdx.clear();
43464389

4347-
LLVM_DEBUG(dump());
4390+
LLVM_DEBUG(print(dbgs(), nullptr));
43484391
if (VerifyCoalescing)
4349-
MF->verify(this, "After register coalescing", &errs());
4392+
MF->verify(LIS, SI, "After register coalescing", &errs());
43504393
return true;
43514394
}
43524395

‎llvm/lib/CodeGen/RegisterCoalescer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#ifndef LLVM_LIB_CODEGEN_REGISTERCOALESCER_H
1515
#define LLVM_LIB_CODEGEN_REGISTERCOALESCER_H
1616

17+
#include "llvm/CodeGen/MachinePassManager.h"
1718
#include "llvm/CodeGen/Register.h"
1819

1920
namespace llvm {

‎llvm/lib/Passes/PassBuilder.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
#include "llvm/CodeGen/RegAllocFast.h"
127127
#include "llvm/CodeGen/RegUsageInfoCollector.h"
128128
#include "llvm/CodeGen/RegUsageInfoPropagate.h"
129+
#include "llvm/CodeGen/RegisterCoalescerPass.h"
129130
#include "llvm/CodeGen/RegisterUsageInfo.h"
130131
#include "llvm/CodeGen/SafeStack.h"
131132
#include "llvm/CodeGen/SelectOptimize.h"

0 commit comments

Comments
 (0)