Skip to content

S
swiftshader
Commit 1502e59a by Jim Stichnoth
Options

Subzero: Use llvm::ilist<> for PhiList and AssignList.

This is toward the goal of pulling non-POD fields out of the CfgNode class so that CfgNode can be arena-allocated and not leak memory. For now, PhiList and AssignList are defined as InstList. Ideally, they would be ilist<> of InstPhi and InstAssign, but SFINAE happens. BUG= none R=jvoung@chromium.org Review URL: https://codereview.chromium.org/794923002
parent 668a7a33
Showing with 41 additions and 32 deletions
src/IceCfgNode.cpp
......@@ -57,7 +57,7 @@ void CfgNode::appendInst(Inst *Inst) {
// overlap with the range of any other block.
void CfgNode::renumberInstructions() {
InstNumberT FirstNumber = Func->getNextInstNumber();
for (InstPhi *I : Phis)
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I)
I->renumber(Func);
for (auto I = Insts.begin(), E = Insts.end(); I != E; ++I)
I->renumber(Func);
......@@ -86,8 +86,10 @@ void CfgNode::computePredecessors() {
// instructions and appends assignment instructions to predecessor
// blocks. Note that this transformation preserves SSA form.
void CfgNode::placePhiLoads() {
for (InstPhi *I : Phis)
Insts.insert(Insts.begin(), I->lower(Func));
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
auto Phi = llvm::dyn_cast<InstPhi>(I);
Insts.insert(Insts.begin(), Phi->lower(Func));
}
}
// This does part 2 of Phi lowering. For each Phi instruction at each
......@@ -184,8 +186,9 @@ void CfgNode::placePhiStores() {
// Consider every out-edge.
for (CfgNode *Succ : OutEdges) {
// Consider every Phi instruction at the out-edge.
for (InstPhi *I : Succ->Phis) {
Operand *Operand = I->getOperandForTarget(this);
for (auto I = Succ->Phis.begin(), E = Succ->Phis.end(); I != E; ++I) {
auto Phi = llvm::dyn_cast<InstPhi>(I);
Operand *Operand = Phi->getOperandForTarget(this);
assert(Operand);
Variable *Dest = I->getDest();
assert(Dest);
......@@ -200,7 +203,7 @@ void CfgNode::placePhiStores() {
// Deletes the phi instructions after the loads and stores are placed.
void CfgNode::deletePhis() {
for (InstPhi *I : Phis)
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I)
I->setDeleted();
}
......@@ -316,7 +319,8 @@ void CfgNode::advancedPhiLowering() {
} Desc[getPhis().size()];
size_t NumPhis = 0;
for (InstPhi *Inst : getPhis()) {
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
auto Inst = llvm::dyn_cast<InstPhi>(I);
if (!Inst->isDeleted()) {
Desc[NumPhis].Phi = Inst;
Desc[NumPhis].Dest = Inst->getDest();
......@@ -470,8 +474,8 @@ void CfgNode::advancedPhiLowering() {
Func->getVMetadata()->addNode(Split);
}
for (InstPhi *Inst : getPhis())
Inst->setDeleted();
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I)
I->setDeleted();
}
// Does address mode optimization. Pass each instruction to the
......@@ -534,7 +538,7 @@ void CfgNode::livenessLightweight() {
continue;
I->livenessLightweight(Func, Live);
}
for (InstPhi *I : Phis) {
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
if (I->isDeleted())
continue;
I->livenessLightweight(Func, Live);
......@@ -566,8 +570,10 @@ bool CfgNode::liveness(Liveness *Liveness) {
for (CfgNode *Succ : OutEdges) {
Live |= Liveness->getLiveIn(Succ);
// Mark corresponding argument of phis in successor as live.
for (InstPhi *I : Succ->Phis)
I->livenessPhiOperand(Live, this, Liveness);
for (auto I = Succ->Phis.begin(), E = Succ->Phis.end(); I != E; ++I) {
auto Phi = llvm::dyn_cast<InstPhi>(I);
Phi->livenessPhiOperand(Live, this, Liveness);
}
}
Liveness->getLiveOut(this) = Live;
......@@ -582,7 +588,7 @@ bool CfgNode::liveness(Liveness *Liveness) {
// the block.
SizeT NumNonDeadPhis = 0;
InstNumberT FirstPhiNumber = Inst::NumberSentinel;
for (InstPhi *I : Phis) {
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
if (I->isDeleted())
continue;
if (FirstPhiNumber == Inst::NumberSentinel)
......@@ -644,7 +650,7 @@ void CfgNode::livenessPostprocess(LivenessMode Mode, Liveness *Liveness) {
InstNumberT FirstInstNum = Inst::NumberSentinel;
InstNumberT LastInstNum = Inst::NumberSentinel;
// Process phis in any order. Process only Dest operands.
for (InstPhi *I : Phis) {
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
I->deleteIfDead();
if (I->isDeleted())
continue;
......@@ -889,12 +895,11 @@ void CfgNode::emit(Cfg *Func) const {
if (DecorateAsm)
emitRegisterUsage(Str, Func, this, true, LiveRegCount);
for (InstPhi *Phi : Phis) {
if (Phi->isDeleted())
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
if (I->isDeleted())
continue;
// Emitting a Phi instruction should cause an error.
Inst *Instr = Phi;
Instr->emit(Func);
I->emit(Func);
}
for (auto I = Insts.begin(), E = Insts.end(); I != E; ++I) {
if (I->isDeleted())
......@@ -919,12 +924,11 @@ void CfgNode::emitIAS(Cfg *Func) const {
Func->setCurrentNode(this);
Assembler *Asm = Func->getAssembler<Assembler>();
Asm->BindCfgNodeLabel(getIndex());
for (InstPhi *Phi : Phis) {
if (Phi->isDeleted())
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I) {
if (I->isDeleted())
continue;
// Emitting a Phi instruction should cause an error.
Inst *Instr = Phi;
Instr->emitIAS(Func);
I->emitIAS(Func);
}
for (auto I = Insts.begin(), E = Insts.end(); I != E; ++I) {
if (I->isDeleted())
......@@ -977,7 +981,7 @@ void CfgNode::dump(Cfg *Func) const {
}
// Dump each instruction.
if (Func->getContext()->isVerbose(IceV_Instructions)) {
for (InstPhi *I : Phis)
for (auto I = Phis.begin(), E = Phis.end(); I != E; ++I)
I->dumpDecorated(Func);
for (auto I = Insts.begin(), E = Insts.end(); I != E; ++I)
I->dumpDecorated(Func);
......
src/IceDefs.h
......@@ -60,10 +60,11 @@ class VariablesMetadata;
// http://llvm.org/docs/ProgrammersManual.html#picking-the-right-data-structure-for-a-task
typedef std::string IceString;
typedef llvm::ilist<Inst> InstList;
typedef std::list<InstAssign *> AssignList;
typedef std::list<InstPhi *> PhiList;
// Ideally PhiList would be llvm::ilist<InstPhi>, and similar for
// AssignList, but this runs into issues with SFINAE.
typedef InstList PhiList;
typedef InstList AssignList;
typedef std::vector<Variable *> VarList;
typedef std::vector<Operand *> OperandList;
typedef std::vector<CfgNode *> NodeList;
typedef std::vector<Constant *> ConstantList;
......
src/IceOperand.cpp
......@@ -293,7 +293,8 @@ void VariablesMetadata::addNode(CfgNode *Node) {
if (Func->getNumVariables() >= Metadata.size())
Metadata.resize(Func->getNumVariables());
for (InstPhi *I : Node->getPhis()) {
for (auto I = Node->getPhis().begin(), E = Node->getPhis().end(); I != E;
++I) {
if (I->isDeleted())
continue;
if (Variable *Dest = I->getDest()) {
......
src/IceTargetLoweringX8632.cpp
......@@ -1775,6 +1775,7 @@ void TargetX8632::lowerCall(const InstCall *Instr) {
// Apple.
NeedsStackAlignment = true;
typedef std::vector<Operand *> OperandList;
OperandList XmmArgs;
OperandList StackArgs, StackArgLocations;
uint32_t ParameterAreaSizeBytes = 0;
......@@ -4148,7 +4149,9 @@ void TargetX8632::lowerUnreachable(const InstUnreachable * /*Inst*/) {
// Undef input.
void TargetX8632::prelowerPhis() {
CfgNode *Node = Context.getNode();
for (InstPhi *Phi : Node->getPhis()) {
for (auto I = Node->getPhis().begin(), E = Node->getPhis().end(); I != E;
++I) {
auto Phi = llvm::dyn_cast<InstPhi>(I);
if (Phi->isDeleted())
continue;
Variable *Dest = Phi->getDest();
......@@ -4212,11 +4215,11 @@ void TargetX8632::lowerPhiAssignments(CfgNode *Node,
// set. TODO(stichnot): This work is being repeated for every split
// edge to the successor, so consider updating LiveIn just once
// after all the edges are split.
for (InstAssign *Assign : Assignments) {
Variable *Dest = Assign->getDest();
for (auto I = Assignments.begin(), E = Assignments.end(); I != E; ++I) {
Variable *Dest = I->getDest();
if (Dest->hasReg()) {
Available[Dest->getRegNum()] = false;
} else if (isMemoryOperand(Assign->getSrc(0))) {
} else if (isMemoryOperand(I->getSrc(0))) {
NeedsRegs = true; // Src and Dest are both in memory
}
}
......@@ -4237,7 +4240,7 @@ void TargetX8632::lowerPhiAssignments(CfgNode *Node,
// afterwards if necessary.
for (auto I = Assignments.rbegin(), E = Assignments.rend(); I != E; ++I) {
Context.rewind();
InstAssign *Assign = *I;
auto Assign = llvm::dyn_cast<InstAssign>(&*I);
Variable *Dest = Assign->getDest();
Operand *Src = Assign->getSrc(0);
Variable *SrcVar = llvm::dyn_cast<Variable>(Src);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment