Skip to content

Commit 7a0e222

Browse files
jayfoadjayfoad
committed
Revert "Convert many LivePhysRegs uses to LiveRegUnits (#83905)"
This reverts commit 2a13422. It was causing test failures on the expensive check builders.
1 parent 7524ad9 commit 7a0e222

12 files changed

+104
-96
lines changed

‎llvm/lib/CodeGen/ReachingDefAnalysis.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "llvm/CodeGen/ReachingDefAnalysis.h"
10-
#include "llvm/ADT/SetOperations.h"
119
#include "llvm/ADT/SmallSet.h"
12-
#include "llvm/CodeGen/LiveRegUnits.h"
10+
#include "llvm/ADT/SetOperations.h"
11+
#include "llvm/CodeGen/LivePhysRegs.h"
12+
#include "llvm/CodeGen/ReachingDefAnalysis.h"
1313
#include "llvm/CodeGen/TargetRegisterInfo.h"
1414
#include "llvm/CodeGen/TargetSubtargetInfo.h"
1515
#include "llvm/Support/Debug.h"
@@ -421,9 +421,9 @@ void ReachingDefAnalysis::getLiveOuts(MachineBasicBlock *MBB,
421421
return;
422422

423423
VisitedBBs.insert(MBB);
424-
LiveRegUnits LiveRegs(*TRI);
424+
LivePhysRegs LiveRegs(*TRI);
425425
LiveRegs.addLiveOuts(*MBB);
426-
if (LiveRegs.available(PhysReg))
426+
if (LiveRegs.available(MBB->getParent()->getRegInfo(), PhysReg))
427427
return;
428428

429429
if (auto *Def = getLocalLiveOutMIDef(MBB, PhysReg))
@@ -469,19 +469,19 @@ MachineInstr *ReachingDefAnalysis::getMIOperand(MachineInstr *MI,
469469
bool ReachingDefAnalysis::isRegUsedAfter(MachineInstr *MI,
470470
MCRegister PhysReg) const {
471471
MachineBasicBlock *MBB = MI->getParent();
472-
LiveRegUnits LiveRegs(*TRI);
472+
LivePhysRegs LiveRegs(*TRI);
473473
LiveRegs.addLiveOuts(*MBB);
474474

475475
// Yes if the register is live out of the basic block.
476-
if (!LiveRegs.available(PhysReg))
476+
if (!LiveRegs.available(MBB->getParent()->getRegInfo(), PhysReg))
477477
return true;
478478

479479
// Walk backwards through the block to see if the register is live at some
480480
// point.
481481
for (MachineInstr &Last :
482482
instructionsWithoutDebug(MBB->instr_rbegin(), MBB->instr_rend())) {
483483
LiveRegs.stepBackward(Last);
484-
if (!LiveRegs.available(PhysReg))
484+
if (!LiveRegs.available(MBB->getParent()->getRegInfo(), PhysReg))
485485
return InstIds.lookup(&Last) > InstIds.lookup(MI);
486486
}
487487
return false;
@@ -504,9 +504,9 @@ bool ReachingDefAnalysis::isRegDefinedAfter(MachineInstr *MI,
504504
bool ReachingDefAnalysis::isReachingDefLiveOut(MachineInstr *MI,
505505
MCRegister PhysReg) const {
506506
MachineBasicBlock *MBB = MI->getParent();
507-
LiveRegUnits LiveRegs(*TRI);
507+
LivePhysRegs LiveRegs(*TRI);
508508
LiveRegs.addLiveOuts(*MBB);
509-
if (LiveRegs.available(PhysReg))
509+
if (LiveRegs.available(MBB->getParent()->getRegInfo(), PhysReg))
510510
return false;
511511

512512
auto Last = MBB->getLastNonDebugInstr();
@@ -525,9 +525,9 @@ bool ReachingDefAnalysis::isReachingDefLiveOut(MachineInstr *MI,
525525
MachineInstr *
526526
ReachingDefAnalysis::getLocalLiveOutMIDef(MachineBasicBlock *MBB,
527527
MCRegister PhysReg) const {
528-
LiveRegUnits LiveRegs(*TRI);
528+
LivePhysRegs LiveRegs(*TRI);
529529
LiveRegs.addLiveOuts(*MBB);
530-
if (LiveRegs.available(PhysReg))
530+
if (LiveRegs.available(MBB->getParent()->getRegInfo(), PhysReg))
531531
return nullptr;
532532

533533
auto Last = MBB->getLastNonDebugInstr();

‎llvm/lib/Target/AArch64/AArch64FrameLowering.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
#include "llvm/ADT/SmallVector.h"
198198
#include "llvm/ADT/Statistic.h"
199199
#include "llvm/CodeGen/LivePhysRegs.h"
200-
#include "llvm/CodeGen/LiveRegUnits.h"
201200
#include "llvm/CodeGen/MachineBasicBlock.h"
202201
#include "llvm/CodeGen/MachineFrameInfo.h"
203202
#include "llvm/CodeGen/MachineFunction.h"
@@ -989,7 +988,7 @@ void AArch64FrameLowering::emitZeroCallUsedRegs(BitVector RegsToZero,
989988
}
990989
}
991990

992-
static void getLiveRegsForEntryMBB(LiveRegUnits &LiveRegs,
991+
static void getLiveRegsForEntryMBB(LivePhysRegs &LiveRegs,
993992
const MachineBasicBlock &MBB) {
994993
const MachineFunction *MF = MBB.getParent();
995994
LiveRegs.addLiveIns(MBB);
@@ -1019,15 +1018,16 @@ static Register findScratchNonCalleeSaveRegister(MachineBasicBlock *MBB) {
10191018

10201019
const AArch64Subtarget &Subtarget = MF->getSubtarget<AArch64Subtarget>();
10211020
const AArch64RegisterInfo &TRI = *Subtarget.getRegisterInfo();
1022-
LiveRegUnits LiveRegs(TRI);
1021+
LivePhysRegs LiveRegs(TRI);
10231022
getLiveRegsForEntryMBB(LiveRegs, *MBB);
10241023

10251024
// Prefer X9 since it was historically used for the prologue scratch reg.
1026-
if (LiveRegs.available(AArch64::X9))
1025+
const MachineRegisterInfo &MRI = MF->getRegInfo();
1026+
if (LiveRegs.available(MRI, AArch64::X9))
10271027
return AArch64::X9;
10281028

1029-
for (Register Reg : AArch64::GPR64RegClass) {
1030-
if (LiveRegs.available(Reg))
1029+
for (unsigned Reg : AArch64::GPR64RegClass) {
1030+
if (LiveRegs.available(MRI, Reg))
10311031
return Reg;
10321032
}
10331033
return AArch64::NoRegister;
@@ -1044,11 +1044,13 @@ bool AArch64FrameLowering::canUseAsPrologue(
10441044

10451045
if (AFI->hasSwiftAsyncContext()) {
10461046
const AArch64RegisterInfo &TRI = *Subtarget.getRegisterInfo();
1047-
LiveRegUnits LiveRegs(TRI);
1047+
const MachineRegisterInfo &MRI = MF->getRegInfo();
1048+
LivePhysRegs LiveRegs(TRI);
10481049
getLiveRegsForEntryMBB(LiveRegs, MBB);
10491050
// The StoreSwiftAsyncContext clobbers X16 and X17. Make sure they are
10501051
// available.
1051-
if (!LiveRegs.available(AArch64::X16) || !LiveRegs.available(AArch64::X17))
1052+
if (!LiveRegs.available(MRI, AArch64::X16) ||
1053+
!LiveRegs.available(MRI, AArch64::X17))
10521054
return false;
10531055
}
10541056

@@ -1601,7 +1603,7 @@ static void emitDefineCFAWithFP(MachineFunction &MF, MachineBasicBlock &MBB,
16011603
/// Collect live registers from the end of \p MI's parent up to (including) \p
16021604
/// MI in \p LiveRegs.
16031605
static void getLivePhysRegsUpTo(MachineInstr &MI, const TargetRegisterInfo &TRI,
1604-
LiveRegUnits &LiveRegs) {
1606+
LivePhysRegs &LiveRegs) {
16051607

16061608
MachineBasicBlock &MBB = *MI.getParent();
16071609
LiveRegs.addLiveOuts(MBB);
@@ -1639,7 +1641,7 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
16391641
NonFrameStart->getFlag(MachineInstr::FrameSetup))
16401642
++NonFrameStart;
16411643

1642-
LiveRegUnits LiveRegs(*TRI);
1644+
LivePhysRegs LiveRegs(*TRI);
16431645
if (NonFrameStart != MBB.end()) {
16441646
getLivePhysRegsUpTo(*NonFrameStart, *TRI, LiveRegs);
16451647
// Ignore registers used for stack management for now.
@@ -1657,7 +1659,7 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF,
16571659
make_range(MBB.instr_begin(), NonFrameStart->getIterator())) {
16581660
for (auto &Op : MI.operands())
16591661
if (Op.isReg() && Op.isDef())
1660-
assert(LiveRegs.available(Op.getReg()) &&
1662+
assert(!LiveRegs.contains(Op.getReg()) &&
16611663
"live register clobbered by inserted prologue instructions");
16621664
}
16631665
});
@@ -4012,7 +4014,7 @@ MachineBasicBlock::iterator tryMergeAdjacentSTG(MachineBasicBlock::iterator II,
40124014
// FIXME : This approach of bailing out from merge is conservative in
40134015
// some ways like even if stg loops are not present after merge the
40144016
// insert list, this liveness check is done (which is not needed).
4015-
LiveRegUnits LiveRegs(*(MBB->getParent()->getSubtarget().getRegisterInfo()));
4017+
LivePhysRegs LiveRegs(*(MBB->getParent()->getSubtarget().getRegisterInfo()));
40164018
LiveRegs.addLiveOuts(*MBB);
40174019
for (auto I = MBB->rbegin();; ++I) {
40184020
MachineInstr &MI = *I;
@@ -4021,7 +4023,7 @@ MachineBasicBlock::iterator tryMergeAdjacentSTG(MachineBasicBlock::iterator II,
40214023
LiveRegs.stepBackward(*I);
40224024
}
40234025
InsertI++;
4024-
if (!LiveRegs.available(AArch64::NZCV))
4026+
if (LiveRegs.contains(AArch64::NZCV))
40254027
return InsertI;
40264028

40274029
llvm::stable_sort(Instrs,

‎llvm/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "MCTargetDesc/AMDGPUMCTargetDesc.h"
1212
#include "SIRegisterInfo.h"
1313
#include "llvm/ADT/SmallVector.h"
14-
#include "llvm/CodeGen/LiveRegUnits.h"
14+
#include "llvm/CodeGen/LivePhysRegs.h"
1515
#include "llvm/CodeGen/MachineFunctionPass.h"
1616
#include "llvm/CodeGen/MachineOperand.h"
1717
#include "llvm/CodeGen/TargetRegisterInfo.h"
@@ -313,7 +313,7 @@ MachineBasicBlock::reverse_iterator SIOptimizeExecMasking::findExecCopy(
313313
return E;
314314
}
315315

316-
// XXX - Seems LiveRegUnits doesn't work correctly since it will incorrectly
316+
// XXX - Seems LivePhysRegs doesn't work correctly since it will incorrectly
317317
// report the register as unavailable because a super-register with a lane mask
318318
// is unavailable.
319319
static bool isLiveOut(const MachineBasicBlock &MBB, unsigned Reg) {
@@ -383,7 +383,7 @@ bool SIOptimizeExecMasking::isRegisterInUseBetween(MachineInstr &Stop,
383383
MCRegister Reg,
384384
bool UseLiveOuts,
385385
bool IgnoreStart) const {
386-
LiveRegUnits LR(*TRI);
386+
LivePhysRegs LR(*TRI);
387387
if (UseLiveOuts)
388388
LR.addLiveOuts(*Stop.getParent());
389389

@@ -396,7 +396,7 @@ bool SIOptimizeExecMasking::isRegisterInUseBetween(MachineInstr &Stop,
396396
LR.stepBackward(*A);
397397
}
398398

399-
return !LR.available(Reg);
399+
return !LR.available(*MRI, Reg);
400400
}
401401

402402
// Determine if a register Reg is not re-defined and still in use

‎llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "llvm/ADT/Statistic.h"
3232
#include "llvm/ADT/iterator_range.h"
3333
#include "llvm/Analysis/AliasAnalysis.h"
34-
#include "llvm/CodeGen/LiveRegUnits.h"
34+
#include "llvm/CodeGen/LivePhysRegs.h"
3535
#include "llvm/CodeGen/MachineBasicBlock.h"
3636
#include "llvm/CodeGen/MachineDominators.h"
3737
#include "llvm/CodeGen/MachineFrameInfo.h"
@@ -109,7 +109,7 @@ namespace {
109109
const ARMSubtarget *STI;
110110
const TargetLowering *TL;
111111
ARMFunctionInfo *AFI;
112-
LiveRegUnits LiveRegs;
112+
LivePhysRegs LiveRegs;
113113
RegisterClassInfo RegClassInfo;
114114
MachineBasicBlock::const_iterator LiveRegPos;
115115
bool LiveRegsValid;
@@ -589,7 +589,7 @@ unsigned ARMLoadStoreOpt::findFreeReg(const TargetRegisterClass &RegClass) {
589589
}
590590

591591
for (unsigned Reg : RegClassInfo.getOrder(&RegClass))
592-
if (LiveRegs.available(Reg))
592+
if (LiveRegs.available(MF->getRegInfo(), Reg))
593593
return Reg;
594594
return 0;
595595
}

‎llvm/lib/Target/ARM/Thumb1FrameLowering.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,11 +612,11 @@ bool Thumb1FrameLowering::needPopSpecialFixUp(const MachineFunction &MF) const {
612612

613613
static void findTemporariesForLR(const BitVector &GPRsNoLRSP,
614614
const BitVector &PopFriendly,
615-
const LiveRegUnits &UsedRegs, unsigned &PopReg,
615+
const LivePhysRegs &UsedRegs, unsigned &PopReg,
616616
unsigned &TmpReg, MachineRegisterInfo &MRI) {
617617
PopReg = TmpReg = 0;
618618
for (auto Reg : GPRsNoLRSP.set_bits()) {
619-
if (UsedRegs.available(Reg)) {
619+
if (UsedRegs.available(MRI, Reg)) {
620620
// Remember the first pop-friendly register and exit.
621621
if (PopFriendly.test(Reg)) {
622622
PopReg = Reg;
@@ -684,7 +684,7 @@ bool Thumb1FrameLowering::emitPopSpecialFixUp(MachineBasicBlock &MBB,
684684
// Look for a temporary register to use.
685685
// First, compute the liveness information.
686686
const TargetRegisterInfo &TRI = *STI.getRegisterInfo();
687-
LiveRegUnits UsedRegs(TRI);
687+
LivePhysRegs UsedRegs(TRI);
688688
UsedRegs.addLiveOuts(MBB);
689689
// The semantic of pristines changed recently and now,
690690
// the callee-saved registers that are touched in the function

‎llvm/lib/Target/SystemZ/SystemZElimCompare.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "llvm/ADT/SmallVector.h"
1919
#include "llvm/ADT/Statistic.h"
2020
#include "llvm/ADT/StringRef.h"
21-
#include "llvm/CodeGen/LiveRegUnits.h"
21+
#include "llvm/CodeGen/LivePhysRegs.h"
2222
#include "llvm/CodeGen/MachineBasicBlock.h"
2323
#include "llvm/CodeGen/MachineFunction.h"
2424
#include "llvm/CodeGen/MachineFunctionPass.h"
@@ -690,9 +690,9 @@ bool SystemZElimCompare::processBlock(MachineBasicBlock &MBB) {
690690
// Walk backwards through the block looking for comparisons, recording
691691
// all CC users as we go. The subroutines can delete Compare and
692692
// instructions before it.
693-
LiveRegUnits LiveRegs(*TRI);
693+
LivePhysRegs LiveRegs(*TRI);
694694
LiveRegs.addLiveOuts(MBB);
695-
bool CompleteCCUsers = LiveRegs.available(SystemZ::CC);
695+
bool CompleteCCUsers = !LiveRegs.contains(SystemZ::CC);
696696
SmallVector<MachineInstr *, 4> CCUsers;
697697
MachineBasicBlock::iterator MBBI = MBB.end();
698698
while (MBBI != MBB.begin()) {

‎llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "llvm/ADT/Statistic.h"
1919
#include "llvm/CodeGen/LiveInterval.h"
2020
#include "llvm/CodeGen/LiveIntervals.h"
21-
#include "llvm/CodeGen/LiveRegUnits.h"
21+
#include "llvm/CodeGen/LivePhysRegs.h"
2222
#include "llvm/CodeGen/LiveVariables.h"
2323
#include "llvm/CodeGen/MachineBasicBlock.h"
2424
#include "llvm/CodeGen/MachineFrameInfo.h"
@@ -1874,9 +1874,9 @@ prepareCompareSwapOperands(MachineBasicBlock::iterator const MBBI) const {
18741874
}
18751875
}
18761876
if (CCLive) {
1877-
LiveRegUnits LiveRegs(*MBB->getParent()->getSubtarget().getRegisterInfo());
1877+
LivePhysRegs LiveRegs(*MBB->getParent()->getSubtarget().getRegisterInfo());
18781878
LiveRegs.addLiveOuts(*MBB);
1879-
if (!LiveRegs.available(SystemZ::CC))
1879+
if (LiveRegs.contains(SystemZ::CC))
18801880
return false;
18811881
}
18821882

‎llvm/lib/Target/SystemZ/SystemZShortenInst.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
#include "SystemZTargetMachine.h"
16-
#include "llvm/CodeGen/LiveRegUnits.h"
16+
#include "llvm/CodeGen/LivePhysRegs.h"
1717
#include "llvm/CodeGen/MachineFunctionPass.h"
1818
#include "llvm/CodeGen/MachineInstrBuilder.h"
1919
#include "llvm/CodeGen/TargetRegisterInfo.h"
@@ -46,7 +46,7 @@ class SystemZShortenInst : public MachineFunctionPass {
4646

4747
const SystemZInstrInfo *TII;
4848
const TargetRegisterInfo *TRI;
49-
LiveRegUnits LiveRegs;
49+
LivePhysRegs LiveRegs;
5050
};
5151

5252
char SystemZShortenInst::ID = 0;
@@ -88,7 +88,7 @@ bool SystemZShortenInst::shortenIIF(MachineInstr &MI, unsigned LLIxL,
8888
unsigned GR64BitReg =
8989
TRI->getMatchingSuperReg(Reg, thisSubRegIdx, &SystemZ::GR64BitRegClass);
9090
Register OtherReg = TRI->getSubReg(GR64BitReg, otherSubRegIdx);
91-
if (!LiveRegs.available(OtherReg))
91+
if (LiveRegs.contains(OtherReg))
9292
return false;
9393

9494
uint64_t Imm = MI.getOperand(1).getImm();
@@ -143,7 +143,7 @@ bool SystemZShortenInst::shortenOn001(MachineInstr &MI, unsigned Opcode) {
143143
// Calls shortenOn001 if CCLive is false. CC def operand is added in
144144
// case of success.
145145
bool SystemZShortenInst::shortenOn001AddCC(MachineInstr &MI, unsigned Opcode) {
146-
if (LiveRegs.available(SystemZ::CC) && shortenOn001(MI, Opcode)) {
146+
if (!LiveRegs.contains(SystemZ::CC) && shortenOn001(MI, Opcode)) {
147147
MachineInstrBuilder(*MI.getParent()->getParent(), &MI)
148148
.addReg(SystemZ::CC, RegState::ImplicitDefine | RegState::Dead);
149149
return true;

‎llvm/lib/Target/X86/X86FloatingPoint.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "llvm/ADT/SmallVector.h"
3131
#include "llvm/ADT/Statistic.h"
3232
#include "llvm/CodeGen/EdgeBundles.h"
33-
#include "llvm/CodeGen/LiveRegUnits.h"
33+
#include "llvm/CodeGen/LivePhysRegs.h"
3434
#include "llvm/CodeGen/MachineFunctionPass.h"
3535
#include "llvm/CodeGen/MachineInstrBuilder.h"
3636
#include "llvm/CodeGen/MachineRegisterInfo.h"
@@ -1751,7 +1751,7 @@ void FPS::handleSpecialFP(MachineBasicBlock::iterator &Inst) {
17511751
void FPS::setKillFlags(MachineBasicBlock &MBB) const {
17521752
const TargetRegisterInfo &TRI =
17531753
*MBB.getParent()->getSubtarget().getRegisterInfo();
1754-
LiveRegUnits LPR(TRI);
1754+
LivePhysRegs LPR(TRI);
17551755

17561756
LPR.addLiveOuts(MBB);
17571757

@@ -1773,14 +1773,14 @@ void FPS::setKillFlags(MachineBasicBlock &MBB) const {
17731773

17741774
if (MO.isDef()) {
17751775
Defs.set(Reg);
1776-
if (LPR.available(MO.getReg()))
1776+
if (!LPR.contains(MO.getReg()))
17771777
MO.setIsDead();
17781778
} else
17791779
Uses.push_back(&MO);
17801780
}
17811781

17821782
for (auto *MO : Uses)
1783-
if (Defs.test(getFPReg(*MO)) || LPR.available(MO->getReg()))
1783+
if (Defs.test(getFPReg(*MO)) || !LPR.contains(MO->getReg()))
17841784
MO->setIsKill();
17851785

17861786
LPR.stepBackward(MI);

0 commit comments

Comments
 (0)