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

reduce indentation, minor cleanups. 

llvm-svn: 100042
This commit is contained in:
Chris Lattner 2010-03-31 20:32:51 +00:00
parent 083712fbb7
commit 503a0ef6f4
1 changed files with 42 additions and 38 deletions
llvm/lib/Target/X86
SSEDomainFix.cpp

80
llvm/lib/Target/X86/SSEDomainFix.cpp
View File

@ -25,7 +25,6 @@
#include "llvm/ADT/DepthFirstIterator.h" #include "llvm/ADT/DepthFirstIterator.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
using namespace llvm; using namespace llvm;
namespace { namespace {
@ -67,7 +66,7 @@ public:
} }
}; };
/// A DomainValue is a bit like LiveIntervals' ValNo, but it laso keeps track /// A DomainValue is a bit like LiveIntervals' ValNo, but it also keeps track
/// of execution domains. /// of execution domains.
/// ///
/// An open DomainValue represents a set of instructions that can still switch /// An open DomainValue represents a set of instructions that can still switch
@ -168,7 +167,6 @@ private:
void visitGenericInstr(MachineInstr*); void visitGenericInstr(MachineInstr*);
void visitSoftInstr(MachineInstr*, unsigned mask); void visitSoftInstr(MachineInstr*, unsigned mask);
void visitHardInstr(MachineInstr*, unsigned domain); void visitHardInstr(MachineInstr*, unsigned domain);
}; };
} }
@ -286,22 +284,24 @@ void SSEDomainFixPass::enterBasicBlock() {
if (fi == LiveOuts.end()) continue; if (fi == LiveOuts.end()) continue;
DomainValue *pdv = fi->second[rx]; DomainValue *pdv = fi->second[rx];
if (!pdv) continue; if (!pdv) continue;
if (!LiveRegs || !LiveRegs[rx]) if (!LiveRegs || !LiveRegs[rx]) {
SetLiveReg(rx, pdv); SetLiveReg(rx, pdv);
else { continue;
// We have a live DomainValue from more than one predecessor.
if (LiveRegs[rx]->collapsed()) {
// We are already collapsed, but predecessor is not. Force him.
if (!pdv->collapsed())
Collapse(pdv, LiveRegs[rx]->firstDomain());
} else {
// Currently open, merge in predecessor.
if (!pdv->collapsed())
Merge(LiveRegs[rx], pdv);
else
Collapse(LiveRegs[rx], pdv->firstDomain());
}
} }
// We have a live DomainValue from more than one predecessor.
if (LiveRegs[rx]->collapsed()) {
// We are already collapsed, but predecessor is not. Force him.
if (!pdv->collapsed())
Collapse(pdv, LiveRegs[rx]->firstDomain());
continue;
}
// Currently open, merge in predecessor.
if (!pdv->collapsed())
Merge(LiveRegs[rx], pdv);
else
Collapse(LiveRegs[rx], pdv->firstDomain());
} }
} }
} }
@ -338,21 +338,21 @@ void SSEDomainFixPass::visitSoftInstr(MachineInstr *mi, unsigned mask) {
if (LiveRegs) if (LiveRegs)
for (unsigned i = mi->getDesc().getNumDefs(), for (unsigned i = mi->getDesc().getNumDefs(),
e = mi->getDesc().getNumOperands(); i != e; ++i) { e = mi->getDesc().getNumOperands(); i != e; ++i) {
MachineOperand &mo = mi->getOperand(i); MachineOperand &mo = mi->getOperand(i);
if (!mo.isReg()) continue; if (!mo.isReg()) continue;
int rx = RegIndex(mo.getReg()); int rx = RegIndex(mo.getReg());
if (rx < 0) continue; if (rx < 0) continue;
if (DomainValue *dv = LiveRegs[rx]) { if (DomainValue *dv = LiveRegs[rx]) {
// Is it possible to use this collapsed register for free? // Is it possible to use this collapsed register for free?
if (dv->collapsed()) { if (dv->collapsed()) {
if (unsigned m = collmask & dv->Mask) if (unsigned m = collmask & dv->Mask)
collmask = m; collmask = m;
} else if (dv->compat(collmask)) } else if (dv->compat(collmask))
used.push_back(rx); used.push_back(rx);
else else
Kill(rx); Kill(rx);
}
} }
}
// If the collapsed operands force a single domain, propagate the collapse. // If the collapsed operands force a single domain, propagate the collapse.
if (isPowerOf2_32(collmask)) { if (isPowerOf2_32(collmask)) {
@ -392,13 +392,17 @@ void SSEDomainFixPass::visitSoftInstr(MachineInstr *mi, unsigned mask) {
// priority to the latest ones. // priority to the latest ones.
DomainValue *dv = 0; DomainValue *dv = 0;
while (!doms.empty()) { while (!doms.empty()) {
if (!dv) if (!dv) {
dv = doms.back(); dv = doms.pop_back_val();
else if (!Merge(dv, doms.back())) continue;
for (SmallVector<int,4>::iterator i=used.begin(), e=used.end(); i!=e; ++i) }
if (LiveRegs[*i] == doms.back())
Kill(*i); DomainValue *ThisDV = doms.pop_back_val();
doms.pop_back(); if (Merge(dv, ThisDV)) continue;
for (SmallVector<int,4>::iterator i=used.begin(), e=used.end(); i != e; ++i)
if (LiveRegs[*i] == ThisDV)
Kill(*i);
} }
// dv is the DomainValue we are going to use for this instruction. // dv is the DomainValue we are going to use for this instruction.