Skip to content

Revert "[Mips] Fix atomic min/max generate mips4 instructions when compiling for mips2" #159495

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 1 commit into from
Sep 18, 2025
Merged

Revert "[Mips] Fix atomic min/max generate mips4 instructions when compiling for mips2" #159495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
213 changes: 25 additions & 188 deletions llvm/lib/Target/Mips/MipsExpandPseudo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,44 +432,23 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword(
Register OldVal = I->getOperand(6).getReg();
Register BinOpRes = I->getOperand(7).getReg();
Register StoreVal = I->getOperand(8).getReg();
bool NoMovnInstr = (IsMin || IsMax) && !STI->hasMips4() && !STI->hasMips32();

const BasicBlock *LLVM_BB = BB.getBasicBlock();
MachineBasicBlock *loopMBB = MF->CreateMachineBasicBlock(LLVM_BB);
MachineBasicBlock *loop1MBB;
MachineBasicBlock *loop2MBB;
if (NoMovnInstr) {
loop1MBB = MF->CreateMachineBasicBlock(LLVM_BB);
loop2MBB = MF->CreateMachineBasicBlock(LLVM_BB);
}
MachineBasicBlock *sinkMBB = MF->CreateMachineBasicBlock(LLVM_BB);
MachineBasicBlock *exitMBB = MF->CreateMachineBasicBlock(LLVM_BB);
MachineFunction::iterator It = ++BB.getIterator();
MF->insert(It, loopMBB);
if (NoMovnInstr) {
MF->insert(It, loop1MBB);
MF->insert(It, loop2MBB);
}
MF->insert(It, sinkMBB);
MF->insert(It, exitMBB);

exitMBB->splice(exitMBB->begin(), &BB, std::next(I), BB.end());
exitMBB->transferSuccessorsAndUpdatePHIs(&BB);

BB.addSuccessor(loopMBB, BranchProbability::getOne());
if (NoMovnInstr) {
loopMBB->addSuccessor(loop1MBB);
loopMBB->addSuccessor(loop2MBB);
} else {
loopMBB->addSuccessor(sinkMBB);
loopMBB->addSuccessor(loopMBB);
}
loopMBB->addSuccessor(sinkMBB);
loopMBB->addSuccessor(loopMBB);
loopMBB->normalizeSuccProbs();
if (NoMovnInstr) {
loop1MBB->addSuccessor(loop2MBB);
loop2MBB->addSuccessor(loopMBB);
loop2MBB->addSuccessor(exitMBB, BranchProbability::getOne());
}

BuildMI(loopMBB, DL, TII->get(LL), OldVal).addReg(Ptr).addImm(0);
if (IsNand) {
Expand Down Expand Up @@ -546,7 +525,7 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword(
BuildMI(loopMBB, DL, TII->get(OR), BinOpRes)
.addReg(BinOpRes)
.addReg(Scratch4);
} else if (STI->hasMips4() || STI->hasMips32()) {
} else {
// max: move BinOpRes, StoreVal
// movn BinOpRes, Incr, Scratch4, BinOpRes
// min: move BinOpRes, StoreVal
Expand All @@ -558,59 +537,12 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword(
.addReg(Incr)
.addReg(Scratch4)
.addReg(BinOpRes);
} else {
// if min:
// loopMBB: move BinOpRes, StoreVal
// beq Scratch4, 0, loop1MBB
// j loop2MBB
// loop1MBB: move BinOpRes, Incr
// loop2MBB: and BinOpRes, BinOpRes, Mask
// and StoreVal, OlddVal, Mask2
// or StoreVal, StoreVal, BinOpRes
// StoreVal<tied1> = sc StoreVal, 0(Ptr)
// beq StoreVal, zero, loopMBB
//
// if max:
// loopMBB: move BinOpRes, Incr
// beq Scratch4, 0, loop1MBB
// j loop2MBB
// loop1MBB: move BinOpRes, StoreVal
// loop2MBB: and BinOpRes, BinOpRes, Mask
// and StoreVal, OlddVal, Mask2
// or StoreVal, StoreVal, BinOpRes
// StoreVal<tied1> = sc StoreVal, 0(Ptr)
// beq StoreVal, zero, loopMBB
if (IsMin) {
BuildMI(loopMBB, DL, TII->get(OR), BinOpRes)
.addReg(StoreVal)
.addReg(Mips::ZERO);
BuildMI(loop1MBB, DL, TII->get(OR), BinOpRes)
.addReg(Incr)
.addReg(Mips::ZERO);
} else {
BuildMI(loopMBB, DL, TII->get(OR), BinOpRes)
.addReg(Incr)
.addReg(Mips::ZERO);
BuildMI(loop1MBB, DL, TII->get(OR), BinOpRes)
.addReg(StoreVal)
.addReg(Mips::ZERO);
}
BuildMI(loopMBB, DL, TII->get(BEQ))
.addReg(Scratch4)
.addReg(Mips::ZERO)
.addMBB(loop1MBB);
BuildMI(loopMBB, DL, TII->get(Mips::B)).addMBB(loop2MBB);
}

// and BinOpRes, BinOpRes, Mask
if (NoMovnInstr)
BuildMI(loop2MBB, DL, TII->get(Mips::AND), BinOpRes)
.addReg(BinOpRes)
.addReg(Mask);
else
BuildMI(loopMBB, DL, TII->get(Mips::AND), BinOpRes)
.addReg(BinOpRes)
.addReg(Mask);
BuildMI(loopMBB, DL, TII->get(Mips::AND), BinOpRes)
.addReg(BinOpRes)
.addReg(Mask);

} else if (!IsSwap) {
// <binop> binopres, oldval, incr2
Expand All @@ -632,37 +564,14 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword(
// or StoreVal, StoreVal, BinOpRes
// StoreVal<tied1> = sc StoreVal, 0(Ptr)
// beq StoreVal, zero, loopMBB
if (NoMovnInstr) {
BuildMI(loop2MBB, DL, TII->get(Mips::AND), StoreVal)
.addReg(OldVal)
.addReg(Mask2);
BuildMI(loop2MBB, DL, TII->get(Mips::OR), StoreVal)
.addReg(StoreVal)
.addReg(BinOpRes);
BuildMI(loop2MBB, DL, TII->get(SC), StoreVal)
.addReg(StoreVal)
.addReg(Ptr)
.addImm(0);
BuildMI(loop2MBB, DL, TII->get(BEQ))
.addReg(StoreVal)
.addReg(Mips::ZERO)
.addMBB(loopMBB);
} else {
BuildMI(loopMBB, DL, TII->get(Mips::AND), StoreVal)
.addReg(OldVal)
.addReg(Mask2);
BuildMI(loopMBB, DL, TII->get(Mips::OR), StoreVal)
.addReg(StoreVal)
.addReg(BinOpRes);
BuildMI(loopMBB, DL, TII->get(SC), StoreVal)
.addReg(StoreVal)
.addReg(Ptr)
.addImm(0);
BuildMI(loopMBB, DL, TII->get(BEQ))
.addReg(StoreVal)
.addReg(Mips::ZERO)
.addMBB(loopMBB);
}
BuildMI(loopMBB, DL, TII->get(Mips::AND), StoreVal)
.addReg(OldVal).addReg(Mask2);
BuildMI(loopMBB, DL, TII->get(Mips::OR), StoreVal)
.addReg(StoreVal).addReg(BinOpRes);
BuildMI(loopMBB, DL, TII->get(SC), StoreVal)
.addReg(StoreVal).addReg(Ptr).addImm(0);
BuildMI(loopMBB, DL, TII->get(BEQ))
.addReg(StoreVal).addReg(Mips::ZERO).addMBB(loopMBB);

// sinkMBB:
// and maskedoldval1,oldval,mask
Expand Down Expand Up @@ -691,10 +600,6 @@ bool MipsExpandPseudo::expandAtomicBinOpSubword(

LivePhysRegs LiveRegs;
computeAndAddLiveIns(LiveRegs, *loopMBB);
if (NoMovnInstr) {
computeAndAddLiveIns(LiveRegs, *loop1MBB);
computeAndAddLiveIns(LiveRegs, *loop2MBB);
}
computeAndAddLiveIns(LiveRegs, *sinkMBB);
computeAndAddLiveIns(LiveRegs, *exitMBB);

Expand Down Expand Up @@ -841,41 +746,20 @@ bool MipsExpandPseudo::expandAtomicBinOp(MachineBasicBlock &BB,
llvm_unreachable("Unknown pseudo atomic!");
}

bool NoMovnInstr = (IsMin || IsMax) && !STI->hasMips4() && !STI->hasMips32();
const BasicBlock *LLVM_BB = BB.getBasicBlock();
MachineBasicBlock *loopMBB = MF->CreateMachineBasicBlock(LLVM_BB);
MachineBasicBlock *loop1MBB;
MachineBasicBlock *loop2MBB;
if (NoMovnInstr) {
loop1MBB = MF->CreateMachineBasicBlock(LLVM_BB);
loop2MBB = MF->CreateMachineBasicBlock(LLVM_BB);
}
MachineBasicBlock *exitMBB = MF->CreateMachineBasicBlock(LLVM_BB);
MachineFunction::iterator It = ++BB.getIterator();
MF->insert(It, loopMBB);
if (NoMovnInstr) {
MF->insert(It, loop1MBB);
MF->insert(It, loop2MBB);
}
MF->insert(It, exitMBB);

exitMBB->splice(exitMBB->begin(), &BB, std::next(I), BB.end());
exitMBB->transferSuccessorsAndUpdatePHIs(&BB);

BB.addSuccessor(loopMBB, BranchProbability::getOne());
if (NoMovnInstr) {
loopMBB->addSuccessor(loop1MBB);
loopMBB->addSuccessor(loop2MBB);
} else {
loopMBB->addSuccessor(exitMBB);
loopMBB->addSuccessor(loopMBB);
}
loopMBB->addSuccessor(exitMBB);
loopMBB->addSuccessor(loopMBB);
loopMBB->normalizeSuccProbs();
if (NoMovnInstr) {
loop1MBB->addSuccessor(loop2MBB);
loop2MBB->addSuccessor(loopMBB);
loop2MBB->addSuccessor(exitMBB, BranchProbability::getOne());
}

BuildMI(loopMBB, DL, TII->get(LL), OldVal).addReg(Ptr).addImm(0);
assert((OldVal != Ptr) && "Clobbered the wrong ptr reg!");
Expand Down Expand Up @@ -918,7 +802,7 @@ bool MipsExpandPseudo::expandAtomicBinOp(MachineBasicBlock &BB,
BuildMI(loopMBB, DL, TII->get(OR), Scratch)
.addReg(Scratch)
.addReg(Scratch2);
} else if (STI->hasMips4() || STI->hasMips32()) {
} else {
// max: move Scratch, OldVal
// movn Scratch, Incr, Scratch2, Scratch
// min: move Scratch, OldVal
Expand All @@ -930,38 +814,6 @@ bool MipsExpandPseudo::expandAtomicBinOp(MachineBasicBlock &BB,
.addReg(Incr)
.addReg(Scratch2)
.addReg(Scratch);
} else {
// if min:
// loopMBB: move Scratch, OldVal
// beq Scratch2_32, 0, loop1MBB
// j loop2MBB
// loop1MBB: move Scratch, Incr
// loop2MBB: sc $2, 0($4)
// beqz $2, $BB0_1
// nop
//
// if max:
// loopMBB: move Scratch, Incr
// beq Scratch2_32, 0, loop1MBB
// j loop2MBB
// loop1MBB: move Scratch, OldVal
// loop2MBB: sc $2, 0($4)
// beqz $2, $BB0_1
// nop
if (IsMin) {
BuildMI(loopMBB, DL, TII->get(OR), Scratch).addReg(OldVal).addReg(ZERO);
BuildMI(loop1MBB, DL, TII->get(OR), Scratch).addReg(Incr).addReg(ZERO);
} else {
BuildMI(loopMBB, DL, TII->get(OR), Scratch).addReg(Incr).addReg(ZERO);
BuildMI(loop1MBB, DL, TII->get(OR), Scratch)
.addReg(OldVal)
.addReg(ZERO);
}
BuildMI(loopMBB, DL, TII->get(BEQ))
.addReg(Scratch2_32)
.addReg(ZERO)
.addMBB(loop1MBB);
BuildMI(loopMBB, DL, TII->get(Mips::B)).addMBB(loop2MBB);
}

} else if (Opcode) {
Expand All @@ -977,35 +829,20 @@ bool MipsExpandPseudo::expandAtomicBinOp(MachineBasicBlock &BB,
BuildMI(loopMBB, DL, TII->get(OR), Scratch).addReg(Incr).addReg(ZERO);
}

if (NoMovnInstr) {
BuildMI(loop2MBB, DL, TII->get(SC), Scratch)
.addReg(Scratch)
.addReg(Ptr)
.addImm(0);
BuildMI(loop2MBB, DL, TII->get(BEQ))
.addReg(Scratch)
.addReg(ZERO)
.addMBB(loopMBB);
} else {
BuildMI(loopMBB, DL, TII->get(SC), Scratch)
.addReg(Scratch)
.addReg(Ptr)
.addImm(0);
BuildMI(loopMBB, DL, TII->get(BEQ))
.addReg(Scratch)
.addReg(ZERO)
.addMBB(loopMBB);
}
BuildMI(loopMBB, DL, TII->get(SC), Scratch)
.addReg(Scratch)
.addReg(Ptr)
.addImm(0);
BuildMI(loopMBB, DL, TII->get(BEQ))
.addReg(Scratch)
.addReg(ZERO)
.addMBB(loopMBB);

NMBBI = BB.end();
I->eraseFromParent();

LivePhysRegs LiveRegs;
computeAndAddLiveIns(LiveRegs, *loopMBB);
if (!STI->hasMips4() && !STI->hasMips32()) {
computeAndAddLiveIns(LiveRegs, *loop1MBB);
computeAndAddLiveIns(LiveRegs, *loop2MBB);
}
computeAndAddLiveIns(LiveRegs, *exitMBB);

return true;
Expand Down
Loading
Loading