RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

[PBQP] Improve the assert for conservatively allocatables.

Browse Source 
Remember if the node ever was in this state instead of checking just the
final state.

Reviewed by Arnaud de Grandmaison.

llvm-svn: 229400
This commit is contained in:
Jonas Paulsson 2015-02-16 15:39:26 +00:00
parent 5ad40ba7e0
commit e4359975ab
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/CodeGen/PBQP/ReductionRules.h
View File

@ -190,7 +190,7 @@ namespace PBQP {
// Although a conservatively allocatable node can be allocated to a register,
// spilling it may provide a lower cost solution. Assert here that spilling
// is done by choice, not because there were no register available.
if (G.getNodeMetadata(NId).isConservativelyAllocatable())
if (G.getNodeMetadata(NId).wasConservativelyAllocatable())
assert(hasRegisterOptions(v) && "A conservatively allocatable node "
"must have available register options");

13
include/llvm/CodeGen/RegAllocPBQP.h
View File

@ -192,7 +192,7 @@ public:
NodeMetadata()
: RS(Unprocessed), NumOpts(0), DeniedOpts(0), OptUnsafeEdges(nullptr),
VReg(0) {}
VReg(0), everConservativelyAllocatable(false) {}
// FIXME: Re-implementing default behavior to work around MSVC. Remove once
// MSVC synthesizes move constructors properly.
@ -256,8 +256,14 @@ public:
void setReductionState(ReductionState RS) {
assert(RS >= this->RS && "A node's reduction state can not be downgraded");
this->RS = RS;
// Remember this state to assert later that a non-infinite register
// option was available.
if (RS == ConservativelyAllocatable)
everConservativelyAllocatable = true;
}
void handleAddEdge(const MatrixMetadata& MD, bool Transpose) {
DeniedOpts += Transpose ? MD.getWorstRow() : MD.getWorstCol();
const bool* UnsafeOpts =
@ -280,6 +286,10 @@ public:
&OptUnsafeEdges[NumOpts]);
}
bool wasConservativelyAllocatable() const {
return everConservativelyAllocatable;
}
private:
ReductionState RS;
unsigned NumOpts;
@ -287,6 +297,7 @@ private:
std::unique_ptr<unsigned[]> OptUnsafeEdges;
unsigned VReg;
GraphMetadata::AllowedRegVecRef AllowedRegs;
bool everConservativelyAllocatable;
};
class RegAllocSolverImpl {