[llvm-branch-commits] [llvm-branch] r100446 - in /llvm/branches/Apple/Morbo: ./ include/llvm/Support/Allocator.h lib/Target/X86/SSEDomainFix.cpp
Jakob Stoklund Olesen
stoklund at 2pi.dk
Mon Apr 5 11:32:13 PDT 2010
Author: stoklund
Date: Mon Apr 5 13:32:13 2010
New Revision: 100446
URL: http://llvm.org/viewvc/llvm-project?rev=100446&view=rev
Log:
Merge from trunk: 100037 100042 100332 100353.
Cleanups in SSEDomainFixPass.
Modified:
llvm/branches/Apple/Morbo/ (props changed)
llvm/branches/Apple/Morbo/include/llvm/Support/Allocator.h
llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp
Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 5 13:32:13 2010
@@ -1,2 +1,2 @@
/llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988,99992-99993,99995,99997-99999,100016,100035,100038,100042,100044,100072,100074,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100257,100261
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99196,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99455,99463,99465,99469,99484,99490,99492-99494,99507,99524,99537,99539-99540,99544,99570,99575,99598,99620,99629-99630,99636,99671,99692,99695,99697,99699,99722,99816,99836,99845-99846,99848,99850,99855,99879,99881-99883,99895,99899,99910,99916,99919,99952-99954,99957,99959,99974-99975,99982,99984-99986,99988,99992-99993,99995,99997-99999,100016,100035,100037-100038,100042,100044,100072,100074,100081-100090,100092,100094-100095,100116,100134,100184,100209,100214-100218,100220-100221,100223-100225,100257,100261,100332,100353
Modified: llvm/branches/Apple/Morbo/include/llvm/Support/Allocator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/include/llvm/Support/Allocator.h?rev=100446&r1=100445&r2=100446&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/include/llvm/Support/Allocator.h (original)
+++ llvm/branches/Apple/Morbo/include/llvm/Support/Allocator.h Mon Apr 5 13:32:13 2010
@@ -202,7 +202,7 @@
(char *)Slab + Slab->Size;
for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
- if (Ptr + sizeof(T) <= End)
+ if (Ptr + sizeof(T) <= End)
reinterpret_cast<T*>(Ptr)->~T();
}
Slab = Slab->NextPtr;
Modified: llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp?rev=100446&r1=100445&r2=100446&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/Target/X86/SSEDomainFix.cpp Mon Apr 5 13:32:13 2010
@@ -23,49 +23,11 @@
#include "llvm/CodeGen/MachineFunctionPass.h"
#include "llvm/CodeGen/MachineRegisterInfo.h"
#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/Support/Allocator.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
-namespace {
-
-/// Allocate objects from a pool, allow objects to be recycled, and provide a
-/// way of deleting everything.
-template<typename T, unsigned PageSize = 64>
-class PoolAllocator {
- std::vector<T*> Pages, Avail;
-public:
- ~PoolAllocator() { Clear(); }
-
- T* Alloc() {
- if (Avail.empty()) {
- T *p = new T[PageSize];
- Pages.push_back(p);
- Avail.reserve(PageSize);
- for (unsigned n = 0; n != PageSize; ++n)
- Avail.push_back(p+n);
- }
- T *p = Avail.back();
- Avail.pop_back();
- return p;
- }
-
- // Allow object to be reallocated. It won't be reconstructed.
- void Recycle(T *p) {
- p->clear();
- Avail.push_back(p);
- }
-
- // Destroy all objects, make sure there are no external pointers to them.
- void Clear() {
- Avail.clear();
- while (!Pages.empty()) {
- delete[] Pages.back();
- Pages.pop_back();
- }
- }
-};
-
/// A DomainValue is a bit like LiveIntervals' ValNo, but it also keeps track
/// of execution domains.
///
@@ -81,14 +43,15 @@
/// domain, but if we were forced to pay the penalty of a domain crossing, we
/// keep track of the fact the the register is now available in multiple
/// domains.
+namespace {
struct DomainValue {
// Basic reference counting.
unsigned Refs;
- // Available domains. For an open DomainValue, it is the still possible
- // domains for collapsing. For a collapsed DomainValue it is the domains where
- // the register is available for free.
- unsigned Mask;
+ // Bitmask of available domains. For an open DomainValue, it is the still
+ // possible domains for collapsing. For a collapsed DomainValue it is the
+ // domains where the register is available for free.
+ unsigned AvailableDomains;
// Position of the last defining instruction.
unsigned Dist;
@@ -96,38 +59,51 @@
// Twiddleable instructions using or defining these registers.
SmallVector<MachineInstr*, 8> Instrs;
- // Collapsed DomainValue have no instructions to twiddle - it simply keeps
+ // A collapsed DomainValue has no instructions to twiddle - it simply keeps
// track of the domains where the registers are already available.
- bool collapsed() const { return Instrs.empty(); }
+ bool isCollapsed() const { return Instrs.empty(); }
- // Is any domain in mask available?
- bool compat(unsigned mask) const {
- return Mask & mask;
+ // Is domain available?
+ bool hasDomain(unsigned domain) const {
+ return AvailableDomains & (1u << domain);
}
// Mark domain as available.
- void add(unsigned domain) {
- Mask |= 1u << domain;
+ void addDomain(unsigned domain) {
+ AvailableDomains |= 1u << domain;
+ }
+
+ // Restrict to a single domain available.
+ void setSingleDomain(unsigned domain) {
+ AvailableDomains = 1u << domain;
}
- // First domain available in mask.
- unsigned firstDomain() const {
- return CountTrailingZeros_32(Mask);
+ // Return bitmask of domains that are available and in mask.
+ unsigned getCommonDomains(unsigned mask) const {
+ return AvailableDomains & mask;
+ }
+
+ // First domain available.
+ unsigned getFirstDomain() const {
+ return CountTrailingZeros_32(AvailableDomains);
}
DomainValue() { clear(); }
void clear() {
- Refs = Mask = Dist = 0;
+ Refs = AvailableDomains = Dist = 0;
Instrs.clear();
}
};
+}
static const unsigned NumRegs = 16;
+namespace {
class SSEDomainFixPass : public MachineFunctionPass {
static char ID;
- PoolAllocator<DomainValue> Pool;
+ SpecificBumpPtrAllocator<DomainValue> Allocator;
+ SmallVector<DomainValue*,16> Avail;
MachineFunction *MF;
const X86InstrInfo *TII;
@@ -156,6 +132,10 @@
// Register mapping.
int RegIndex(unsigned Reg);
+ // DomainValue allocation.
+ DomainValue *Alloc(int domain = -1);
+ void Recycle(DomainValue*);
+
// LiveRegs manipulations.
void SetLiveReg(int rx, DomainValue *DV);
void Kill(int rx);
@@ -182,17 +162,35 @@
return reg < NumRegs ? reg : -1;
}
+DomainValue *SSEDomainFixPass::Alloc(int domain) {
+ DomainValue *dv = Avail.empty() ?
+ new(Allocator.Allocate()) DomainValue :
+ Avail.pop_back_val();
+ dv->Dist = Distance;
+ if (domain >= 0)
+ dv->addDomain(domain);
+ return dv;
+}
+
+void SSEDomainFixPass::Recycle(DomainValue *dv) {
+ assert(dv && "Cannot recycle NULL");
+ dv->clear();
+ Avail.push_back(dv);
+}
+
/// Set LiveRegs[rx] = dv, updating reference counts.
void SSEDomainFixPass::SetLiveReg(int rx, DomainValue *dv) {
assert(unsigned(rx) < NumRegs && "Invalid index");
- if (!LiveRegs)
- LiveRegs = (DomainValue**)calloc(sizeof(DomainValue*), NumRegs);
+ if (!LiveRegs) {
+ LiveRegs = new DomainValue*[NumRegs];
+ std::fill(LiveRegs, LiveRegs+NumRegs, (DomainValue*)0);
+ }
if (LiveRegs[rx] == dv)
return;
if (LiveRegs[rx]) {
assert(LiveRegs[rx]->Refs && "Bad refcount");
- if (--LiveRegs[rx]->Refs == 0) Pool.Recycle(LiveRegs[rx]);
+ if (--LiveRegs[rx]->Refs == 0) Recycle(LiveRegs[rx]);
}
LiveRegs[rx] = dv;
if (dv) ++dv->Refs;
@@ -205,8 +203,8 @@
// Before killing the last reference to an open DomainValue, collapse it to
// the first available domain.
- if (LiveRegs[rx]->Refs == 1 && !LiveRegs[rx]->collapsed())
- Collapse(LiveRegs[rx], LiveRegs[rx]->firstDomain());
+ if (LiveRegs[rx]->Refs == 1 && !LiveRegs[rx]->isCollapsed())
+ Collapse(LiveRegs[rx], LiveRegs[rx]->getFirstDomain());
else
SetLiveReg(rx, 0);
}
@@ -216,54 +214,45 @@
assert(unsigned(rx) < NumRegs && "Invalid index");
DomainValue *dv;
if (LiveRegs && (dv = LiveRegs[rx])) {
- if (dv->collapsed())
- dv->add(domain);
+ if (dv->isCollapsed())
+ dv->addDomain(domain);
else
Collapse(dv, domain);
} else {
// Set up basic collapsed DomainValue.
- dv = Pool.Alloc();
- dv->Dist = Distance;
- dv->add(domain);
- SetLiveReg(rx, dv);
+ SetLiveReg(rx, Alloc(domain));
}
}
/// Collapse open DomainValue into given domain. If there are multiple
/// registers using dv, they each get a unique collapsed DomainValue.
void SSEDomainFixPass::Collapse(DomainValue *dv, unsigned domain) {
- assert(dv->compat(1u << domain) && "Cannot collapse");
+ assert(dv->hasDomain(domain) && "Cannot collapse");
// Collapse all the instructions.
- while (!dv->Instrs.empty()) {
- MachineInstr *mi = dv->Instrs.back();
- TII->SetSSEDomain(mi, domain);
- dv->Instrs.pop_back();
- }
- dv->Mask = 1u << domain;
+ while (!dv->Instrs.empty())
+ TII->SetSSEDomain(dv->Instrs.pop_back_val(), domain);
+ dv->setSingleDomain(domain);
// If there are multiple users, give them new, unique DomainValues.
- if (LiveRegs && dv->Refs > 1) {
+ if (LiveRegs && dv->Refs > 1)
for (unsigned rx = 0; rx != NumRegs; ++rx)
- if (LiveRegs[rx] == dv) {
- DomainValue *dv2 = Pool.Alloc();
- dv2->Dist = Distance;
- dv2->add(domain);
- SetLiveReg(rx, dv2);
- }
- }
+ if (LiveRegs[rx] == dv)
+ SetLiveReg(rx, Alloc(domain));
}
/// Merge - All instructions and registers in B are moved to A, and B is
/// released.
bool SSEDomainFixPass::Merge(DomainValue *A, DomainValue *B) {
- assert(!A->collapsed() && "Cannot merge into collapsed");
- assert(!B->collapsed() && "Cannot merge from collapsed");
- if (A == B)
+ assert(!A->isCollapsed() && "Cannot merge into collapsed");
+ assert(!B->isCollapsed() && "Cannot merge from collapsed");
+ if (A == B)
return true;
- if (!A->compat(B->Mask))
+ // Restrict to the domains that A and B have in common.
+ unsigned common = A->getCommonDomains(B->AvailableDomains);
+ if (!common)
return false;
- A->Mask &= B->Mask;
+ A->AvailableDomains = common;
A->Dist = std::max(A->Dist, B->Dist);
A->Instrs.append(B->Instrs.begin(), B->Instrs.end());
for (unsigned rx = 0; rx != NumRegs; ++rx)
@@ -290,18 +279,18 @@
}
// We have a live DomainValue from more than one predecessor.
- if (LiveRegs[rx]->collapsed()) {
+ if (LiveRegs[rx]->isCollapsed()) {
// We are already collapsed, but predecessor is not. Force him.
- if (!pdv->collapsed())
- Collapse(pdv, LiveRegs[rx]->firstDomain());
+ if (!pdv->isCollapsed())
+ Collapse(pdv, LiveRegs[rx]->getFirstDomain());
continue;
}
-
+
// Currently open, merge in predecessor.
- if (!pdv->collapsed())
+ if (!pdv->isCollapsed())
Merge(LiveRegs[rx], pdv);
else
- Collapse(LiveRegs[rx], pdv->firstDomain());
+ Collapse(LiveRegs[rx], pdv->getFirstDomain());
}
}
}
@@ -332,8 +321,11 @@
// A soft instruction can be changed to work in other domains given by mask.
void SSEDomainFixPass::visitSoftInstr(MachineInstr *mi, unsigned mask) {
+ // Bitmask of available domains for this instruction after taking collapsed
+ // operands into account.
+ unsigned available = mask;
+
// Scan the explicit use operands for incoming domains.
- unsigned collmask = mask;
SmallVector<int, 4> used;
if (LiveRegs)
for (unsigned i = mi->getDesc().getNumDefs(),
@@ -343,33 +335,40 @@
int rx = RegIndex(mo.getReg());
if (rx < 0) continue;
if (DomainValue *dv = LiveRegs[rx]) {
+ // Bitmask of domains that dv and available have in common.
+ unsigned common = dv->getCommonDomains(available);
// Is it possible to use this collapsed register for free?
- if (dv->collapsed()) {
- if (unsigned m = collmask & dv->Mask)
- collmask = m;
- } else if (dv->compat(collmask))
+ if (dv->isCollapsed()) {
+ // Restrict available domains to the ones in common with the operand.
+ // If there are no common domains, we must pay the cross-domain
+ // penalty for this operand.
+ if (common) available = common;
+ } else if (common)
+ // Open DomainValue is compatible, save it for merging.
used.push_back(rx);
else
+ // Open DomainValue is not compatible with instruction. It is useless
+ // now.
Kill(rx);
}
}
// If the collapsed operands force a single domain, propagate the collapse.
- if (isPowerOf2_32(collmask)) {
- unsigned domain = CountTrailingZeros_32(collmask);
+ if (isPowerOf2_32(available)) {
+ unsigned domain = CountTrailingZeros_32(available);
TII->SetSSEDomain(mi, domain);
visitHardInstr(mi, domain);
return;
}
- // Kill off any remaining uses that don't match collmask, and build a list of
- // incoming DomainValue that we want to merge.
+ // Kill off any remaining uses that don't match available, and build a list of
+ // incoming DomainValues that we want to merge.
SmallVector<DomainValue*,4> doms;
for (SmallVector<int, 4>::iterator i=used.begin(), e=used.end(); i!=e; ++i) {
int rx = *i;
DomainValue *dv = LiveRegs[rx];
// This useless DomainValue could have been missed above.
- if (!dv->compat(collmask)) {
+ if (!dv->getCommonDomains(available)) {
Kill(*i);
continue;
}
@@ -388,28 +387,29 @@
doms.push_back(dv);
}
- // doms are now sorted in order of appearance. Try to merge them all, giving
- // priority to the latest ones.
+ // doms are now sorted in order of appearance. Try to merge them all, giving
+ // priority to the latest ones.
DomainValue *dv = 0;
while (!doms.empty()) {
if (!dv) {
dv = doms.pop_back_val();
continue;
}
-
- DomainValue *ThisDV = doms.pop_back_val();
- if (Merge(dv, ThisDV)) continue;
-
+
+ DomainValue *latest = doms.pop_back_val();
+ if (Merge(dv, latest)) continue;
+
+ // If latest didn't merge, it is useless now. Kill all registers using it.
for (SmallVector<int,4>::iterator i=used.begin(), e=used.end(); i != e; ++i)
- if (LiveRegs[*i] == ThisDV)
+ if (LiveRegs[*i] == latest)
Kill(*i);
}
// dv is the DomainValue we are going to use for this instruction.
if (!dv)
- dv = Pool.Alloc();
+ dv = Alloc();
dv->Dist = Distance;
- dv->Mask = collmask;
+ dv->AvailableDomains = available;
dv->Instrs.push_back(mi);
// Finally set all defs and non-collapsed uses to dv.
@@ -487,9 +487,10 @@
// DomainValues?
for (LiveOutMap::const_iterator i = LiveOuts.begin(), e = LiveOuts.end();
i != e; ++i)
- free(i->second);
+ delete[] i->second;
LiveOuts.clear();
- Pool.Clear();
+ Avail.clear();
+ Allocator.DestroyAll();
return false;
}
More information about the llvm-branch-commits
mailing list