[llvm] d86e379 - [CodeGen][NewPM] Port StackSlotColoring to NPM. (#125876)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 5 09:48:20 PST 2025
Author: Christudasan Devadasan
Date: 2025-02-05T23:18:16+05:30
New Revision: d86e379fd2ed8292bb2df44fe6f40692869f40c3
URL: https://github.com/llvm/llvm-project/commit/d86e379fd2ed8292bb2df44fe6f40692869f40c3
DIFF: https://github.com/llvm/llvm-project/commit/d86e379fd2ed8292bb2df44fe6f40692869f40c3.diff
LOG: [CodeGen][NewPM] Port StackSlotColoring to NPM. (#125876)
Added:
llvm/include/llvm/CodeGen/StackSlotColoring.h
Modified:
llvm/include/llvm/InitializePasses.h
llvm/include/llvm/Passes/CodeGenPassBuilder.h
llvm/include/llvm/Passes/MachinePassRegistry.def
llvm/lib/CodeGen/CodeGen.cpp
llvm/lib/CodeGen/StackSlotColoring.cpp
llvm/lib/Passes/PassBuilder.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/CodeGen/StackSlotColoring.h b/llvm/include/llvm/CodeGen/StackSlotColoring.h
new file mode 100644
index 00000000000000..8db59a339280d4
--- /dev/null
+++ b/llvm/include/llvm/CodeGen/StackSlotColoring.h
@@ -0,0 +1,24 @@
+//===- llvm/CodeGen/StackSlotColoring.h -------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CODEGEN_STACKSLOTCOLORING_H
+#define LLVM_CODEGEN_STACKSLOTCOLORING_H
+
+#include "llvm/CodeGen/MachinePassManager.h"
+
+namespace llvm {
+
+class StackSlotColoringPass : public PassInfoMixin<StackSlotColoringPass> {
+public:
+ PreservedAnalyses run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM);
+};
+
+} // namespace llvm
+
+#endif // LLVM_CODEGEN_STACKSLOTCOLORING_H
diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h
index 1acc57bf219a66..b8df4d1ecab1d0 100644
--- a/llvm/include/llvm/InitializePasses.h
+++ b/llvm/include/llvm/InitializePasses.h
@@ -298,7 +298,7 @@ void initializeStackMapLivenessPass(PassRegistry &);
void initializeStackProtectorPass(PassRegistry &);
void initializeStackSafetyGlobalInfoWrapperPassPass(PassRegistry &);
void initializeStackSafetyInfoWrapperPassPass(PassRegistry &);
-void initializeStackSlotColoringPass(PassRegistry &);
+void initializeStackSlotColoringLegacyPass(PassRegistry &);
void initializeStraightLineStrengthReduceLegacyPassPass(PassRegistry &);
void initializeStripDebugMachineModulePass(PassRegistry &);
void initializeStructurizeCFGLegacyPassPass(PassRegistry &);
diff --git a/llvm/include/llvm/Passes/CodeGenPassBuilder.h b/llvm/include/llvm/Passes/CodeGenPassBuilder.h
index 16b7e4c0336d82..1458318ff021a9 100644
--- a/llvm/include/llvm/Passes/CodeGenPassBuilder.h
+++ b/llvm/include/llvm/Passes/CodeGenPassBuilder.h
@@ -70,6 +70,7 @@
#include "llvm/CodeGen/SjLjEHPrepare.h"
#include "llvm/CodeGen/StackColoring.h"
#include "llvm/CodeGen/StackProtector.h"
+#include "llvm/CodeGen/StackSlotColoring.h"
#include "llvm/CodeGen/TailDuplication.h"
#include "llvm/CodeGen/TargetPassConfig.h"
#include "llvm/CodeGen/TwoAddressInstructionPass.h"
diff --git a/llvm/include/llvm/Passes/MachinePassRegistry.def b/llvm/include/llvm/Passes/MachinePassRegistry.def
index f816c9345d8294..e6b4a4b0a56aee 100644
--- a/llvm/include/llvm/Passes/MachinePassRegistry.def
+++ b/llvm/include/llvm/Passes/MachinePassRegistry.def
@@ -173,6 +173,7 @@ MACHINE_FUNCTION_PASS("rename-independent-subregs", RenameIndependentSubregsPass
MACHINE_FUNCTION_PASS("require-all-machine-function-properties",
RequireAllMachineFunctionPropertiesPass())
MACHINE_FUNCTION_PASS("stack-coloring", StackColoringPass())
+MACHINE_FUNCTION_PASS("stack-slot-coloring", StackSlotColoringPass())
MACHINE_FUNCTION_PASS("tailduplication", TailDuplicatePass())
MACHINE_FUNCTION_PASS("trigger-verifier-error", TriggerVerifierErrorPass())
MACHINE_FUNCTION_PASS("two-address-instruction", TwoAddressInstructionPass())
@@ -267,7 +268,6 @@ DUMMY_MACHINE_FUNCTION_PASS("removeredundantdebugvalues", RemoveRedundantDebugVa
DUMMY_MACHINE_FUNCTION_PASS("reset-machine-function", ResetMachineFunctionPass)
DUMMY_MACHINE_FUNCTION_PASS("shrink-wrap", ShrinkWrapPass)
DUMMY_MACHINE_FUNCTION_PASS("stack-frame-layout", StackFrameLayoutAnalysisPass)
-DUMMY_MACHINE_FUNCTION_PASS("stack-slot-coloring", StackSlotColoringPass)
DUMMY_MACHINE_FUNCTION_PASS("stackmap-liveness", StackMapLivenessPass)
DUMMY_MACHINE_FUNCTION_PASS("unpack-mi-bundles", UnpackMachineBundlesPass)
DUMMY_MACHINE_FUNCTION_PASS("virtregrewriter", VirtRegRewriterPass)
diff --git a/llvm/lib/CodeGen/CodeGen.cpp b/llvm/lib/CodeGen/CodeGen.cpp
index 5955d0fc329407..35df2a479a545e 100644
--- a/llvm/lib/CodeGen/CodeGen.cpp
+++ b/llvm/lib/CodeGen/CodeGen.cpp
@@ -130,7 +130,7 @@ void llvm::initializeCodeGen(PassRegistry &Registry) {
initializeStackFrameLayoutAnalysisPassPass(Registry);
initializeStackMapLivenessPass(Registry);
initializeStackProtectorPass(Registry);
- initializeStackSlotColoringPass(Registry);
+ initializeStackSlotColoringLegacyPass(Registry);
initializeStaticDataSplitterPass(Registry);
initializeStripDebugMachineModulePass(Registry);
initializeTailDuplicateLegacyPass(Registry);
diff --git a/llvm/lib/CodeGen/StackSlotColoring.cpp b/llvm/lib/CodeGen/StackSlotColoring.cpp
index 3e57ee036081c9..22c5c2e080b054 100644
--- a/llvm/lib/CodeGen/StackSlotColoring.cpp
+++ b/llvm/lib/CodeGen/StackSlotColoring.cpp
@@ -10,6 +10,7 @@
//
//===----------------------------------------------------------------------===//
+#include "llvm/CodeGen/StackSlotColoring.h"
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
@@ -20,6 +21,7 @@
#include "llvm/CodeGen/LiveStacks.h"
#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineBlockFrequencyInfo.h"
+#include "llvm/CodeGen/MachineDominators.h"
#include "llvm/CodeGen/MachineFrameInfo.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
@@ -59,136 +61,145 @@ STATISTIC(NumDead, "Number of trivially dead stack accesses eliminated");
namespace {
- class StackSlotColoring : public MachineFunctionPass {
- LiveStacks *LS = nullptr;
- MachineFrameInfo *MFI = nullptr;
- const TargetInstrInfo *TII = nullptr;
- const MachineBlockFrequencyInfo *MBFI = nullptr;
- SlotIndexes *Indexes = nullptr;
-
- // SSIntervals - Spill slot intervals.
- std::vector<LiveInterval*> SSIntervals;
-
- // SSRefs - Keep a list of MachineMemOperands for each spill slot.
- // MachineMemOperands can be shared between instructions, so we need
- // to be careful that renames like [FI0, FI1] -> [FI1, FI2] do not
- // become FI0 -> FI1 -> FI2.
- SmallVector<SmallVector<MachineMemOperand *, 8>, 16> SSRefs;
-
- // OrigAlignments - Alignments of stack objects before coloring.
- SmallVector<Align, 16> OrigAlignments;
-
- // OrigSizes - Sizes of stack objects before coloring.
- SmallVector<unsigned, 16> OrigSizes;
-
- // AllColors - If index is set, it's a spill slot, i.e. color.
- // FIXME: This assumes PEI locate spill slot with smaller indices
- // closest to stack pointer / frame pointer. Therefore, smaller
- // index == better color. This is per stack ID.
- SmallVector<BitVector, 2> AllColors;
-
- // NextColor - Next "color" that's not yet used. This is per stack ID.
- SmallVector<int, 2> NextColors = { -1 };
-
- // UsedColors - "Colors" that have been assigned. This is per stack ID
- SmallVector<BitVector, 2> UsedColors;
-
- // Join all intervals sharing one color into a single LiveIntervalUnion to
- // speedup range overlap test.
- class ColorAssignmentInfo {
- // Single liverange (used to avoid creation of LiveIntervalUnion).
- LiveInterval *SingleLI = nullptr;
- // LiveIntervalUnion to perform overlap test.
- LiveIntervalUnion *LIU = nullptr;
- // LiveIntervalUnion has a parameter in its constructor so doing this
- // dirty magic.
- uint8_t LIUPad[sizeof(LiveIntervalUnion)];
-
- public:
- ~ColorAssignmentInfo() {
- if (LIU)
- LIU->~LiveIntervalUnion(); // Dirty magic again.
- }
-
- // Return true if LiveInterval overlaps with any
- // intervals that have already been assigned to this color.
- bool overlaps(LiveInterval *LI) const {
- if (LIU)
- return LiveIntervalUnion::Query(*LI, *LIU).checkInterference();
- return SingleLI ? SingleLI->overlaps(*LI) : false;
- }
-
- // Add new LiveInterval to this color.
- void add(LiveInterval *LI, LiveIntervalUnion::Allocator &Alloc) {
- assert(!overlaps(LI));
- if (LIU) {
- LIU->unify(*LI, *LI);
- } else if (SingleLI) {
- LIU = new (LIUPad) LiveIntervalUnion(Alloc);
- LIU->unify(*SingleLI, *SingleLI);
- LIU->unify(*LI, *LI);
- SingleLI = nullptr;
- } else
- SingleLI = LI;
- }
- };
-
- LiveIntervalUnion::Allocator LIUAlloc;
-
- // Assignments - Color to intervals mapping.
- SmallVector<ColorAssignmentInfo, 16> Assignments;
+class StackSlotColoring {
+ MachineFrameInfo *MFI = nullptr;
+ const TargetInstrInfo *TII = nullptr;
+ LiveStacks *LS = nullptr;
+ const MachineBlockFrequencyInfo *MBFI = nullptr;
+ SlotIndexes *Indexes = nullptr;
+
+ // SSIntervals - Spill slot intervals.
+ std::vector<LiveInterval *> SSIntervals;
+
+ // SSRefs - Keep a list of MachineMemOperands for each spill slot.
+ // MachineMemOperands can be shared between instructions, so we need
+ // to be careful that renames like [FI0, FI1] -> [FI1, FI2] do not
+ // become FI0 -> FI1 -> FI2.
+ SmallVector<SmallVector<MachineMemOperand *, 8>, 16> SSRefs;
+
+ // OrigAlignments - Alignments of stack objects before coloring.
+ SmallVector<Align, 16> OrigAlignments;
+
+ // OrigSizes - Sizes of stack objects before coloring.
+ SmallVector<unsigned, 16> OrigSizes;
+
+ // AllColors - If index is set, it's a spill slot, i.e. color.
+ // FIXME: This assumes PEI locate spill slot with smaller indices
+ // closest to stack pointer / frame pointer. Therefore, smaller
+ // index == better color. This is per stack ID.
+ SmallVector<BitVector, 2> AllColors;
+
+ // NextColor - Next "color" that's not yet used. This is per stack ID.
+ SmallVector<int, 2> NextColors = {-1};
+
+ // UsedColors - "Colors" that have been assigned. This is per stack ID
+ SmallVector<BitVector, 2> UsedColors;
+
+ // Join all intervals sharing one color into a single LiveIntervalUnion to
+ // speedup range overlap test.
+ class ColorAssignmentInfo {
+ // Single liverange (used to avoid creation of LiveIntervalUnion).
+ LiveInterval *SingleLI = nullptr;
+ // LiveIntervalUnion to perform overlap test.
+ LiveIntervalUnion *LIU = nullptr;
+ // LiveIntervalUnion has a parameter in its constructor so doing this
+ // dirty magic.
+ uint8_t LIUPad[sizeof(LiveIntervalUnion)];
public:
- static char ID; // Pass identification
+ ~ColorAssignmentInfo() {
+ if (LIU)
+ LIU->~LiveIntervalUnion(); // Dirty magic again.
+ }
- StackSlotColoring() : MachineFunctionPass(ID) {
- initializeStackSlotColoringPass(*PassRegistry::getPassRegistry());
+ // Return true if LiveInterval overlaps with any
+ // intervals that have already been assigned to this color.
+ bool overlaps(LiveInterval *LI) const {
+ if (LIU)
+ return LiveIntervalUnion::Query(*LI, *LIU).checkInterference();
+ return SingleLI ? SingleLI->overlaps(*LI) : false;
}
- void getAnalysisUsage(AnalysisUsage &AU) const override {
- AU.setPreservesCFG();
- AU.addRequired<SlotIndexesWrapperPass>();
- AU.addPreserved<SlotIndexesWrapperPass>();
- AU.addRequired<LiveStacksWrapperLegacy>();
- AU.addRequired<MachineBlockFrequencyInfoWrapperPass>();
- AU.addPreserved<MachineBlockFrequencyInfoWrapperPass>();
- AU.addPreservedID(MachineDominatorsID);
-
- // In some Target's pipeline, register allocation (RA) might be
- // split into multiple phases based on register class. So, this pass
- // may be invoked multiple times requiring it to save these analyses to be
- // used by RA later.
- AU.addPreserved<LiveIntervalsWrapperPass>();
- AU.addPreserved<LiveDebugVariablesWrapperLegacy>();
-
- MachineFunctionPass::getAnalysisUsage(AU);
+ // Add new LiveInterval to this color.
+ void add(LiveInterval *LI, LiveIntervalUnion::Allocator &Alloc) {
+ assert(!overlaps(LI));
+ if (LIU) {
+ LIU->unify(*LI, *LI);
+ } else if (SingleLI) {
+ LIU = new (LIUPad) LiveIntervalUnion(Alloc);
+ LIU->unify(*SingleLI, *SingleLI);
+ LIU->unify(*LI, *LI);
+ SingleLI = nullptr;
+ } else
+ SingleLI = LI;
}
+ };
+
+ LiveIntervalUnion::Allocator LIUAlloc;
+
+ // Assignments - Color to intervals mapping.
+ SmallVector<ColorAssignmentInfo, 16> Assignments;
+
+public:
+ StackSlotColoring(MachineFunction &MF, LiveStacks *LS,
+ MachineBlockFrequencyInfo *MBFI, SlotIndexes *Indexes)
+ : MFI(&MF.getFrameInfo()), TII(MF.getSubtarget().getInstrInfo()), LS(LS),
+ MBFI(MBFI), Indexes(Indexes) {}
+ bool run(MachineFunction &MF);
+
+private:
+ void InitializeSlots();
+ void ScanForSpillSlotRefs(MachineFunction &MF);
+ int ColorSlot(LiveInterval *li);
+ bool ColorSlots(MachineFunction &MF);
+ void RewriteInstruction(MachineInstr &MI, SmallVectorImpl<int> &SlotMapping,
+ MachineFunction &MF);
+ bool RemoveDeadStores(MachineBasicBlock *MBB);
+};
- bool runOnMachineFunction(MachineFunction &MF) override;
+class StackSlotColoringLegacy : public MachineFunctionPass {
+public:
+ static char ID; // Pass identification
- private:
- void InitializeSlots();
- void ScanForSpillSlotRefs(MachineFunction &MF);
- int ColorSlot(LiveInterval *li);
- bool ColorSlots(MachineFunction &MF);
- void RewriteInstruction(MachineInstr &MI, SmallVectorImpl<int> &SlotMapping,
- MachineFunction &MF);
- bool RemoveDeadStores(MachineBasicBlock* MBB);
- };
+ StackSlotColoringLegacy() : MachineFunctionPass(ID) {
+ initializeStackSlotColoringLegacyPass(*PassRegistry::getPassRegistry());
+ }
+
+ void getAnalysisUsage(AnalysisUsage &AU) const override {
+ AU.setPreservesCFG();
+ AU.addRequired<SlotIndexesWrapperPass>();
+ AU.addPreserved<SlotIndexesWrapperPass>();
+ AU.addRequired<LiveStacksWrapperLegacy>();
+ AU.addRequired<MachineBlockFrequencyInfoWrapperPass>();
+ AU.addPreserved<MachineBlockFrequencyInfoWrapperPass>();
+ AU.addPreservedID(MachineDominatorsID);
+
+ // In some Target's pipeline, register allocation (RA) might be
+ // split into multiple phases based on register class. So, this pass
+ // may be invoked multiple times requiring it to save these analyses to be
+ // used by RA later.
+ AU.addPreserved<LiveIntervalsWrapperPass>();
+ AU.addPreserved<LiveDebugVariablesWrapperLegacy>();
+
+ MachineFunctionPass::getAnalysisUsage(AU);
+ }
+
+ bool runOnMachineFunction(MachineFunction &MF) override;
+};
} // end anonymous namespace
-char StackSlotColoring::ID = 0;
+char StackSlotColoringLegacy::ID = 0;
-char &llvm::StackSlotColoringID = StackSlotColoring::ID;
+char &llvm::StackSlotColoringID = StackSlotColoringLegacy::ID;
-INITIALIZE_PASS_BEGIN(StackSlotColoring, DEBUG_TYPE,
- "Stack Slot Coloring", false, false)
+INITIALIZE_PASS_BEGIN(StackSlotColoringLegacy, DEBUG_TYPE,
+ "Stack Slot Coloring", false, false)
INITIALIZE_PASS_DEPENDENCY(SlotIndexesWrapperPass)
INITIALIZE_PASS_DEPENDENCY(LiveStacksWrapperLegacy)
INITIALIZE_PASS_DEPENDENCY(MachineLoopInfoWrapperPass)
-INITIALIZE_PASS_END(StackSlotColoring, DEBUG_TYPE,
- "Stack Slot Coloring", false, false)
+INITIALIZE_PASS_END(StackSlotColoringLegacy, DEBUG_TYPE, "Stack Slot Coloring",
+ false, false)
namespace {
@@ -511,21 +522,12 @@ bool StackSlotColoring::RemoveDeadStores(MachineBasicBlock* MBB) {
return changed;
}
-bool StackSlotColoring::runOnMachineFunction(MachineFunction &MF) {
+bool StackSlotColoring::run(MachineFunction &MF) {
LLVM_DEBUG({
dbgs() << "********** Stack Slot Coloring **********\n"
<< "********** Function: " << MF.getName() << '\n';
});
- if (skipFunction(MF.getFunction()))
- return false;
-
- MFI = &MF.getFrameInfo();
- TII = MF.getSubtarget().getInstrInfo();
- LS = &getAnalysis<LiveStacksWrapperLegacy>().getLS();
- MBFI = &getAnalysis<MachineBlockFrequencyInfoWrapperPass>().getMBFI();
- Indexes = &getAnalysis<SlotIndexesWrapperPass>().getSI();
-
bool Changed = false;
unsigned NumSlots = LS->getNumIntervals();
@@ -559,3 +561,37 @@ bool StackSlotColoring::runOnMachineFunction(MachineFunction &MF) {
return Changed;
}
+
+bool StackSlotColoringLegacy::runOnMachineFunction(MachineFunction &MF) {
+ if (skipFunction(MF.getFunction()))
+ return false;
+
+ LiveStacks *LS = &getAnalysis<LiveStacksWrapperLegacy>().getLS();
+ MachineBlockFrequencyInfo *MBFI =
+ &getAnalysis<MachineBlockFrequencyInfoWrapperPass>().getMBFI();
+ SlotIndexes *Indexes = &getAnalysis<SlotIndexesWrapperPass>().getSI();
+ StackSlotColoring Impl(MF, LS, MBFI, Indexes);
+ return Impl.run(MF);
+}
+
+PreservedAnalyses
+StackSlotColoringPass::run(MachineFunction &MF,
+ MachineFunctionAnalysisManager &MFAM) {
+ LiveStacks *LS = &MFAM.getResult<LiveStacksAnalysis>(MF);
+ MachineBlockFrequencyInfo *MBFI =
+ &MFAM.getResult<MachineBlockFrequencyAnalysis>(MF);
+ SlotIndexes *Indexes = &MFAM.getResult<SlotIndexesAnalysis>(MF);
+ StackSlotColoring Impl(MF, LS, MBFI, Indexes);
+ bool Changed = Impl.run(MF);
+ if (!Changed)
+ return PreservedAnalyses::all();
+
+ auto PA = getMachineFunctionPassPreservedAnalyses();
+ PA.preserveSet<CFGAnalyses>();
+ PA.preserve<SlotIndexesAnalysis>();
+ PA.preserve<MachineBlockFrequencyAnalysis>();
+ PA.preserve<MachineDominatorTreeAnalysis>();
+ PA.preserve<LiveIntervalsAnalysis>();
+ PA.preserve<LiveDebugVariablesAnalysis>();
+ return PA;
+}
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 7a384b1857164f..650d23ac1d5efa 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -141,6 +141,7 @@
#include "llvm/CodeGen/SpillPlacement.h"
#include "llvm/CodeGen/StackColoring.h"
#include "llvm/CodeGen/StackProtector.h"
+#include "llvm/CodeGen/StackSlotColoring.h"
#include "llvm/CodeGen/TailDuplication.h"
#include "llvm/CodeGen/TargetPassConfig.h"
#include "llvm/CodeGen/TwoAddressInstructionPass.h"
More information about the llvm-commits
mailing list