6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-15 06:29:05 +00:00
Code Issues Projects Releases Wiki Activity

[AArch64] Address Chad's post commit review comments for r217504 (PBQP experimental support)

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217518 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Arnaud A. de Grandmaison
2014-09-10 17:03:25 +00:00
parent 0d5440d157
commit 2c925e0e8f
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Target/AArch64/AArch64PBQPRegAlloc.cpp
View File

@@ -31,7 +31,6 @@
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#define PBQP_BUILDER PBQPBuilderWithCoalescing #define PBQP_BUILDER PBQPBuilderWithCoalescing
//#define PBQP_BUILDER PBQPBuilder
using namespace llvm; using namespace llvm;
@@ -195,8 +194,8 @@ bool A57PBQPBuilder::addIntraChainConstraint(PBQPRAProblem *p, unsigned Rd,
return false; return false;
if (isPhysicalReg(Rd) || isPhysicalReg(Ra)) { if (isPhysicalReg(Rd) || isPhysicalReg(Ra)) {
dbgs() << "Rd is a physical reg:" << isPhysicalReg(Rd) << '\n'; DEBUG(dbgs() << "Rd is a physical reg:" << isPhysicalReg(Rd) << '\n');
dbgs() << "Ra is a physical reg:" << isPhysicalReg(Ra) << '\n'; DEBUG(dbgs() << "Ra is a physical reg:" << isPhysicalReg(Ra) << '\n');
return false; return false;
} }
@@ -216,9 +215,9 @@ bool A57PBQPBuilder::addIntraChainConstraint(PBQPRAProblem *p, unsigned Rd,
bool livesOverlap = ld.overlaps(la); bool livesOverlap = ld.overlaps(la);
PBQP::Matrix costs(vRdAllowed->size() + 1, vRaAllowed->size() + 1, 0); PBQP::Matrix costs(vRdAllowed->size() + 1, vRaAllowed->size() + 1, 0);
for (unsigned i = 0; i != vRdAllowed->size(); ++i) { for (unsigned i = 0, ie = vRdAllowed->size(); i != ie; ++i) {
unsigned pRd = (*vRdAllowed)[i]; unsigned pRd = (*vRdAllowed)[i];
for (unsigned j = 0; j != vRaAllowed->size(); ++j) { for (unsigned j = 0, je = vRaAllowed->size(); j != je; ++j) {
unsigned pRa = (*vRaAllowed)[j]; unsigned pRa = (*vRaAllowed)[j];
if (livesOverlap && TRI->regsOverlap(pRd, pRa)) if (livesOverlap && TRI->regsOverlap(pRd, pRa))
costs[i + 1][j + 1] = std::numeric_limits<PBQP::PBQPNum>::infinity(); costs[i + 1][j + 1] = std::numeric_limits<PBQP::PBQPNum>::infinity();
@@ -237,13 +236,13 @@ bool A57PBQPBuilder::addIntraChainConstraint(PBQPRAProblem *p, unsigned Rd,
// Enforce minCost(sameParity(RaClass)) > maxCost(otherParity(RdClass)) // Enforce minCost(sameParity(RaClass)) > maxCost(otherParity(RdClass))
PBQP::Matrix costs(g.getEdgeCosts(edge)); PBQP::Matrix costs(g.getEdgeCosts(edge));
for (unsigned i = 0; i != vRdAllowed->size(); ++i) { for (unsigned i = 0, ie = vRdAllowed->size(); i != ie; ++i) {
unsigned pRd = (*vRdAllowed)[i]; unsigned pRd = (*vRdAllowed)[i];
// Get the maximum cost (excluding unallocatable reg) for same parity // Get the maximum cost (excluding unallocatable reg) for same parity
// registers // registers
PBQP::PBQPNum sameParityMax = std::numeric_limits<PBQP::PBQPNum>::min(); PBQP::PBQPNum sameParityMax = std::numeric_limits<PBQP::PBQPNum>::min();
for (unsigned j = 0; j != vRaAllowed->size(); ++j) { for (unsigned j = 0, je = vRaAllowed->size(); j != je; ++j) {
unsigned pRa = (*vRaAllowed)[j]; unsigned pRa = (*vRaAllowed)[j];
if (haveSameParity(pRd, pRa)) if (haveSameParity(pRd, pRa))
if (costs[i + 1][j + 1] != if (costs[i + 1][j + 1] !=
@@ -254,7 +253,7 @@ bool A57PBQPBuilder::addIntraChainConstraint(PBQPRAProblem *p, unsigned Rd,
// Ensure all registers with a different parity have a higher cost // Ensure all registers with a different parity have a higher cost
// than sameParityMax // than sameParityMax
for (unsigned j = 0; j != vRaAllowed->size(); ++j) { for (unsigned j = 0, je = vRaAllowed->size(); j != je; ++j) {
unsigned pRa = (*vRaAllowed)[j]; unsigned pRa = (*vRaAllowed)[j];
if (!haveSameParity(pRd, pRa)) if (!haveSameParity(pRd, pRa))
if (sameParityMax > costs[i + 1][j + 1]) if (sameParityMax > costs[i + 1][j + 1])
@@ -310,13 +309,13 @@ A57PBQPBuilder::addInterChainConstraint(PBQPRAProblem *p, unsigned Rd,
// Enforce that cost is higher with all other Chains of the same parity // Enforce that cost is higher with all other Chains of the same parity
PBQP::Matrix costs(g.getEdgeCosts(edge)); PBQP::Matrix costs(g.getEdgeCosts(edge));
for (unsigned i = 0; i != vRdAllowed->size(); ++i) { for (unsigned i = 0, ie = vRdAllowed->size(); i != ie; ++i) {
unsigned pRd = (*vRdAllowed)[i]; unsigned pRd = (*vRdAllowed)[i];
// Get the maximum cost (excluding unallocatable reg) for all other // Get the maximum cost (excluding unallocatable reg) for all other
// parity registers // parity registers
PBQP::PBQPNum sameParityMax = std::numeric_limits<PBQP::PBQPNum>::min(); PBQP::PBQPNum sameParityMax = std::numeric_limits<PBQP::PBQPNum>::min();
for (unsigned j = 0; j != vRrAllowed->size(); ++j) { for (unsigned j = 0, je = vRrAllowed->size(); j != je; ++j) {
unsigned pRa = (*vRrAllowed)[j]; unsigned pRa = (*vRrAllowed)[j];
if (!haveSameParity(pRd, pRa)) if (!haveSameParity(pRd, pRa))
if (costs[i + 1][j + 1] != if (costs[i + 1][j + 1] !=
@@ -327,7 +326,7 @@ A57PBQPBuilder::addInterChainConstraint(PBQPRAProblem *p, unsigned Rd,
// Ensure all registers with same parity have a higher cost // Ensure all registers with same parity have a higher cost
// than sameParityMax // than sameParityMax
for (unsigned j = 0; j != vRrAllowed->size(); ++j) { for (unsigned j = 0, je = vRrAllowed->size(); j != je; ++j) {
unsigned pRa = (*vRrAllowed)[j]; unsigned pRa = (*vRrAllowed)[j];
if (haveSameParity(pRd, pRa)) if (haveSameParity(pRd, pRa))
if (sameParityMax > costs[i + 1][j + 1]) if (sameParityMax > costs[i + 1][j + 1])