mirror of
https://github.com/RPCSX/llvm.git
synced 2024-12-05 18:37:17 +00:00
Don't use pointer-pointers for the register use lists.
Use a more conventional doubly linked list where the Prev pointers form a cycle. This means it is no longer necessary to adjust the Prev pointers when reallocating the VRegInfo array. The test changes are required because the register allocation hint is using the use-list order to break ties. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161633 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
ff2b99afc8
commit
46f4c35372
@ -150,7 +150,7 @@ private:
|
||||
|
||||
struct { // For MO_Register.
|
||||
// Register number is in SmallContents.RegNo.
|
||||
MachineOperand **Prev; // Access list for register.
|
||||
MachineOperand *Prev; // Access list for register. See MRI.
|
||||
MachineOperand *Next;
|
||||
} Reg;
|
||||
|
||||
|
@ -468,10 +468,6 @@ public:
|
||||
const TargetRegisterInfo &TRI,
|
||||
const TargetInstrInfo &TII);
|
||||
|
||||
private:
|
||||
void HandleVRegListReallocation();
|
||||
|
||||
public:
|
||||
/// defusechain_iterator - This class provides iterator support for machine
|
||||
/// operands in the function that use or define a specific register. If
|
||||
/// ReturnUses is true it returns uses of registers, if ReturnDefs is true it
|
||||
|
@ -102,17 +102,9 @@ MachineRegisterInfo::createVirtualRegister(const TargetRegisterClass *RegClass){
|
||||
|
||||
// New virtual register number.
|
||||
unsigned Reg = TargetRegisterInfo::index2VirtReg(getNumVirtRegs());
|
||||
|
||||
// Add a reg, but keep track of whether the vector reallocated or not.
|
||||
const unsigned FirstVirtReg = TargetRegisterInfo::index2VirtReg(0);
|
||||
void *ArrayBase = getNumVirtRegs() == 0 ? 0 : &VRegInfo[FirstVirtReg];
|
||||
VRegInfo.grow(Reg);
|
||||
VRegInfo[Reg].first = RegClass;
|
||||
RegAllocHints.grow(Reg);
|
||||
|
||||
if (ArrayBase && &VRegInfo[FirstVirtReg] != ArrayBase)
|
||||
// The vector reallocated, handle this now.
|
||||
HandleVRegListReallocation();
|
||||
return Reg;
|
||||
}
|
||||
|
||||
@ -129,55 +121,57 @@ void MachineRegisterInfo::clearVirtRegs() {
|
||||
/// Add MO to the linked list of operands for its register.
|
||||
void MachineRegisterInfo::addRegOperandToUseList(MachineOperand *MO) {
|
||||
assert(!MO->isOnRegUseList() && "Already on list");
|
||||
MachineOperand **Head = &getRegUseDefListHead(MO->getReg());
|
||||
MachineOperand *&HeadRef = getRegUseDefListHead(MO->getReg());
|
||||
MachineOperand *const Head = HeadRef;
|
||||
|
||||
// For SSA values, we prefer to keep the definition at the start of the list.
|
||||
// we do this by skipping over the definition if it is at the head of the
|
||||
// list.
|
||||
if (*Head && (*Head)->isDef())
|
||||
Head = &(*Head)->Contents.Reg.Next;
|
||||
// Head points to the first list element.
|
||||
// Next is NULL on the last list element.
|
||||
// Prev pointers are circular, so Head->Prev == Last.
|
||||
|
||||
MO->Contents.Reg.Next = *Head;
|
||||
if (MO->Contents.Reg.Next) {
|
||||
assert(MO->getReg() == MO->Contents.Reg.Next->getReg() &&
|
||||
"Different regs on the same list!");
|
||||
MO->Contents.Reg.Next->Contents.Reg.Prev = &MO->Contents.Reg.Next;
|
||||
// Head is NULL for an empty list.
|
||||
if (!Head) {
|
||||
MO->Contents.Reg.Prev = MO;
|
||||
MO->Contents.Reg.Next = 0;
|
||||
HeadRef = MO;
|
||||
return;
|
||||
}
|
||||
assert(MO->getReg() == Head->getReg() && "Different regs on the same list!");
|
||||
|
||||
MO->Contents.Reg.Prev = Head;
|
||||
*Head = MO;
|
||||
// Insert MO between Last and Head in the circular Prev chain.
|
||||
MachineOperand *Last = Head->Contents.Reg.Prev;
|
||||
assert(Last && "Inconsistent use list");
|
||||
assert(MO->getReg() == Last->getReg() && "Different regs on the same list!");
|
||||
Head->Contents.Reg.Prev = MO;
|
||||
MO->Contents.Reg.Prev = Last;
|
||||
|
||||
// Insert at the front.
|
||||
MO->Contents.Reg.Next = Head;
|
||||
HeadRef = MO;
|
||||
}
|
||||
|
||||
/// Remove MO from its use-def list.
|
||||
void MachineRegisterInfo::removeRegOperandFromUseList(MachineOperand *MO) {
|
||||
assert(MO->isOnRegUseList() && "Operand not on use list");
|
||||
MachineOperand *&HeadRef = getRegUseDefListHead(MO->getReg());
|
||||
MachineOperand *const Head = HeadRef;
|
||||
assert(Head && "List already empty");
|
||||
|
||||
// Unlink this from the doubly linked list of operands.
|
||||
MachineOperand *NextOp = MO->Contents.Reg.Next;
|
||||
*MO->Contents.Reg.Prev = NextOp;
|
||||
if (NextOp) {
|
||||
assert(NextOp->getReg() == MO->getReg() && "Corrupt reg use/def chain!");
|
||||
NextOp->Contents.Reg.Prev = MO->Contents.Reg.Prev;
|
||||
}
|
||||
MachineOperand *Next = MO->Contents.Reg.Next;
|
||||
MachineOperand *Prev = MO->Contents.Reg.Prev;
|
||||
|
||||
// Prev links are circular, next link is NULL instead of looping back to Head.
|
||||
if (MO == Head)
|
||||
HeadRef = Next;
|
||||
else
|
||||
Prev->Contents.Reg.Next = Next;
|
||||
|
||||
(Next ? Next : Head)->Contents.Reg.Prev = Prev;
|
||||
|
||||
MO->Contents.Reg.Prev = 0;
|
||||
MO->Contents.Reg.Next = 0;
|
||||
}
|
||||
|
||||
/// HandleVRegListReallocation - We just added a virtual register to the
|
||||
/// VRegInfo info list and it reallocated. Update the use/def lists info
|
||||
/// pointers.
|
||||
void MachineRegisterInfo::HandleVRegListReallocation() {
|
||||
// The back pointers for the vreg lists point into the previous vector.
|
||||
// Update them to point to their correct slots.
|
||||
for (unsigned i = 0, e = getNumVirtRegs(); i != e; ++i) {
|
||||
unsigned Reg = TargetRegisterInfo::index2VirtReg(i);
|
||||
MachineOperand *List = VRegInfo[Reg].second;
|
||||
if (!List) continue;
|
||||
// Update the back-pointer to be accurate once more.
|
||||
List->Contents.Reg.Prev = &VRegInfo[Reg].second;
|
||||
}
|
||||
}
|
||||
|
||||
/// replaceRegWith - Replace all instances of FromReg with ToReg in the
|
||||
/// machine function. This is like llvm-level X->replaceAllUsesWith(Y),
|
||||
/// except that it also changes any definitions of the register as well.
|
||||
|
@ -4,7 +4,7 @@ target triple = "msp430-generic-generic"
|
||||
|
||||
define i8 @mov(i8 %a, i8 %b) nounwind {
|
||||
; CHECK: mov:
|
||||
; CHECK: mov.b r14, r15
|
||||
; CHECK: mov.{{[bw]}} r14, r15
|
||||
ret i8 %b
|
||||
}
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
; PR8573
|
||||
|
||||
; CHECK: foo:
|
||||
; CHECK: leaq (%rdi), %rax
|
||||
; CHECK-NEXT: movl %esi, %ecx
|
||||
; CHECK: movl %esi, %ecx
|
||||
; CHECK-NEXT: leaq (%rdi), %rax
|
||||
; CHECK-NEXT: monitor
|
||||
; WIN64: foo:
|
||||
; WIN64: leaq (%rcx), %rax
|
||||
|
Loading…
Reference in New Issue
Block a user