Skip to content

Commit 1d9ad5f

Browse files
optimisanoptimisan
committed
[CodeGen][NewPM] Port RegisterCoalescer to NPM
1 parent c5b9326 commit 1d9ad5f

14 files changed

+100
-25
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/RegisterCoalescer.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_COALESCER_H
10+
#define LLVM_CODEGEN_REGISTER_COALESCER_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_COALESCER_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-coalescing", RegisterCoalescerPass())
167168
MACHINE_FUNCTION_PASS("require-all-machine-function-properties",
168169
RequireAllMachineFunctionPropertiesPass())
169170
MACHINE_FUNCTION_PASS("stack-coloring", StackColoringPass())
@@ -264,7 +265,6 @@ DUMMY_MACHINE_FUNCTION_PASS("removeredundantdebugvalues", RemoveRedundantDebugVa
264265
DUMMY_MACHINE_FUNCTION_PASS("rename-independent-subregs", RenameIndependentSubregsPass)
265266
DUMMY_MACHINE_FUNCTION_PASS("reset-machine-function", ResetMachineFunctionPass)
266267
DUMMY_MACHINE_FUNCTION_PASS("shrink-wrap", ShrinkWrapPass)
267-
DUMMY_MACHINE_FUNCTION_PASS("simple-register-coalescing", RegisterCoalescerPass)
268268
DUMMY_MACHINE_FUNCTION_PASS("stack-frame-layout", StackFrameLayoutAnalysisPass)
269269
DUMMY_MACHINE_FUNCTION_PASS("stack-slot-coloring", StackSlotColoringPass)
270270
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 & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,18 @@
2525
#include "llvm/CodeGen/LiveIntervals.h"
2626
#include "llvm/CodeGen/LiveRangeEdit.h"
2727
#include "llvm/CodeGen/MachineBasicBlock.h"
28+
#include "llvm/CodeGen/MachineDominators.h"
2829
#include "llvm/CodeGen/MachineFunction.h"
2930
#include "llvm/CodeGen/MachineFunctionPass.h"
3031
#include "llvm/CodeGen/MachineInstr.h"
3132
#include "llvm/CodeGen/MachineInstrBuilder.h"
3233
#include "llvm/CodeGen/MachineLoopInfo.h"
3334
#include "llvm/CodeGen/MachineOperand.h"
35+
#include "llvm/CodeGen/MachinePassManager.h"
3436
#include "llvm/CodeGen/MachineRegisterInfo.h"
3537
#include "llvm/CodeGen/Passes.h"
3638
#include "llvm/CodeGen/RegisterClassInfo.h"
39+
#include "llvm/CodeGen/RegisterCoalescerPass.h"
3740
#include "llvm/CodeGen/SlotIndexes.h"
3841
#include "llvm/CodeGen/TargetInstrInfo.h"
3942
#include "llvm/CodeGen/TargetOpcodes.h"
@@ -122,15 +125,14 @@ namespace {
122125

123126
class JoinVals;
124127

125-
class RegisterCoalescer : public MachineFunctionPass,
126-
private LiveRangeEdit::Delegate {
128+
class RegisterCoalescer : private LiveRangeEdit::Delegate {
127129
MachineFunction *MF = nullptr;
128130
MachineRegisterInfo *MRI = nullptr;
129131
const TargetRegisterInfo *TRI = nullptr;
130132
const TargetInstrInfo *TII = nullptr;
131133
LiveIntervals *LIS = nullptr;
134+
SlotIndexes *SI = nullptr;
132135
const MachineLoopInfo *Loops = nullptr;
133-
AliasAnalysis *AA = nullptr;
134136
RegisterClassInfo RegClassInfo;
135137

136138
/// Position and VReg of a PHI instruction during coalescing.
@@ -378,11 +380,24 @@ class RegisterCoalescer : public MachineFunctionPass,
378380
void checkMergingChangesDbgValuesImpl(Register Reg, LiveRange &OtherRange,
379381
LiveRange &RegRange, JoinVals &Vals2);
380382

383+
public:
384+
RegisterCoalescer(LiveIntervals *LIS, SlotIndexes *SI,
385+
const MachineLoopInfo *Loops)
386+
: LIS(LIS), SI(SI), Loops(Loops) {}
387+
388+
void releaseMemory();
389+
void print(raw_ostream &O, const Module * = nullptr) const;
390+
bool run(MachineFunction &MF);
391+
};
392+
393+
class RegisterCoalescerLegacy : public MachineFunctionPass {
394+
std::unique_ptr<RegisterCoalescer> Impl;
395+
381396
public:
382397
static char ID; ///< Class identification, replacement for typeinfo
383398

384-
RegisterCoalescer() : MachineFunctionPass(ID) {
385-
initializeRegisterCoalescerPass(*PassRegistry::getPassRegistry());
399+
RegisterCoalescerLegacy() : MachineFunctionPass(ID) {
400+
initializeRegisterCoalescerLegacyPass(*PassRegistry::getPassRegistry());
386401
}
387402

388403
void getAnalysisUsage(AnalysisUsage &AU) const override;
@@ -392,28 +407,30 @@ class RegisterCoalescer : public MachineFunctionPass,
392407
MachineFunctionProperties::Property::IsSSA);
393408
}
394409

395-
void releaseMemory() override;
410+
void releaseMemory() override { Impl->releaseMemory(); }
396411

397412
/// This is the pass entry point.
398413
bool runOnMachineFunction(MachineFunction &) override;
399414

400415
/// Implement the dump method.
401-
void print(raw_ostream &O, const Module * = nullptr) const override;
416+
void print(raw_ostream &O, const Module * = nullptr) const override {
417+
Impl->print(O, nullptr);
418+
}
402419
};
403420

404421
} // end anonymous namespace
405422

406-
char RegisterCoalescer::ID = 0;
423+
char RegisterCoalescerLegacy::ID = 0;
407424

408-
char &llvm::RegisterCoalescerID = RegisterCoalescer::ID;
425+
char &llvm::RegisterCoalescerID = RegisterCoalescerLegacy::ID;
409426

410-
INITIALIZE_PASS_BEGIN(RegisterCoalescer, "register-coalescer",
427+
INITIALIZE_PASS_BEGIN(RegisterCoalescerLegacy, "register-coalescer",
411428
"Register Coalescer", false, false)
412429
INITIALIZE_PASS_DEPENDENCY(LiveIntervalsWrapperPass)
413430
INITIALIZE_PASS_DEPENDENCY(SlotIndexesWrapperPass)
414431
INITIALIZE_PASS_DEPENDENCY(MachineLoopInfoWrapperPass)
415432
INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
416-
INITIALIZE_PASS_END(RegisterCoalescer, "register-coalescer",
433+
INITIALIZE_PASS_END(RegisterCoalescerLegacy, "register-coalescer",
417434
"Register Coalescer", false, false)
418435

419436
[[nodiscard]] static bool isMoveInstr(const TargetRegisterInfo &tri,
@@ -590,8 +607,9 @@ bool CoalescerPair::isCoalescable(const MachineInstr *MI) const {
590607
}
591608
}
592609

593-
void RegisterCoalescer::getAnalysisUsage(AnalysisUsage &AU) const {
610+
void RegisterCoalescerLegacy::getAnalysisUsage(AnalysisUsage &AU) const {
594611
AU.setPreservesCFG();
612+
AU.addUsedIfAvailable<SlotIndexesWrapperPass>();
595613
AU.addRequired<AAResultsWrapperPass>();
596614
AU.addRequired<LiveIntervalsWrapperPass>();
597615
AU.addPreserved<LiveIntervalsWrapperPass>();
@@ -4290,7 +4308,33 @@ void RegisterCoalescer::releaseMemory() {
42904308
LargeLIVisitCounter.clear();
42914309
}
42924310

4293-
bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
4311+
PreservedAnalyses
4312+
RegisterCoalescerPass::run(MachineFunction &MF,
4313+
MachineFunctionAnalysisManager &MFAM) {
4314+
auto &LIS = MFAM.getResult<LiveIntervalsAnalysis>(MF);
4315+
auto &Loops = MFAM.getResult<MachineLoopAnalysis>(MF);
4316+
auto *SI = MFAM.getCachedResult<SlotIndexesAnalysis>(MF);
4317+
RegisterCoalescer Impl(&LIS, SI, &Loops);
4318+
if (!Impl.run(MF))
4319+
return PreservedAnalyses::all();
4320+
auto PA = getMachineFunctionPassPreservedAnalyses();
4321+
PA.preserve<LiveIntervalsAnalysis>();
4322+
PA.preserve<SlotIndexesAnalysis>();
4323+
PA.preserve<MachineLoopAnalysis>();
4324+
PA.preserve<MachineDominatorTreeAnalysis>();
4325+
return PA;
4326+
}
4327+
4328+
bool RegisterCoalescerLegacy::runOnMachineFunction(MachineFunction &MF) {
4329+
auto *LIS = &getAnalysis<LiveIntervalsWrapperPass>().getLIS();
4330+
auto *Loops = &getAnalysis<MachineLoopInfoWrapperPass>().getLI();
4331+
auto *SIWrapper = getAnalysisIfAvailable<SlotIndexesWrapperPass>();
4332+
SlotIndexes *SI = SIWrapper ? &SIWrapper->getSI() : nullptr;
4333+
Impl.reset(new RegisterCoalescer(LIS, SI, Loops));
4334+
return Impl->run(MF);
4335+
}
4336+
4337+
bool RegisterCoalescer::run(MachineFunction &fn) {
42944338
LLVM_DEBUG(dbgs() << "********** REGISTER COALESCER **********\n"
42954339
<< "********** Function: " << fn.getName() << '\n');
42964340

@@ -4313,9 +4357,6 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
43134357
const TargetSubtargetInfo &STI = fn.getSubtarget();
43144358
TRI = STI.getRegisterInfo();
43154359
TII = STI.getInstrInfo();
4316-
LIS = &getAnalysis<LiveIntervalsWrapperPass>().getLIS();
4317-
AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
4318-
Loops = &getAnalysis<MachineLoopInfoWrapperPass>().getLI();
43194360
if (EnableGlobalCopies == cl::BOU_UNSET)
43204361
JoinGlobalCopies = STI.enableJoinGlobalCopies();
43214362
else
@@ -4340,7 +4381,7 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
43404381
JoinSplitEdges = EnableJoinSplits;
43414382

43424383
if (VerifyCoalescing)
4343-
MF->verify(this, "Before register coalescing", &errs());
4384+
MF->verify(LIS, SI, "Before register coalescing", &errs());
43444385

43454386
DbgVRegToValues.clear();
43464387
buildVRegToDbgValueMap(fn);
@@ -4398,9 +4439,9 @@ bool RegisterCoalescer::runOnMachineFunction(MachineFunction &fn) {
43984439
PHIValToPos.clear();
43994440
RegToPHIIdx.clear();
44004441

4401-
LLVM_DEBUG(dump());
4442+
LLVM_DEBUG(print(dbgs(), nullptr));
44024443
if (VerifyCoalescing)
4403-
MF->verify(this, "After register coalescing", &errs());
4444+
MF->verify(LIS, SI, "After register coalescing", &errs());
44044445
return true;
44054446
}
44064447

‎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)