shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AArch64][SME] Rename EdgeBundles to Bundles (NFC) (#154295)

Browse Source 
It seems some buildbots do not like the shadowing. See:
https://lab.llvm.org/buildbot/#/builders/137/builds/23838
This commit is contained in:
Benjamin Maxwell 2025-08-19 10:58:19 +01:00 committed by GitHub
parent 615f8393c9
commit 7170a81241
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Target/AArch64/MachineSMEABIPass.cpp
View File

@ -252,7 +252,7 @@ private:
} State; } State;
MachineFunction *MF = nullptr; MachineFunction *MF = nullptr;
EdgeBundles *EdgeBundles = nullptr; EdgeBundles *Bundles = nullptr;
const AArch64Subtarget *Subtarget = nullptr; const AArch64Subtarget *Subtarget = nullptr;
const AArch64RegisterInfo *TRI = nullptr; const AArch64RegisterInfo *TRI = nullptr;
const TargetInstrInfo *TII = nullptr; const TargetInstrInfo *TII = nullptr;
@ -316,8 +316,8 @@ void MachineSMEABI::collectNeededZAStates(SMEAttrs SMEFnAttrs) {
} }
void MachineSMEABI::assignBundleZAStates() { void MachineSMEABI::assignBundleZAStates() {
State.BundleStates.resize(EdgeBundles->getNumBundles()); State.BundleStates.resize(Bundles->getNumBundles());
for (unsigned I = 0, E = EdgeBundles->getNumBundles(); I != E; ++I) { for (unsigned I = 0, E = Bundles->getNumBundles(); I != E; ++I) {
LLVM_DEBUG(dbgs() << "Assigning ZA state for edge bundle: " << I << '\n'); LLVM_DEBUG(dbgs() << "Assigning ZA state for edge bundle: " << I << '\n');
// Attempt to assign a ZA state for this bundle that minimizes state // Attempt to assign a ZA state for this bundle that minimizes state
@ -326,7 +326,7 @@ void MachineSMEABI::assignBundleZAStates() {
// TODO: We should propagate desired incoming/outgoing states through blocks // TODO: We should propagate desired incoming/outgoing states through blocks
// that have the "ANY" state first to make better global decisions. // that have the "ANY" state first to make better global decisions.
int EdgeStateCounts[ZAState::NUM_ZA_STATE] = {0}; int EdgeStateCounts[ZAState::NUM_ZA_STATE] = {0};
for (unsigned BlockID : EdgeBundles->getBlocks(I)) { for (unsigned BlockID : Bundles->getBlocks(I)) {
LLVM_DEBUG(dbgs() << "- bb." << BlockID); LLVM_DEBUG(dbgs() << "- bb." << BlockID);
const BlockInfo &Block = State.Blocks[BlockID]; const BlockInfo &Block = State.Blocks[BlockID];
@ -334,8 +334,8 @@ void MachineSMEABI::assignBundleZAStates() {
LLVM_DEBUG(dbgs() << " (no state preference)\n"); LLVM_DEBUG(dbgs() << " (no state preference)\n");
continue; continue;
} }
bool InEdge = EdgeBundles->getBundle(BlockID, /*Out=*/false) == I; bool InEdge = Bundles->getBundle(BlockID, /*Out=*/false) == I;
bool OutEdge = EdgeBundles->getBundle(BlockID, /*Out=*/true) == I; bool OutEdge = Bundles->getBundle(BlockID, /*Out=*/true) == I;
ZAState DesiredIncomingState = Block.Insts.front().NeededState; ZAState DesiredIncomingState = Block.Insts.front().NeededState;
if (InEdge && isLegalEdgeBundleZAState(DesiredIncomingState)) { if (InEdge && isLegalEdgeBundleZAState(DesiredIncomingState)) {
@ -375,7 +375,7 @@ void MachineSMEABI::assignBundleZAStates() {
void MachineSMEABI::insertStateChanges() { void MachineSMEABI::insertStateChanges() {
for (MachineBasicBlock &MBB : *MF) { for (MachineBasicBlock &MBB : *MF) {
const BlockInfo &Block = State.Blocks[MBB.getNumber()]; const BlockInfo &Block = State.Blocks[MBB.getNumber()];
ZAState InState = State.BundleStates[EdgeBundles->getBundle(MBB.getNumber(), ZAState InState = State.BundleStates[Bundles->getBundle(MBB.getNumber(),
/*Out=*/false)]; /*Out=*/false)];
ZAState CurrentState = Block.FixedEntryState; ZAState CurrentState = Block.FixedEntryState;
@ -392,8 +392,8 @@ void MachineSMEABI::insertStateChanges() {
if (MBB.succ_empty()) if (MBB.succ_empty())
continue; continue;
ZAState OutState = State.BundleStates[EdgeBundles->getBundle( ZAState OutState =
MBB.getNumber(), /*Out=*/true)]; State.BundleStates[Bundles->getBundle(MBB.getNumber(), /*Out=*/true)];
if (CurrentState != OutState) if (CurrentState != OutState)
emitStateChange(MBB, MBB.getFirstTerminator(), CurrentState, OutState, emitStateChange(MBB, MBB.getFirstTerminator(), CurrentState, OutState,
Block.PhysLiveRegsAtExit); Block.PhysLiveRegsAtExit);
@ -674,7 +674,7 @@ bool MachineSMEABI::runOnMachineFunction(MachineFunction &MF) {
// Reset pass state. // Reset pass state.
State = PassState{}; State = PassState{};
this->MF = &MF; this->MF = &MF;
EdgeBundles = &getAnalysis<EdgeBundlesWrapperLegacy>().getEdgeBundles(); Bundles = &getAnalysis<EdgeBundlesWrapperLegacy>().getEdgeBundles();
Subtarget = &MF.getSubtarget<AArch64Subtarget>(); Subtarget = &MF.getSubtarget<AArch64Subtarget>();
TII = Subtarget->getInstrInfo(); TII = Subtarget->getInstrInfo();
TRI = Subtarget->getRegisterInfo(); TRI = Subtarget->getRegisterInfo();