RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-03 22:01:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove MachineRegisterInfo::getLastVirtReg(), it was giving wrong results

Browse Source 
when no virtual registers have been allocated.

It was only used to resize IndexedMaps, so provide an IndexedMap::resize()
method such that

 Map.grow(MRI.getLastVirtReg());

can be replaced with the simpler

 Map.resize(MRI.getNumVirtRegs());

This works correctly when no virtuals are allocated, and it bypasses the to/from
index conversions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123130 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen 2011-01-09 21:58:20 +00:00
parent 9dddf08eb8
commit 42e9c96392
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/ADT/IndexedMap.h
View File

@ -59,6 +59,10 @@ namespace llvm {
storage_.reserve(s); storage_.reserve(s);
} }
void resize(typename StorageT::size_type s) {
storage_.resize(s, nullVal_);
}
void clear() { void clear() {
storage_.clear(); storage_.clear();
} }
@ -66,7 +70,7 @@ namespace llvm {
void grow(IndexT n) { void grow(IndexT n) {
unsigned NewSize = toIndex_(n) + 1; unsigned NewSize = toIndex_(n) + 1;
if (NewSize > storage_.size()) if (NewSize > storage_.size())
storage_.resize(NewSize, nullVal_); resize(NewSize);
} }
bool inBounds(IndexT n) const { bool inBounds(IndexT n) const {

6
include/llvm/CodeGen/MachineRegisterInfo.h
View File

@ -216,12 +216,6 @@ public:
/// ///
unsigned getNumVirtRegs() const { return VRegInfo.size(); } unsigned getNumVirtRegs() const { return VRegInfo.size(); }
/// getLastVirtReg - Return the highest currently assigned virtual register.
///
unsigned getLastVirtReg() const {
return TargetRegisterInfo::index2VirtReg(getNumVirtRegs() - 1);
}
/// getRegClassVirtRegs - Return the list of virtual registers of the given /// getRegClassVirtRegs - Return the list of virtual registers of the given
/// target register class. /// target register class.
const std::vector<unsigned> & const std::vector<unsigned> &

3
lib/CodeGen/RegAllocFast.cpp
View File

@ -1024,8 +1024,7 @@ bool RAFast::runOnMachineFunction(MachineFunction &Fn) {
// initialize the virtual->physical register map to have a 'null' // initialize the virtual->physical register map to have a 'null'
// mapping for all virtual registers // mapping for all virtual registers
unsigned LastVirtReg = MRI->getLastVirtReg(); StackSlotForVirtReg.resize(MRI->getNumVirtRegs());
StackSlotForVirtReg.grow(LastVirtReg);
// Loop over all of the basic blocks, eliminating virtual register references // Loop over all of the basic blocks, eliminating virtual register references
for (MachineFunction::iterator MBBi = Fn.begin(), MBBe = Fn.end(); for (MachineFunction::iterator MBBi = Fn.begin(), MBBe = Fn.end();

16
lib/CodeGen/VirtRegMap.cpp
View File

@ -88,14 +88,14 @@ bool VirtRegMap::runOnMachineFunction(MachineFunction &mf) {
} }
void VirtRegMap::grow() { void VirtRegMap::grow() {
unsigned LastVirtReg = MF->getRegInfo().getLastVirtReg(); unsigned NumRegs = MF->getRegInfo().getNumVirtRegs();
Virt2PhysMap.grow(LastVirtReg); Virt2PhysMap.resize(NumRegs);
Virt2StackSlotMap.grow(LastVirtReg); Virt2StackSlotMap.resize(NumRegs);
Virt2ReMatIdMap.grow(LastVirtReg); Virt2ReMatIdMap.resize(NumRegs);
Virt2SplitMap.grow(LastVirtReg); Virt2SplitMap.resize(NumRegs);
Virt2SplitKillMap.grow(LastVirtReg); Virt2SplitKillMap.resize(NumRegs);
ReMatMap.grow(LastVirtReg); ReMatMap.resize(NumRegs);
ImplicitDefed.resize(MF->getRegInfo().getNumVirtRegs()); ImplicitDefed.resize(NumRegs);
} }
unsigned VirtRegMap::createSpillSlot(const TargetRegisterClass *RC) { unsigned VirtRegMap::createSpillSlot(const TargetRegisterClass *RC) {