Skip to content

[BranchFolding] Remove getBranchDebugLoc() #114613

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

Merged
merged 2 commits into from
Jan 22, 2025
Merged

[BranchFolding] Remove getBranchDebugLoc() #114613

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49d218
[BranchFolding] Remove getBranchDebugLoc()
ellishg Nov 1, 2024
9c7c28b
auto -> DebugLoc
ellishg Nov 4, 2024
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
42 changes: 17 additions & 25 deletions llvm/lib/CodeGen/BranchFolding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,15 +1266,6 @@ static bool IsBetterFallthrough(MachineBasicBlock *MBB1,
return MBB2I->isCall() && !MBB1I->isCall();
}

/// getBranchDebugLoc - Find and return, if any, the DebugLoc of the branch
/// instructions on the block.
static DebugLoc getBranchDebugLoc(MachineBasicBlock &MBB) {
MachineBasicBlock::iterator I = MBB.getLastNonDebugInstr();
if (I != MBB.end() && I->isBranch())
return I->getDebugLoc();
return DebugLoc();
}

static void copyDebugInfoToPredecessor(const TargetInstrInfo *TII,
MachineBasicBlock &MBB,
MachineBasicBlock &PredMBB) {
Expand Down Expand Up @@ -1401,11 +1392,11 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
// destination, remove the branch, replacing it with an unconditional one or
// a fall-through.
if (PriorTBB && PriorTBB == PriorFBB) {
DebugLoc dl = getBranchDebugLoc(PrevBB);
auto Dl = PrevBB.findBranchDebugLoc();
TII->removeBranch(PrevBB);
PriorCond.clear();
if (PriorTBB != MBB)
TII->insertBranch(PrevBB, PriorTBB, nullptr, PriorCond, dl);
TII->insertBranch(PrevBB, PriorTBB, nullptr, PriorCond, Dl);
MadeChange = true;
++NumBranchOpts;
goto ReoptimizeBlock;
Expand Down Expand Up @@ -1459,9 +1450,9 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
// If the prior block branches somewhere else on the condition and here if
// the condition is false, remove the uncond second branch.
if (PriorFBB == MBB) {
DebugLoc dl = getBranchDebugLoc(PrevBB);
auto Dl = PrevBB.findBranchDebugLoc();
TII->removeBranch(PrevBB);
TII->insertBranch(PrevBB, PriorTBB, nullptr, PriorCond, dl);
TII->insertBranch(PrevBB, PriorTBB, nullptr, PriorCond, Dl);
MadeChange = true;
++NumBranchOpts;
goto ReoptimizeBlock;
Expand All @@ -1473,9 +1464,9 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
if (PriorTBB == MBB) {
SmallVector<MachineOperand, 4> NewPriorCond(PriorCond);
if (!TII->reverseBranchCondition(NewPriorCond)) {
DebugLoc dl = getBranchDebugLoc(PrevBB);
auto Dl = PrevBB.findBranchDebugLoc();
TII->removeBranch(PrevBB);
TII->insertBranch(PrevBB, PriorFBB, nullptr, NewPriorCond, dl);
TII->insertBranch(PrevBB, PriorFBB, nullptr, NewPriorCond, Dl);
MadeChange = true;
++NumBranchOpts;
goto ReoptimizeBlock;
Expand Down Expand Up @@ -1511,9 +1502,9 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
LLVM_DEBUG(dbgs() << "\nMoving MBB: " << *MBB
<< "To make fallthrough to: " << *PriorTBB << "\n");

DebugLoc dl = getBranchDebugLoc(PrevBB);
auto Dl = PrevBB.findBranchDebugLoc();
TII->removeBranch(PrevBB);
TII->insertBranch(PrevBB, MBB, nullptr, NewPriorCond, dl);
TII->insertBranch(PrevBB, MBB, nullptr, NewPriorCond, Dl);

// Move this block to the end of the function.
MBB->moveAfter(&MF.back());
Expand Down Expand Up @@ -1574,9 +1565,9 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
if (CurTBB && CurFBB && CurFBB == MBB && CurTBB != MBB) {
SmallVector<MachineOperand, 4> NewCond(CurCond);
if (!TII->reverseBranchCondition(NewCond)) {
DebugLoc dl = getBranchDebugLoc(*MBB);
auto Dl = MBB->findBranchDebugLoc();
TII->removeBranch(*MBB);
TII->insertBranch(*MBB, CurFBB, CurTBB, NewCond, dl);
TII->insertBranch(*MBB, CurFBB, CurTBB, NewCond, Dl);
MadeChange = true;
++NumBranchOpts;
goto ReoptimizeBlock;
Expand All @@ -1588,7 +1579,7 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
if (CurTBB && CurCond.empty() && !CurFBB &&
IsBranchOnlyBlock(MBB) && CurTBB != MBB &&
!MBB->hasAddressTaken() && !MBB->isEHPad()) {
DebugLoc dl = getBranchDebugLoc(*MBB);
auto Dl = MBB->findBranchDebugLoc();
// This block may contain just an unconditional branch. Because there can
// be 'non-branch terminators' in the block, try removing the branch and
// then seeing if the block is empty.
Expand Down Expand Up @@ -1622,9 +1613,9 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
assert(!PriorFBB && "Machine CFG out of date!");
PriorFBB = MBB;
}
DebugLoc pdl = getBranchDebugLoc(PrevBB);
auto PrevDl = PrevBB.findBranchDebugLoc();
TII->removeBranch(PrevBB);
TII->insertBranch(PrevBB, PriorTBB, PriorFBB, PriorCond, pdl);
TII->insertBranch(PrevBB, PriorTBB, PriorFBB, PriorCond, PrevDl);
}

// Iterate through all the predecessors, revectoring each in-turn.
Expand Down Expand Up @@ -1657,10 +1648,11 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
bool NewCurUnAnalyzable = TII->analyzeBranch(
*PMBB, NewCurTBB, NewCurFBB, NewCurCond, true);
if (!NewCurUnAnalyzable && NewCurTBB && NewCurTBB == NewCurFBB) {
DebugLoc pdl = getBranchDebugLoc(*PMBB);
auto PrevDl = PMBB->findBranchDebugLoc();
TII->removeBranch(*PMBB);
NewCurCond.clear();
TII->insertBranch(*PMBB, NewCurTBB, nullptr, NewCurCond, pdl);
TII->insertBranch(*PMBB, NewCurTBB, nullptr, NewCurCond,
PrevDl);
MadeChange = true;
++NumBranchOpts;
}
Expand All @@ -1679,7 +1671,7 @@ bool BranchFolder::OptimizeBlock(MachineBasicBlock *MBB) {
}

// Add the branch back if the block is more than just an uncond branch.
TII->insertBranch(*MBB, CurTBB, nullptr, CurCond, dl);
TII->insertBranch(*MBB, CurTBB, nullptr, CurCond, Dl);
}
}

Expand Down
Loading