maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[LiveRegUnits] Add phys_regs_and_masks iterator range (NFC). 

This iterator range just includes physical registers and register masks,
which are interesting when dealing with register liveness.

Reviewers: evandro, t.p.northover, paquette, MatzeB, arsenm

Reviewed By: paquette

Differential Revision: https://reviews.llvm.org/D70562
This commit is contained in:
Florian Hahn 2019-12-11 09:27:01 +00:00
parent 445c3fdd2a
commit 11f311875f
3 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/include/llvm/CodeGen/LiveRegUnits.h
View File

@ -160,6 +160,19 @@ private:
void addPristines(const MachineFunction &MF);
};
/// Returns an iterator range over all physical register and mask operands for
/// \p MI and bundled instructions. This also skips any debug operands.
inline iterator_range<filter_iterator<
ConstMIBundleOperands, std::function<bool(const MachineOperand &)>>>
phys_regs_and_masks(const MachineInstr &MI) {
std::function<bool(const MachineOperand &)> Pred =
[](const MachineOperand &MOP) {
return MOP.isRegMask() || (MOP.isReg() && !MOP.isDebug() &&
Register::isPhysicalRegister(MOP.getReg()));
};
return make_filter_range(const_mi_bundle_ops(MI), Pred);
}
} // end namespace llvm
#endif // LLVM_CODEGEN_LIVEREGUNITS_H

28
llvm/lib/CodeGen/LivePhysRegs.cpp
View File

@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/CodeGen/LivePhysRegs.h"
#include "llvm/CodeGen/LiveRegUnits.h"
#include "llvm/CodeGen/MachineFrameInfo.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineInstrBundle.h"
@ -42,28 +43,23 @@ void LivePhysRegs::removeRegsInMask(const MachineOperand &MO,
/// Remove defined registers and regmask kills from the set.
void LivePhysRegs::removeDefs(const MachineInstr &MI) {
for (ConstMIBundleOperands O(MI); O.isValid(); ++O) {
if (O->isReg()) {
if (!O->isDef() || O->isDebug())
continue;
Register Reg = O->getReg();
if (!Register::isPhysicalRegister(Reg))
continue;
removeReg(Reg);
} else if (O->isRegMask())
removeRegsInMask(*O);
for (const MachineOperand &MOP : phys_regs_and_masks(MI)) {
if (MOP.isRegMask()) {
removeRegsInMask(MOP);
continue;
}
if (MOP.isDef())
removeReg(MOP.getReg());
}
}
/// Add uses to the set.
void LivePhysRegs::addUses(const MachineInstr &MI) {
for (ConstMIBundleOperands O(MI); O.isValid(); ++O) {
if (!O->isReg() || !O->readsReg() || O->isDebug())
for (const MachineOperand &MOP : phys_regs_and_masks(MI)) {
if (!MOP.isReg() || !MOP.readsReg())
continue;
Register Reg = O->getReg();
if (!Register::isPhysicalRegister(Reg))
continue;
addReg(Reg);
addReg(MOP.getReg());
}
}

45
llvm/lib/CodeGen/LiveRegUnits.cpp
View File

@ -43,41 +43,34 @@ void LiveRegUnits::addRegsInMask(const uint32_t *RegMask) {
void LiveRegUnits::stepBackward(const MachineInstr &MI) {
// Remove defined registers and regmask kills from the set.
for (ConstMIBundleOperands O(MI); O.isValid(); ++O) {
if (O->isReg()) {
if (!O->isDef() || O->isDebug())
continue;
Register Reg = O->getReg();
if (!Register::isPhysicalRegister(Reg))
continue;
removeReg(Reg);
} else if (O->isRegMask())
removeRegsNotPreserved(O->getRegMask());
for (const MachineOperand &MOP : phys_regs_and_masks(MI)) {
if (MOP.isRegMask()) {
removeRegsNotPreserved(MOP.getRegMask());
continue;
}
if (MOP.isDef())
removeReg(MOP.getReg());
}
// Add uses to the set.
for (ConstMIBundleOperands O(MI); O.isValid(); ++O) {
if (!O->isReg() || !O->readsReg() || O->isDebug())
for (const MachineOperand &MOP : phys_regs_and_masks(MI)) {
if (!MOP.isReg() || !MOP.readsReg())
continue;
Register Reg = O->getReg();
if (!Register::isPhysicalRegister(Reg))
continue;
addReg(Reg);
addReg(MOP.getReg());
}
}
void LiveRegUnits::accumulate(const MachineInstr &MI) {
// Add defs, uses and regmask clobbers to the set.
for (ConstMIBundleOperands O(MI); O.isValid(); ++O) {
if (O->isReg()) {
Register Reg = O->getReg();
if (!Register::isPhysicalRegister(Reg))
continue;
if (!O->isDef() && !O->readsReg())
continue;
addReg(Reg);
} else if (O->isRegMask())
addRegsInMask(O->getRegMask());
for (const MachineOperand &MOP : phys_regs_and_masks(MI)) {
if (MOP.isRegMask()) {
addRegsInMask(MOP.getRegMask());
continue;
}
if (!MOP.isDef() && !MOP.readsReg())
continue;
addReg(MOP.getReg());
}
}