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

MachineBasicBlock: Use MCPhysReg instead of unsigned in livein API 

This is friendlier to the readers as it makes it clear that the API is
not meant for vregs but just for physregs.

llvm-svn: 245977
This commit is contained in:
Matthias Braun 2015-08-25 22:05:55 +00:00
parent cd59591396
commit 130bd90e17
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/include/llvm/CodeGen/MachineBasicBlock.h
View File

@ -16,6 +16,7 @@
#include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/GraphTraits.h"
#include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineInstr.h"
#include "llvm/MC/MCRegisterInfo.h"
#include "llvm/Support/DataTypes.h" #include "llvm/Support/DataTypes.h"
#include <functional> #include <functional>
@ -79,7 +80,8 @@ class MachineBasicBlock : public ilist_node<MachineBasicBlock> {
typedef std::vector<uint32_t>::const_iterator const_weight_iterator; typedef std::vector<uint32_t>::const_iterator const_weight_iterator;
/// Keep track of the physical registers that are livein of the basicblock. /// Keep track of the physical registers that are livein of the basicblock.
std::vector<unsigned> LiveIns; typedef std::vector<MCPhysReg> LiveInVector;
LiveInVector LiveIns;
/// Alignment of the basic block. Zero if the basic block does not need to be /// Alignment of the basic block. Zero if the basic block does not need to be
/// aligned. The alignment is specified as log2(bytes). /// aligned. The alignment is specified as log2(bytes).
@ -309,7 +311,7 @@ public:
/// Adds the specified register as a live in. Note that it is an error to add /// Adds the specified register as a live in. Note that it is an error to add
/// the same register to the same set more than once unless the intention is /// the same register to the same set more than once unless the intention is
/// to call sortUniqueLiveIns after all registers are added. /// to call sortUniqueLiveIns after all registers are added.
void addLiveIn(unsigned Reg) { LiveIns.push_back(Reg); } void addLiveIn(MCPhysReg PhysReg) { LiveIns.push_back(PhysReg); }
/// Sorts and uniques the LiveIns vector. It can be significantly faster to do /// Sorts and uniques the LiveIns vector. It can be significantly faster to do
/// this than repeatedly calling isLiveIn before calling addLiveIn for every /// this than repeatedly calling isLiveIn before calling addLiveIn for every
@ -322,17 +324,17 @@ public:
/// Add PhysReg as live in to this block, and ensure that there is a copy of /// Add PhysReg as live in to this block, and ensure that there is a copy of
/// PhysReg to a virtual register of class RC. Return the virtual register /// PhysReg to a virtual register of class RC. Return the virtual register
/// that is a copy of the live in PhysReg. /// that is a copy of the live in PhysReg.
unsigned addLiveIn(unsigned PhysReg, const TargetRegisterClass *RC); unsigned addLiveIn(MCPhysReg PhysReg, const TargetRegisterClass *RC);
/// Remove the specified register from the live in set. /// Remove the specified register from the live in set.
void removeLiveIn(unsigned Reg); void removeLiveIn(MCPhysReg Reg);
/// Return true if the specified register is in the live in set. /// Return true if the specified register is in the live in set.
bool isLiveIn(unsigned Reg) const; bool isLiveIn(MCPhysReg Reg) const;
// Iteration support for live in sets. These sets are kept in sorted // Iteration support for live in sets. These sets are kept in sorted
// order by their register number. // order by their register number.
typedef std::vector<unsigned>::const_iterator livein_iterator; typedef LiveInVector::const_iterator livein_iterator;
livein_iterator livein_begin() const { return LiveIns.begin(); } livein_iterator livein_begin() const { return LiveIns.begin(); }
livein_iterator livein_end() const { return LiveIns.end(); } livein_iterator livein_end() const { return LiveIns.end(); }
bool livein_empty() const { return LiveIns.empty(); } bool livein_empty() const { return LiveIns.empty(); }

9
llvm/lib/CodeGen/MachineBasicBlock.cpp
View File

@ -322,20 +322,19 @@ void MachineBasicBlock::printAsOperand(raw_ostream &OS,
OS << "BB#" << getNumber(); OS << "BB#" << getNumber();
} }
void MachineBasicBlock::removeLiveIn(unsigned Reg) { void MachineBasicBlock::removeLiveIn(MCPhysReg Reg) {
std::vector<unsigned>::iterator I LiveInVector::iterator I = std::find(LiveIns.begin(), LiveIns.end(), Reg);
= std::find(LiveIns.begin(), LiveIns.end(), Reg);
if (I != LiveIns.end()) if (I != LiveIns.end())
LiveIns.erase(I); LiveIns.erase(I);
} }
bool MachineBasicBlock::isLiveIn(unsigned Reg) const { bool MachineBasicBlock::isLiveIn(MCPhysReg Reg) const {
livein_iterator I = std::find(livein_begin(), livein_end(), Reg); livein_iterator I = std::find(livein_begin(), livein_end(), Reg);
return I != livein_end(); return I != livein_end();
} }
unsigned unsigned
MachineBasicBlock::addLiveIn(unsigned PhysReg, const TargetRegisterClass *RC) { MachineBasicBlock::addLiveIn(MCPhysReg PhysReg, const TargetRegisterClass *RC) {
assert(getParent() && "MBB must be inserted in function"); assert(getParent() && "MBB must be inserted in function");
assert(TargetRegisterInfo::isPhysicalRegister(PhysReg) && "Expected physreg"); assert(TargetRegisterInfo::isPhysicalRegister(PhysReg) && "Expected physreg");
assert(RC && "Register class is required"); assert(RC && "Register class is required");